From bc9b3881443190de6df4867a6b0a67bc472bab93 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:44:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 48a08c3..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
@@ -19,14 +19,16 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.fanli.exception.taobao.TaoBaoTokenParseException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+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;
@@ -51,7 +53,10 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
+ @Resource
+ private TaoBaoTokenAuctionIdMapManager taoBaoTokenAuctionIdMapManager;
/**
* 鑾峰彇鍟嗗搧淇℃伅
@@ -166,8 +171,6 @@
LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:" + text);
-
-
if (text.length() > 80) {
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
return;
@@ -192,11 +195,11 @@
}
// 鏌ヨ澶ф窐瀹㈡爣棰�
- List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);
+ List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listByDtitle(text);
if (list != null && list.size() > 0) {
root.put("type", 2);
JSONObject data = new JSONObject();
- data.put("title", list.get(0).getdTitle());
+ data.put("title", list.get(0).getDtitle());
root.put("data", data);
out.print(JsonUtil.loadTrueResult(root));
return;
@@ -272,9 +275,10 @@
* @return
*/
private boolean analysisTaoToken(String text, PrintWriter out) {
- String token = StringUtil.picUpTaoToken(text);
- if (!StringUtil.isNullOrEmpty(token)) {
- Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
+ List<String> tokenList = TaoBaoUtil.getTokenListFromText(text);
+ if (tokenList != null && tokenList.size() > 0) {
+ String token = tokenList.get(0);
+ Long auctionId = taoBaoTokenAuctionIdMapManager.getAuctionIdByToken(token);
if (auctionId != null) {
TaoBaoGoodsBrief tb = null;
try {
--
Gitblit v1.8.0