From dc73adfa9d92d11d1a8512778deacc34fa877eef Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 12 十二月 2018 14:41:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java index 39f2f07..18777c0 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.commons.CommonsMultipartFile; +import org.yeshi.utils.JsonUtil; +import org.yeshi.utils.tencentcloud.COSManager; import com.yeshi.fanli.entity.bus.recommend.DynamicRecommend; import com.yeshi.fanli.entity.bus.recommend.MaskKey; @@ -34,8 +36,6 @@ import com.yeshi.fanli.util.GsonUtil; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; -import org.yeshi.utils.JsonUtil; -import org.yeshi.utils.tencentcloud.COSManager; import net.sf.json.JSONObject; @@ -295,10 +295,10 @@ 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