From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index 0128ca1..440a3e2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -262,7 +262,7 @@
data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareNotify.getKey(),acceptData.getSystem()));
// 娣诲姞鍒嗕韩璁板綍
- BigDecimal rate = hongBaoManageService.getShareRate();
+ BigDecimal rate = hongBaoManageService.getShareRate(acceptData.getSystem());
BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
data.put("shareMoney", "楼" + shareMoney.toString());
@@ -430,7 +430,7 @@
data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareNotify.getKey(),system));
// 娣诲姞鍒嗕韩璁板綍
- BigDecimal rate = hongBaoManageService.getShareRate();
+ BigDecimal rate = hongBaoManageService.getShareRate(system);
BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
data.put("shareMoney", "楼" + shareMoney.toString());
@@ -560,7 +560,7 @@
}
try {
- JSONObject data = userShareGoodsRecordService.getGoodsGroup(recordId);
+ JSONObject data = userShareGoodsRecordService.getGoodsGroup(recordId,acceptData.getSystem());
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
--
Gitblit v1.8.0