From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java
index 9d13733..bf3e17e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/S11Controller.java
@@ -8,11 +8,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.dto.taobao.api.TaoKeOfficialActivityConvertResultDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
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.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -56,14 +59,16 @@
return;
}
- String key = "s11-superhongbao-" + info.getRelationId();
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11SuperHongBao, info.getRelationId() + "");
String token = redisManager.getCommonString(key);
if (StringUtil.isNullOrEmpty(token)) {
try {
- String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1539329391766",
- info.getRelationId());
+ TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",
+ "1574926757600", info.getRelationId());
+ String link = dto.getShort_click_url();
if (!StringUtil.isNullOrEmpty(link)) {
- token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "銆愬ぉ鐚弻11銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒---鏉挎牀蹇渷", link);
+ token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s12/banner.jpg",
+ "銆愬ぉ鐚弻12銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒---鏉挎牀蹇渷", link);
if (!StringUtil.isNullOrEmpty(token))
redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
}
@@ -80,7 +85,7 @@
return;
}
- String desc = configService.get("super-hongbao-share-desc");
+ String desc = configService.get(ConfigKeyEnum.superHongBaoShareDesc.getKey());
desc = desc.replace("[娣樺彛浠", token);
if (!StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(desc)));
--
Gitblit v1.8.0