admin
2020-01-01 c8f11c229b87d1652b6da0b15576c166cd51eb8b
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
@@ -43,12 +43,12 @@
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.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -168,7 +168,8 @@
         // 轮播图
         List<SwiperPicture> 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>();
@@ -679,7 +680,7 @@
      long counttotal = 5000;
      // 精选库数据为空时,网络进行查询
      if (listQuery == null || listQuery.size() == 0) {
      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;
@@ -827,9 +828,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());