From 34e65d72e73acab040b68d01ef6b4764b4408624 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 10:07:38 +0800
Subject: [PATCH] 修改推荐记录点击详情跳转方式不对的bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 24 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 c4eab0d..cfe3891 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
@@ -27,11 +27,13 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
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.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -49,6 +51,7 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
+import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
@@ -56,6 +59,7 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.SearchFilterUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -116,6 +120,8 @@
out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
return;
}
+ // 鍘婚櫎鍓嶅悗绌烘牸
+ text = text.trim();
if (text.length() > 256) {
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
@@ -128,13 +134,10 @@
Pattern p = Pattern.compile(URL_REGEX);
Matcher matcher = p.matcher(text);
if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
- // 鍟嗗搧璇︽儏
- // 鍙戠幇
- // 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
- if (text.startsWith("銆�") && text.contains("銆�")) {
- int end = text.indexOf("銆�");
- if (end > 2)
- text = text.substring(1, end);
+ String pattern = "^[A-Za-z0-9-]+$";
+ if (Pattern.matches(pattern, text)) {
+ out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
+ return;
}
LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:" + text);
@@ -143,6 +146,11 @@
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
return;
}
+
+ if (analysisTaoToken(text, out)) {
+ return;
+ }
+
JSONObject root = new JSONObject();
root.put("type", 2);
@@ -153,6 +161,7 @@
return;
}
+ CommonGoods commonGoods = null;
text = matcher.group();
if (text.contains("ju.taobao.com") || text.contains(".juhuasuan.com")) {// 鑱氬垝绠�
int index = text.indexOf("item_id");
@@ -185,31 +194,98 @@
}
} else {
tb = TaoBaoUtil.parsePhoneShareUrlByTB(text);
+ if (tb == null)// 娣樺疂鏄┖鍊�
+ {
+ String jdId = JDUtil.getJDGoodsId(text);
+ if (!StringUtil.isNullOrEmpty(jdId)) {
+ JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));
+ if (goods != null)
+ commonGoods = CommonGoodsFactory.create(goods);
+ } else {
+ String pddId = PinDuoDuoUtil.getPDDGoodsId(text);
+ if (!StringUtil.isNullOrEmpty(pddId)) {
+ PDDGoodsDetail goods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(pddId));
+ if (goods != null)
+ commonGoods = CommonGoodsFactory.create(goods);
+ }
+ }
+ }
}
- if (tb == null) {
+ if (tb == null && commonGoods == null) {
out.println(JsonUtil.loadFalseResult("鏆傛湭鎵惧埌璇ュ晢鍝侊紝璇风◢鍚庡啀璇曪紒"));
return;
}
+
+ if (tb != null) {
+ commonGoods = new CommonGoods();
+ commonGoods.setPrice(tb.getZkPrice());
+ commonGoods.setTitle(tb.getTitle());
+ commonGoods.setGoodsId(tb.getAuctionId());
+ commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+ commonGoods.setPicture(tb.getPictUrl());
+ }
+
JSONObject data = new JSONObject();
JSONObject taoBaoGoodsJSON = new JSONObject();
- taoBaoGoodsJSON.put("title", tb.getTitle());
- taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
- taoBaoGoodsJSON.put("id", tb.getAuctionId());
- taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);
- taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
- data.put("goods", taoBaoGoodsJSON);
- if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
- if (tb.getImgList() == null)
- tb.setImgList(new ArrayList<>());
- tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+ taoBaoGoodsJSON.put("title", commonGoods.getTitle());
+ taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");
+ taoBaoGoodsJSON.put("id", commonGoods.getGoodsId());
+ taoBaoGoodsJSON.put("goodsType", commonGoods.getGoodsType());
+ if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + commonGoods.getGoodsId());
+ } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_JD) {
+ taoBaoGoodsJSON.put("url", String.format("https://item.jd.com/%s.html", commonGoods.getGoodsId() + ""));
+ } else if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+ taoBaoGoodsJSON.put("url", "http://yangkeduo.com/goods.html?goods_id=" + commonGoods.getGoodsId());
}
- data.put("imgs", tb.getImgList());
+ data.put("goods", taoBaoGoodsJSON);
+ List<String> picList = new ArrayList<>();
+ picList.add(commonGoods.getPicture());
+ data.put("imgs", picList);
JSONObject root = new JSONObject();
root.put("type", 1);
root.put("data", data);
out.print(JsonUtil.loadTrueResult(root));
+ }
+
+ private boolean analysisTaoToken(String text, PrintWriter out) {
+ String token = StringUtil.picUpTaoToken(text);
+ if (!StringUtil.isNullOrEmpty(token)) {
+ Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
+ if (auctionId != null) {
+ TaoBaoGoodsBrief tb = null;
+ try {
+ tb = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+
+ if (tb != null) {
+ JSONObject data = new JSONObject();
+ JSONObject taoBaoGoodsJSON = new JSONObject();
+ taoBaoGoodsJSON.put("title", tb.getTitle());
+ taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
+ taoBaoGoodsJSON.put("id", tb.getAuctionId());
+ taoBaoGoodsJSON.put("goodsType", Constant.SOURCE_TYPE_TAOBAO);
+ taoBaoGoodsJSON.put("url", "http://item.taobao.com/item.htm?id=" + tb.getAuctionId());
+ data.put("goods", taoBaoGoodsJSON);
+ if (!StringUtil.isNullOrEmpty(tb.getPictUrl())) {
+ if (tb.getImgList() == null)
+ tb.setImgList(new ArrayList<>());
+ tb.getImgList().add(0, TbImgUtil.getTBSize220Img(tb.getPictUrl()));
+ }
+ data.put("imgs", tb.getImgList());
+ JSONObject root = new JSONObject();
+ root.put("type", 1);
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
+ return true;
+ }
+ }
+ }
+ return false;
}
/**
@@ -592,8 +668,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
for (JDGoods goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -605,7 +680,7 @@
}
/**
- * 浜笢
+ * 鎷煎澶�
*
* @param kw
* @param page
@@ -669,8 +744,7 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
for (PDDGoodsDetail goods : goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
--
Gitblit v1.8.0