From 666e5d4bae10a7082823bfbe91d0fa7e51f5ad2d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期日, 01 三月 2020 12:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 5bc717f..70f4b3f 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
@@ -13,8 +13,10 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
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;
@@ -41,10 +43,13 @@
@Resource
private RedisManager redisManager;
+ @Resource
+ private TaoBaoTokenAuctionIdMapManager taoBaoTokenAuctionIdMapManager;
+
/**
*
* @Title: convertJDLinkFromText @Description:杞摼鏂囨湰涓殑浜笢鐭摼 @param text @param
- * uid @param share @return @throws Exception String 杩斿洖绫诲瀷 @throws
+ * uid @param share @return @throws Exception String 杩斿洖绫诲瀷 @throws
*/
public String convertJDLinkFromText(String text, Long uid, boolean share) throws Exception {
@@ -84,7 +89,7 @@
/**
*
* @Title: convertTBLinkFromText @Description: 杞摼鏂囨湰涓殑娣樺彛浠� @param text @param
- * uid @param share @return @throws Exception String 杩斿洖绫诲瀷 @throws
+ * uid @param share @return @throws Exception String 杩斿洖绫诲瀷 @throws
*/
private String convertTBLinkFromText(String text, Long uid, boolean share) throws Exception {
@@ -103,7 +108,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);
@@ -180,11 +185,14 @@
/**
*
* @Title: convertLinkFromText @Description: 浠庢枃鏈浆閾� @param text @return
- * String 杩斿洖绫诲瀷 @throws
+ * String 杩斿洖绫诲瀷 @throws
*/
- public String convertLinkFromText(String text, Long uid, boolean share) throws Exception {
+ public String convertLinkFromText(String text, Long uid, boolean share)
+ throws ConvertLinkExceptionException, Exception {
String newText = convertJDLinkFromText(text, uid, share);
newText = convertTBLinkFromText(newText, uid, share);
+ if (text.equalsIgnoreCase(newText))
+ throw new ConvertLinkExceptionException(ConvertLinkExceptionException.CODE_NONE, "涓嶅寘鍚彲杞摼鐨勫彛浠や笌閾炬帴");
return newText;
}
--
Gitblit v1.8.0