冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java

@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.system.BusinessSystem;

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

@@ -38,6 +39,8 @@
import com.yeshi.fanli.service.inter.goods.SuperGoodsClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.lable.LabelClassService;

import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

@@ -103,6 +106,12 @@


   @Resource

   private MonitorService monitorService;

	
   @Resource

   private HomeNavbarService homeNavbarService;

   @Resource

   private SwiperPictureService swiperPictureService;





   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

@@ -153,22 +162,30 @@
    * @param out

    */

   @RequestMapping(value = "getgoodssecondclass", method = RequestMethod.POST)

   public void getGoodsSecondClass(AcceptData acceptData, long gcid, PrintWriter out) {



   public void getGoodsSecondClass(AcceptData acceptData, long gcid, Long swpid, PrintWriter out) {

      try {



         GoodsClass goodsClass = goodsClassService.getGoodsClassCache(gcid);

         if (goodsClass == null) {

            out.print(JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         // 轮播图

         List<SwiperPicture> picList = null;

         if (swpid != null) {

            picList = swiperPictureService.getByBannerId(swpid);

         }

         if (picList == null) {

            picList = new ArrayList<SwiperPicture>();

         }

			
         List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1);

         if (goodsSubClassList == null) {

            goodsSubClassList = new ArrayList<GoodsSubClass>();

         }



         JSONObject data = new JSONObject();

         data.put("picList", JsonUtil.getApiCommonGson().toJson(picList));

         data.put("count", goodsSubClassList.size());

         data.put("goodsSecondClassList", JsonUtil.getApiCommonGson().toJson(goodsSubClassList));

         out.print(JsonUtil.loadTrueResult(data));