From 6090839cb1a40547304ffe59e75320799fc47bea Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 31 十二月 2019 15:09:54 +0800
Subject: [PATCH] 删除DaTaoKeDetail实体，修改其依赖
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index f8e76c2..881f331 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -37,7 +37,7 @@
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.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.TokenRecordException;
import com.yeshi.fanli.log.LogHelper;
@@ -50,7 +50,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
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.HistorySearchService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
@@ -117,7 +117,7 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -153,7 +153,7 @@
}
// 鍘婚櫎鍓嶅悗绌烘牸
text = text.trim();
- String originalText=text;
+ String originalText = text;
try {
TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
@@ -232,7 +232,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id,originalText);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
}
} else if (text.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
tb = TaoBaoUtil.parsePhoneShareUrlByTM(text);
@@ -244,7 +244,7 @@
tb = TaoBaoUtil.isAlimama(id);
if (tb == null) {
type = 4;
- tb = getTaoBaoGoodsBriefFromGoodsId(id,originalText);
+ tb = getTaoBaoGoodsBriefFromGoodsId(id, originalText);
}
} else if (text.contains("v.douyin.com")) { // 鎶栭煶
analysisDouYin(acceptData, text, out);
@@ -255,7 +255,7 @@
if (tb == null) {
String goodsId = TaoBaoUtil.getGoodsIdByPhoneShareUrl(text);
if (!StringUtil.isNullOrEmpty(goodsId)) {
- tb = getTaoBaoGoodsBriefFromGoodsId(goodsId,originalText);
+ tb = getTaoBaoGoodsBriefFromGoodsId(goodsId, originalText);
if (tb != null)
type = 4;
}
@@ -408,10 +408,10 @@
private TaoBaoGoodsBrief getTaoBaoGoodsBriefFromGoodsId(String goodsId, String text) {
TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(goodsId);
if (tb == null && NumberUtil.isNumeric(goodsId)) {// 鏄暟瀛�
-// tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));
-// if (tb != null) {
-// tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));
-// }
+ // tb = TaoBaoUtil.getSimpleGoodsBrief(Long.parseLong(goodsId));
+ // if (tb != null) {
+ // tb.setPictUrl(TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+ // }
if (tb == null) {
tb = new TaoBaoGoodsBrief();
if (text.trim().indexOf("銆�") == 0 && text.trim().indexOf("銆�") > 0) {
@@ -733,9 +733,9 @@
}
// 鎼滅储澶ф窐瀹�
- List<DaTaoKeDetail> daTaoKeList = null;
+ List<DaTaoKeDetailV2> daTaoKeList = null;
if (page == 1) {
- daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key);
+ daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(key);
}
// 娣樺疂api鎼滅储鍟嗗搧
@@ -764,7 +764,7 @@
if (daTaoKeList != null && daTaoKeList.size() > 0) {
try {
Collections.reverse(daTaoKeList);
- for (DaTaoKeDetail detail : daTaoKeList) {
+ for (DaTaoKeDetailV2 detail : daTaoKeList) {
taoBaoGoodsBriefs.add(0, TaoBaoUtil.convert(detail));
}
} catch (Exception e) {
--
Gitblit v1.8.0