From 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 28 二月 2020 15:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
index ad07eea..7c13677 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
@@ -15,6 +15,9 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.manger.goods.tb.TaoBaoTokenAuctionIdMapManager;
+import com.yeshi.fanli.util.RedisKeyEnum;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
@@ -36,17 +39,16 @@
@Resource
private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
+ @Resource
+ private RedisManager redisManager;
+
+ @Resource
+ private TaoBaoTokenAuctionIdMapManager taoBaoTokenAuctionIdMapManager;
+
/**
*
- * @Title: convertJDLinkFromText
- * @Description:杞摼鏂囨湰涓殑浜笢鐭摼
- * @param text
- * @param uid
- * @param share
- * @return
- * @throws Exception
- * String 杩斿洖绫诲瀷
- * @throws
+ * @Title: convertJDLinkFromText @Description:杞摼鏂囨湰涓殑浜笢鐭摼 @param text @param
+ * uid @param share @return @throws Exception String 杩斿洖绫诲瀷 @throws
*/
public String convertJDLinkFromText(String text, Long uid, boolean share) throws Exception {
@@ -85,21 +87,14 @@
/**
*
- * @Title: convertTBLinkFromText
- * @Description: 杞摼鏂囨湰涓殑娣樺彛浠�
- * @param text
- * @param uid
- * @param share
- * @return
- * @throws Exception
- * String 杩斿洖绫诲瀷
- * @throws
+ * @Title: convertTBLinkFromText @Description: 杞摼鏂囨湰涓殑娣樺彛浠� @param text @param
+ * uid @param share @return @throws Exception String 杩斿洖绫诲瀷 @throws
*/
private String convertTBLinkFromText(String text, Long uid, boolean share) throws Exception {
StringBuilder builder = new StringBuilder(text);
String newText = builder.toString();
- List<String> tokenList = TaoBaoUtil.getTokenListFromText(newText);
+ List<String> tokenList = TaoBaoUtil.getTokenListFromTextWithKuoHao(newText);
if (tokenList != null && tokenList.size() > 0) {
String relationId = null;
@@ -112,7 +107,7 @@
tokenSet.addAll(tokenList);
Map<String, String> tokenMap = new HashMap<>();
for (String token : tokenSet) {
- Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
+ Long auctionId = taoBaoTokenAuctionIdMapManager.getAuctionIdByToken(token);
if (auctionId == null)
throw new Exception("浠庢窐鍙ｄ护鑾峰彇鍟嗗搧澶辫触");
TaoBaoGoodsBrief simpleGoods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
@@ -174,7 +169,7 @@
if (StringUtil.isNullOrEmpty(newToken)) {
throw new Exception("鍙ｄ护杞摼澶辫触");
}
- tokenMap.put(token, newToken);
+ tokenMap.put(token, TaoBaoUtil.filterTaoToken(newToken));
}
for (String token : tokenSet) {
@@ -188,12 +183,8 @@
/**
*
- * @Title: convertLinkFromText
- * @Description: 浠庢枃鏈浆閾�
- * @param text
- * @return
- * String 杩斿洖绫诲瀷
- * @throws
+ * @Title: convertLinkFromText @Description: 浠庢枃鏈浆閾� @param text @return
+ * String 杩斿洖绫诲瀷 @throws
*/
public String convertLinkFromText(String text, Long uid, boolean share) throws Exception {
String newText = convertJDLinkFromText(text, uid, share);
@@ -201,4 +192,20 @@
return newText;
}
+ /**
+ * 鍒涘缓鍙ｄ护 @Title: createTaoBaoToken @Description: @param uid 鐢ㄦ埛ID @param
+ * picturl @param title @param link @return String 杩斿洖绫诲瀷 @throws
+ */
+ public String createTaoBaoToken(Long uid, String picturl, String title, String link) {
+
+ String token = TaoKeApiUtil.getTKToken(picturl, title, link);
+ if (!StringUtil.isNullOrEmpty(token)) {
+ // 缂撳瓨30鍒嗛挓
+ redisManager.cacheCommonString(
+ RedisKeyEnum.getRedisKey(RedisKeyEnum.taobaoUserTKToken, uid + "-" + StringUtil.Md5(token)), "1",
+ 60 * 30);
+ }
+ return token;
+ }
+
}
--
Gitblit v1.8.0