From b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 23 二月 2020 00:16:52 +0800
Subject: [PATCH] 2.0.7相关服务端功能添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 3aee959..13d9cb7 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,13 +19,14 @@
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.hongbao.HongBaoManageService;
+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.util.StringUtil;
import com.yeshi.fanli.util.Utils;
@@ -51,7 +52,7 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
/**
* 鑾峰彇鍟嗗搧淇℃伅
@@ -152,6 +153,9 @@
Pattern p = Pattern.compile(URL_REGEX);
Matcher matcher = p.matcher(text);
if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
+ // 瑙ｆ瀽娣樺彛浠�
+ if (analysisTaoToken(text, out))
+ return;
// 鍟嗗搧璇︽儏
// 鍙戠幇
// 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
@@ -187,11 +191,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;
@@ -267,9 +271,15 @@
* @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 = null;
+ try {
+ auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
+ } catch (TaoBaoTokenParseException e1) {
+ e1.printStackTrace();
+ }
if (auctionId != null) {
TaoBaoGoodsBrief tb = null;
try {
--
Gitblit v1.8.0