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

admin

2020-04-28 6f6c93d0cee6898fc1d3fa9d639b8273121b821d

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

@@ -59,6 +59,7 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.jd.JDGoodsClassService;

import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

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.TLJBuyGoodsService;

@@ -152,7 +153,7 @@
   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private SystemClientParamsService systemClientParamsService;

@@ -210,6 +211,9 @@


   @Resource

   private UserLevelManager userLevelManager;

	
   @Resource

   private HongBaoManageService hongBaoManageService;



   private ConfigParamsDTO getParamsDTO(String platform, String version, Long uid) {

      UserLevelEnum level = UserLevelEnum.daRen;

@@ -222,7 +226,7 @@
      }

      if (level == null)

         level = UserLevelEnum.daRen;

      return hongBaoManageService.getShowComputeRate(platform, version, level);

      return orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, level);

   }



   /**