From 07cc9760a199375f82522c22423bfc375831cdd1 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 28 一月 2019 10:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 66b5c62..6948e15 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -2044,7 +2044,7 @@
JSONObject shareActivity = new JSONObject();
shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
- new BigDecimal(configService.get("share_activity_proportion")).divide(new BigDecimal(100))));
+ new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
data.put("shareActivity", shareActivity);
--
Gitblit v1.8.0