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 | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 f8e2cd6..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
@@ -3,12 +3,12 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -22,13 +22,12 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.special.S11Service;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -100,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;
@@ -122,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