From ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 27 六月 2019 09:48:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 1933e5e..633a56b 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
@@ -394,7 +394,7 @@
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
- data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));
+ data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));
out.print(JsonUtil.loadTrueResult(data));
return;
@@ -403,7 +403,6 @@
// 鐧诲綍鐢ㄦ埛
JSONObject data = new JSONObject();
- data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));
data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));
if (type.equals(TaoLiJinOriginEnum.newbiesWin.name())) {
@@ -429,6 +428,7 @@
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
+ data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));
} else if(type.equals(TaoLiJinOriginEnum.rankWin.name())) {
boolean isRank = false;
@@ -464,6 +464,7 @@
data.put("jumpName", "鍘绘煡鐪�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("user_rank"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_not_enough_tip"));
+ data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));
out.print(JsonUtil.loadTrueResult(data));
return;
} else {
@@ -475,6 +476,7 @@
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));
+ data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));
}
} else {
--
Gitblit v1.8.0