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/S11Controller.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/S11Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/S11Controller.java
index 4c36d29..cf96e24 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/S11Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/S11Controller.java
@@ -99,7 +99,7 @@
List<TaoBaoGoodsBrief> list = s11Service.getPreSaleGoodsCache(page);
JSONArray array = new JSONArray();
if (list != null) {
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
boolean is11 = System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2018-11-11", "yyyy-MM-dd") ? true
: false;
@@ -121,7 +121,7 @@
List<TaoBaoGoodsBrief> list = s11Service.getPreSaleGoodsByType(key, page);
JSONArray array = new JSONArray();
if (list != null) {
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
boolean is11 = System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2018-11-11", "yyyy-MM-dd") ? true
: false;
--
Gitblit v1.8.0