2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java

@@ -34,6 +34,7 @@
import com.yeshi.fanli.service.inter.config.BusinessSystemService;

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

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

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -65,6 +66,10 @@
   @Resource

   private HongBaoManageService hongBaoManageService;



	
   @Resource	
   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;

	
   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;



@@ -228,7 +233,7 @@
            }

         }



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

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

               acceptData.getVersion());

         



@@ -344,7 +349,7 @@
      JSONArray array = new JSONArray();

      if (list != null && list.size() > 0) {

         Gson gson = gsonBuilder.create();

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

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

               acceptData.getVersion());

         for (ScanHistoryV2 sh : list) {

            CommonGoods commonGoods = sh.getCommonGoods();