帮助中心

yujian

2019-12-19 626d711cb15896055c13fe344eb7fcc824589715

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.java

@@ -15,6 +15,7 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

@@ -28,10 +29,10 @@
import com.yeshi.fanli.service.inter.goods.GoodsClassService;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -141,8 +142,8 @@


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



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

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

      // 精选库数据小于10时，网络进行查询

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

         long count = qualityGoodsService.countQueryClassId(gcid);

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

         page = page - totalPage;

@@ -177,7 +178,8 @@


      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();



      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,   hongBaoManageService.getVIPFanLiRate());

		
      // 精选库数据

      JSONArray array = new JSONArray();

      for (QualityFactory selectionGoods : listQuery) {

@@ -186,8 +188,7 @@
            continue;

         }

         updateGoodsList.add(taoBaoGoodsBrief);

         GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,

               shareRate);

         GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);

         array.add(gson.toJson(goodsDetailVO));

      }



@@ -291,15 +292,15 @@
                  .excludeFieldsWithoutExposeAnnotation().create();



            JSONArray array = new JSONArray();

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            if (resultGoodsList != null)

            if (resultGoodsList != null) {

               BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

               BigDecimal shareRate = hongBaoManageService.getShareRate();

               ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,   hongBaoManageService.getVIPFanLiRate());

               for (TaoBaoGoodsBrief goods : resultGoodsList) {

                  GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate,

                        shareRate);

                  GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

                  array.add(gson2.toJson(goodsDetailVO));

               }



            }

            JSONObject result = new JSONObject();

            result.put("result", array);

            result.put("count", result.optLong("count") + count);