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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -1,13 +1,11 @@
package com.yeshi.fanli.controller.client.v2;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.List;



import javax.annotation.Resource;



import org.hibernate.id.enhanced.AccessCallback;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

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

@@ -33,11 +31,10 @@
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.order.OrderHongBaoMoneyComputeService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

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

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

@@ -72,7 +69,7 @@
   private TaoBaoClassService taoBaoClassService;



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private LabelClassService labelClassService;

@@ -178,7 +175,7 @@
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

      ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

      

      // 精选库数据

@@ -294,7 +291,7 @@


            JSONArray array = new JSONArray();

            if (resultGoodsList != null) {

               ConfigParamsDTO paramsDTO =  hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

               ConfigParamsDTO paramsDTO =  orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                     acceptData.getVersion());

               for (TaoBaoGoodsBrief goods : resultGoodsList) {

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