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/CommonContentController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
index 619bd3c..523324f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -92,7 +92,7 @@
 		}
 
 		CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
-				cid, page, 10);
+				cid, page, 10,acceptData.getSystem());
 
 		// 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
 		List<SwiperPicture> bannerList = new ArrayList<>();
@@ -103,7 +103,7 @@
 
 		JSONArray array = new JSONArray();
 		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
-		BigDecimal pro = hongBaoManageService.getFanLiRate();
+		BigDecimal pro = hongBaoManageService.getFanLiRate(acceptData.getSystem());
 		if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
 			pro = new BigDecimal(100);
 		List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();

--
Gitblit v1.8.0