From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java
index acf4c8e..e09a654 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java
@@ -9,10 +9,12 @@
 import org.yeshi.utils.JsonUtil;
 
 import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -56,16 +58,16 @@
 			return;
 		}
 
-		String key = "s11-superhongbao-" + info.getRelationId();
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11SuperHongBao, info.getRelationId() +"");
 		String token = null;
 		token = redisManager.getCommonString(key);
 		if (StringUtil.isNullOrEmpty(token)) {
 			try {
-				String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1539329391766",
+				String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",
 						info.getRelationId());
 				if (!StringUtil.isNullOrEmpty(link)) {
 					token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",
-							"銆愬ぉ鐚弻11銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒", link);
+							"銆愬ぉ鐚弻12銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒", link);
 					if (!StringUtil.isNullOrEmpty(token))
 						redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
 				}
@@ -80,7 +82,7 @@
 			return;
 		}
 
-		String desc = configService.get("super-hongbao-share-desc");
+		String desc = configService.get(ConfigKeyEnum.superHongBaoShareDesc.getKey());
 		desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
 		try {
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));
@@ -107,13 +109,13 @@
 			return;
 		}
 
-		String key = "s11-yushou-" + info.getRelationId();
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11YuShou, info.getRelationId() + "");
 		String token = null;
 		if (Constant.IS_OUTNET)
 			token = redisManager.getCommonString(key);
 		if (StringUtil.isNullOrEmpty(token)) {
 			try {
-				String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1539329391766",
+				String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",
 						info.getRelationId());
 				if (!StringUtil.isNullOrEmpty(link)) {
 					token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",
@@ -133,7 +135,7 @@
 			return;
 		}
 
-		String desc = configService.get("super-yushou-share-desc");
+		String desc = configService.get(ConfigKeyEnum.superYuShouShareDesc.getKey());
 		desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
 		try {
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));

--
Gitblit v1.8.0