From 8b3371befea773bda4e08b19189c25c32ea6818f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 十二月 2019 16:18:09 +0800
Subject: [PATCH] 订单维权修改，通用模板修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index 999bc6a..b9657ab 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -490,7 +490,7 @@
BigDecimal fanLiRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());
BigDecimal shareRate = hongBaoManageService.getTLJShareRate(System.currentTimeMillis());
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
for (ShareHotGoods hotGoods : listHot) {
TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();
@@ -649,7 +649,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
BigDecimal proportion = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
for (TLJBuyGoods hotGoods : listHot) {
TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();
if (taoBaoGoodsBrief == null) {
@@ -791,7 +791,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, fanLiRate, Constant.MAX_REWARD_RATE);
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, fanLiRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
for (TLJFreeBuyGoods freeGoods : listFree) {
TaoBaoGoodsBrief goods = freeGoods.getGoods();
if (goods == null)
@@ -842,9 +842,12 @@
}
}
+ String rule = configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule");
+ rule = rule.replace("{閾炬帴}", configService.get("customer_service_link"));
+
data.put("state", state);
data.put("balance","鏂颁汉绾㈠寘锛�" + balance.setScale(2) + "鍏�");
- data.put("rule", configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule"));
+ data.put("rule", rule);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0