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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -47,6 +47,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;

import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;

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

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

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;

@@ -93,6 +94,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private ActivityUserService activityUserService;

@@ -293,7 +297,7 @@
         if (goodsBrief == null)

            continue;

         // 商品VO

         ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");

         ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");

         paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());

         GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);