From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 03 一月 2019 17:43:18 +0800 Subject: [PATCH] Merge branch 'dev-hongbao' --- fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java index 3bc0859..ae2181e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java @@ -39,7 +39,6 @@ import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.user.DynamicRecommendService; import com.yeshi.fanli.service.inter.user.UserInfoService; -import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.GsonUtil; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; @@ -390,10 +389,11 @@ return; } taoBaoGoodsBrief = taoBaoGoodsBriefs.get(0); - String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION); + BigDecimal proportion = hongBaoManageService.getFanLiRate(); + BigDecimal tkRate = taoBaoGoodsBrief.getTkRate(); BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice(); - BigDecimal tkp = new BigDecimal(proportion).divide(BigDecimal.valueOf(100)) + BigDecimal tkp = proportion.divide(BigDecimal.valueOf(100)) .multiply(tkRate.divide(BigDecimal.valueOf(100))); BigDecimal hongbao = MoneyBigDecimalUtil.mul(zkPrice, tkp); dynamicRecommend.setHongbao(hongbao); -- Gitblit v1.8.0