From 31a142ac391b474faa04d82971105cc608a0f973 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 17 五月 2020 19:29:44 +0800
Subject: [PATCH] 新版饿了么相关接口添加
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S11Controller.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 e09a654..8a098e5 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
@@ -8,6 +8,7 @@
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;
@@ -58,16 +59,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",
+ "1574926757600", info.getRelationId());
+ String link = dto.getShort_click_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澶�
}
@@ -115,11 +118,12 @@
token = redisManager.getCommonString(key);
if (StringUtil.isNullOrEmpty(token)) {
try {
- String link = TaoKeApiUtil.officialActivityConvert("19507100253", "1574926757600",
- 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",
- "棰勫敭鍟嗗搧浠樺畾閲戯紝寰楀閲戯紒", 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澶�
--
Gitblit v1.8.0