Merge branch 'div1'

yujian

2019-01-05 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java

@@ -7,8 +7,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

@@ -17,8 +15,10 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.service.AdminUserService;

@@ -28,6 +28,9 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/pushgoods")

@@ -152,11 +155,24 @@
            return;

         }



         List<TaoBaoGoodsBrief> listgoods = new ArrayList<TaoBaoGoodsBrief>();

			
         List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushGoods.getId());

         if (listGroup == null) {

            listGroup = new ArrayList<PushGoodsGroup>();

         } else {

            for (PushGoodsGroup pushGoodsGroup: listGroup) {

               CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();

               if (commonGoods != null) {

                  TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

                  listgoods.add(goodsBrief);

               }

            }

         }

         

         JSONObject data = new JSONObject();

         data.put("pushGoods", pushGoods);

         data.put("listGroup", listGroup);

         data.put("listGroup", listgoods);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));