Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -24,7 +24,6 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;

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

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

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;

@@ -43,13 +42,14 @@
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;

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

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

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -57,6 +57,7 @@
import com.yeshi.fanli.util.factory.MonitorFactory;

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

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

import com.yeshi.fanli.vo.homemodule.BannerVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -166,12 +167,13 @@
         }



         // 轮播图

         List<SwiperPicture> picList = null;

         List<BannerVO> picList = null;

         if (swpid != null) {

            picList = swiperPictureService.getByBannerId(swpid);

            picList = swiperPictureService.getByBannerId(swpid, acceptData.getPlatform(),

                  Integer.parseInt(acceptData.getVersion()));

         }

         if (picList == null) {

            picList = new ArrayList<SwiperPicture>();

            picList = new ArrayList<BannerVO>();

         }



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

@@ -679,7 +681,7 @@
      long counttotal = 5000;



      // 精选库数据为空时，网络进行查询

      if (listQuery == null || listQuery.size() == 0||listQuery.size()<10) {

      if (listQuery == null || listQuery.size() == 0 || listQuery.size() < 10) {

         long count = qualityGoodsService.countQueryClassId(gcid);

         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

         page = page - totalPage;

@@ -794,7 +796,7 @@
      if (id == null)

         return;

      page = page < 1 ? 1 : page;

      String key = String.format("getCouponListByClass-%s-%s", id + "", page + "");

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.couponByClass, id + "-" + page);

      String resultStr = "";



      if (Constant.IS_OUTNET)

@@ -827,9 +829,16 @@
      meterialId = 0;

      if (meterialId > 0)

         result = TaoKeApiUtil.getMaterialByMaterialId(meterialId, page, 20);

      else

         result = TaoKeApiUtil.searchCouple(goodsClassService.getKeysById(id), null, page, 20);

      else {

         SearchFilter sf = new SearchFilter();

         sf.setPage(page);

         sf.setPageSize(20);

         sf.setQuan(1);

         sf.setKey(goodsClassService.getKeysById(id));



         result = TaoKeApiUtil.searchWuLiao(sf);



      }

      List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();

      if (result != null && result.getNavList() != null)

         navList.addAll(result.getNavList());