From bf210f3c96bc092c182bdeb24bdb9b03d4096707 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 六月 2020 15:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
index 13d9cb7..77c1660 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
@@ -28,6 +28,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.manger.goods.tb.TaoBaoTokenAuctionIdMapManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -53,6 +54,9 @@
@Resource
private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
+ @Resource
+ private TaoBaoTokenAuctionIdMapManager taoBaoTokenAuctionIdMapManager;
/**
* 鑾峰彇鍟嗗搧淇℃伅
@@ -274,12 +278,7 @@
List<String> tokenList = TaoBaoUtil.getTokenListFromText(text);
if (tokenList != null && tokenList.size() > 0) {
String token = tokenList.get(0);
- Long auctionId = null;
- try {
- auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
- } catch (TaoBaoTokenParseException e1) {
- e1.printStackTrace();
- }
+ Long auctionId = taoBaoTokenAuctionIdMapManager.getAuctionIdByToken(token);
if (auctionId != null) {
TaoBaoGoodsBrief tb = null;
try {
--
Gitblit v1.8.0