From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 a5289d2..1769966 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
@@ -4,11 +4,15 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import org.springframework.stereotype.Controller;
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.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;
@@ -31,6 +35,9 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private UserInfoService userInfoService;
/**
* 鑾峰彇瓒呯骇绾㈠寘鍒嗕韩鍙ｄ护
@@ -57,16 +64,18 @@
return;
}
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11SuperHongBao, 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", "1574926757600",
- info.getRelationId());
+ TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",
+ "20150318020001156", info.getRelationId());
+ String link = dto.getClick_url();
+
if (!StringUtil.isNullOrEmpty(link)) {
- token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",
- "銆愬ぉ鐚弻12銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒", link);
+ token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "銆愬ぉ鐚弻12銆戜笂浜跨孩鍖呯瓑浣犳潵鎷嗭紒",
+ link);
if (!StringUtil.isNullOrEmpty(token))
redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
}
@@ -81,7 +90,8 @@
return;
}
- String desc = configService.get("super-hongbao-share-desc");
+ UserInfo user=userInfoService.selectByPKey(uid);
+ String desc = configService.getValue(ConfigKeyEnum.superHongBaoShareDesc.getKey(),user.getSystem());
desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
try {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));
@@ -114,11 +124,12 @@
token = redisManager.getCommonString(key);
if (StringUtil.isNullOrEmpty(token)) {
try {
- String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",
- info.getRelationId());
+ TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",
+ "20150318020001158", info.getRelationId());
+ String link = dto.getClick_url();
if (!StringUtil.isNullOrEmpty(link)) {
- token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg",
- "棰勫敭鍟嗗搧浠樺畾閲戯紝寰楀閲戯紒", link);
+ token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "棰勫敭鍟嗗搧浠樺畾閲戯紝寰楀閲戯紒",
+ link);
if (Constant.IS_OUTNET)
if (!StringUtil.isNullOrEmpty(token))
redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
@@ -133,8 +144,8 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "鍙ｄ护鐢熸垚澶辫触锛岃绋嶅悗閲嶈瘯")));
return;
}
-
- String desc = configService.get("super-yushou-share-desc");
+ UserInfo user=userInfoService.selectByPKey(uid);
+ String desc = configService.getValue(ConfigKeyEnum.superYuShouShareDesc.getKey(),user.getSystem());
desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
try {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));
--
Gitblit v1.8.0