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

admin

2020-05-13 60a099a7edfd81a3b10c766e113c019cdef6cd3d

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

@@ -50,6 +50,7 @@
import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

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

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

import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;

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

@@ -155,6 +156,9 @@


   @Resource

   private TLJFreeBuyGoodsService tljFreeBuyGoodsService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   /**

    * 获取淘礼金分享记录

@@ -487,7 +491,7 @@
         }

      }



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

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

            acceptData.getVersion());



      for (ShareHotGoods hotGoods : listHot) {

@@ -789,7 +793,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());



      for (TLJFreeBuyGoods freeGoods : listFree) {