返利配置文件加入系统区分

admin

2020-07-07 c9cbad5f5d18c6b2ac5a063e41007933d7028329

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

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



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.security.AccessControlContext;

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 +32,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 +70,7 @@
   private TaoBaoClassService taoBaoClassService;



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private LabelClassService labelClassService;

@@ -102,7 +100,6 @@
    * 二级分类、标签

    * 

    * @param acceptData

    * @param gcid

    * @param out

    */

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

@@ -170,7 +167,7 @@
         filter.setPageSize(pageSize);

         filter.setCateIds(taoBaoCatIds);



         JSONObject result = taoKeGoodsService.searchWuLiaoV2(filter,acceptData.getPlatform(),acceptData.getVersion());

         JSONObject result = taoKeGoodsService.searchWuLiaoV2(filter,acceptData.getPlatform(),acceptData.getVersion(), acceptData.getSystem());

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

         return;

      }

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

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



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

            acceptData.getVersion());

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

            acceptData.getVersion(),acceptData.getSystem());

      

      // 精选库数据

      JSONArray array = new JSONArray();

@@ -294,8 +291,8 @@


            JSONArray array = new JSONArray();

            if (resultGoodsList != null) {

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

                     acceptData.getVersion());

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

                     acceptData.getVersion(),acceptData.getSystem());

               for (TaoBaoGoodsBrief goods : resultGoodsList) {

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

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

@@ -319,7 +316,7 @@
            taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,

                  totalSales);



            JSONObject result = taoKeGoodsService.searchWuLiaoV2(searchfilter,acceptData.getPlatform(),acceptData.getVersion());

            JSONObject result = taoKeGoodsService.searchWuLiaoV2(searchfilter,acceptData.getPlatform(),acceptData.getVersion(),acceptData.getSystem());

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

            return;

         }