From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 196 ++++++++++++++++++++++++++----------------------
1 files changed, 107 insertions(+), 89 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 ef5dd9f..3e8b365 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
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -32,6 +33,7 @@
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;
@@ -45,7 +47,6 @@
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.Utils;
@@ -57,6 +58,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;
@@ -99,12 +101,10 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
-
/**
* 绮樿创鏉夸俊鎭帹鑽�
*
@@ -113,8 +113,8 @@
* 鍟嗗搧閾炬帴
* @param out
*/
- @RequestMapping(value = "getNewGoodsInfo", method = RequestMethod.POST)
- public void getNewGoodsInfo(AcceptData acceptData, String text, PrintWriter out) {
+ @RequestMapping(value = "getRecommendInfo", method = RequestMethod.POST)
+ public void getRecommendInfo(AcceptData acceptData, String text, PrintWriter out) {
if (StringUtil.isNullOrEmpty(text)) {
out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
return;
@@ -140,6 +140,11 @@
text = text.substring(1, end);
}
+ if (NumberUtil.isNumeric(text)) {
+ out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佺函鏁板瓧"));
+ return;
+ }
+
LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:" + text);
if (text.length() > 80) {
@@ -147,36 +152,17 @@
return;
}
- SearchFilter sf = new SearchFilter();
- sf.setKey(text);
- JSONObject root = new JSONObject();
-
- TaoBaoSearchResult result = TaoBaoUtil.search(sf);
- if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0)
- for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
- // 鏄睘浜庢窐瀹濊仈鐩熷晢鍝�
- if (goods.getTitle().equalsIgnoreCase(text)) {
- root.put("type", 2);
- JSONObject data = new JSONObject();
- data.put("title", goods.getTitle());
- root.put("data", data);
- out.print(JsonUtil.loadTrueResult(root));
- return;
- }
- }
-
- // 鏌ヨ澶ф窐瀹㈡爣棰�
- List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);
- if (list != null && list.size() > 0) {
- root.put("type", 2);
- JSONObject data = new JSONObject();
- data.put("title", list.get(0).getdTitle());
- root.put("data", data);
- out.print(JsonUtil.loadTrueResult(root));
+ if (analysisTaoToken(text, out)) {
return;
}
- out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔璇ョ被鍨嬶紒"));
+ JSONObject root = new JSONObject();
+
+ root.put("type", 2);
+ JSONObject data = new JSONObject();
+ data.put("title", text);
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
return;
}
@@ -222,24 +208,61 @@
JSONObject taoBaoGoodsJSON = new JSONObject();
taoBaoGoodsJSON.put("title", tb.getTitle());
taoBaoGoodsJSON.put("zkPrice", tb.getZkPrice());
- taoBaoGoodsJSON.put("auctionId", tb.getAuctionId());
+ 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("taoBaoGoodsBrief", taoBaoGoodsJSON);
+ 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("tbImgs", tb.getImgList());
+ data.put("imgs", tb.getImgList());
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;
+ }
+
/**
* 鎼滅储鍊欓�夎瘝
*
@@ -282,32 +305,33 @@
* @param kw
* @param page
* @param filter
- * @param order 閿�閲忕敱楂樺埌浣�:1 銆� 浠锋牸浠庨珮鍒颁綆:2 銆� 浠锋牸浠庝綆鍒伴珮:3 銆� 鎺ㄥ箍閲忛珮鍒颁綆:4锛堢患鍚堥粯璁わ級銆佽繑鍒╂瘮楂樺埌浣�:5
- * 銆佽繑鍒╂瘮浣庡埌楂�:6 銆佹帹鑽�20
+ * @param order
+ * 閿�閲忕敱楂樺埌浣�:1 銆� 浠锋牸浠庨珮鍒颁綆:2 銆� 浠锋牸浠庝綆鍒伴珮:3 銆� 鎺ㄥ箍閲忛珮鍒颁綆:4锛堢患鍚堥粯璁わ級銆佽繑鍒╂瘮楂樺埌浣�:5
+ * 銆佽繑鍒╂瘮浣庡埌楂�:6 銆佹帹鑽�20
* @param startprice
* @param endprice
* @param fastFilter
* @param out
*/
@RequestMapping(value = "searchGoods")
- public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter, Integer order,
- PrintWriter out) {
- if (goodsType == null || goodsType < 1 || goodsType >3) {
+ public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,
+ Integer order, PrintWriter out) {
+ if (goodsType == null || goodsType < 1 || goodsType > 3) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶閫掓纭钩鍙板弬鏁�"));
return;
}
-
+
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶈兘灏忎簬1"));
return;
}
-
+
if (StringUtil.isNullOrEmpty(key)) {
out.print(JsonUtil.loadFalseResult(1, "璇疯緭鍏ユ悳绱㈠唴瀹�"));
return;
}
final String searchkey = key.trim();
-
+
executor.execute(new Runnable() {
@Override
public void run() {
@@ -318,12 +342,11 @@
String device = acceptData.getDevice();
sb.append(platform).append(link).append(packages).append(link).append(device);
String bid = StringUtil.Md5(sb.toString());
-
+
// 鍔犲叆鎼滅储鍘嗗彶璁板綍
historySearchService.addHistorySearch(searchkey, bid);
}
});
-
if (searchkey.startsWith("http://") || searchkey.startsWith("https://")) {
JSONObject data = new JSONObject();
@@ -333,19 +356,19 @@
return;
}
- /*--------- 浜笢鍟嗗搧 -------*/
+ /*--------- 浜笢鍟嗗搧 -------*/
if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) {
searchJDGoods(searchkey, page, filter, order, out);
return;
}
- /*-------- 鎷煎澶氬晢鍝� -------*/
+ /*-------- 鎷煎澶氬晢鍝� -------*/
if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {
searchPDDGoods(searchkey, page, filter, order, out);
return;
}
- /*-------- 娣樺疂鍟嗗搧 -------*/
+ /*-------- 娣樺疂鍟嗗搧 -------*/
searchTaoBaoGoods(searchkey, page, filter, order, out);
}
@@ -376,25 +399,25 @@
} else if (order == 4) { // 杩斿埄姣旈珮鍒颁綆
sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW);
}
- }
-
+ }
+
if (!StringUtil.isNullOrEmpty(filter)) {
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
sf.setQuan(1); // 鏈夊埜
}
-
+
Boolean tmall = jsonfilter.optBoolean("tmall");
if (tmall != null && tmall) {
sf.setTmall(true); // 澶╃尗
}
-
+
String minPrice = jsonfilter.optString("minPrice");
if (!StringUtil.isNullOrEmpty(minPrice)) {
sf.setStartPrice(new BigDecimal(minPrice));
}
-
+
String maxPrice = jsonfilter.optString("maxPrice");
if (!StringUtil.isNullOrEmpty(maxPrice)) {
sf.setEndPrice(new BigDecimal(maxPrice));
@@ -406,10 +429,10 @@
if (page == 1) {
daTaoKeList = daTaoKeGoodsDetailService.listByDtitle(key);
}
-
+
// 娣樺疂api鎼滅储鍟嗗搧
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
-
+
// 鎼滅储鏄惁鍦ㄨ惀閿�涓诲晢鍝佸簱
if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
ThreadUtil.run(new Runnable() {
@@ -421,7 +444,7 @@
}
});
}
-
+
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null;
if (result != null) {
taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
@@ -429,7 +452,7 @@
if (taoBaoGoodsBriefs == null) {
taoBaoGoodsBriefs = new ArrayList<>();
}
-
+
if (daTaoKeList != null && daTaoKeList.size() > 0) {
try {
Collections.reverse(daTaoKeList);
@@ -439,7 +462,7 @@
} catch (Exception e) {
}
}
-
+
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
@@ -449,7 +472,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().create();
-
+
JSONObject data = new JSONObject();
data.put("result", gson.toJson(list));
data.put("count", result.getTaoBaoHead().getDocsfound());
@@ -465,7 +488,6 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
* 浜笢
*
@@ -478,7 +500,7 @@
* @return
*/
private void searchJDGoods(String key, Integer page, String filter, Integer order, PrintWriter out) {
-
+
JDSearchResult result = null;
String way = configService.get("jd_api_search_key");
if ("1".equals(way)) {
@@ -511,31 +533,29 @@
}
}
-
if (!StringUtil.isNullOrEmpty(filter)) {
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
filterAPI.setIsCoupon(1); // 鏈夊埜
}
-
+
Boolean zy = jsonfilter.optBoolean("zy");
if (zy != null && zy) {
filterAPI.setOwner("g"); // 鑷惀
}
-
-
+
String minPrice = jsonfilter.optString("minPrice");
if (!StringUtil.isNullOrEmpty(minPrice)) {
filterAPI.setPricefrom(Double.parseDouble(minPrice));
}
-
+
String maxPrice = jsonfilter.optString("maxPrice");
if (!StringUtil.isNullOrEmpty(maxPrice)) {
filterAPI.setPriceto(Double.parseDouble(maxPrice));
}
}
-
+
result = JDApiUtil.queryByKey(filterAPI);
} else {
// 缃戦〉鐖彇
@@ -574,39 +594,39 @@
if (coupon != null && coupon) {
jdfilter.setHasCoupon(1); // 鏈夊埜
}
-
+
Boolean zy = jsonfilter.optBoolean("zy");
if (zy != null && zy) {
jdfilter.setIsZY(1); // 鑷惀
}
-
+
Boolean delivery = jsonfilter.optBoolean("delivery");
if (delivery != null && delivery) {
jdfilter.setDeliveryType(1); // 浜笢閰嶉��
}
-
+
String minPrice = jsonfilter.optString("minPrice");
if (!StringUtil.isNullOrEmpty(minPrice)) {
- if(minPrice.contains(".")) {
+ if (minPrice.contains(".")) {
minPrice = minPrice.replace(".", "-");
minPrice = minPrice.split("-")[0];
}
jdfilter.setFromPrice(Integer.parseInt(minPrice));
}
-
+
String maxPrice = jsonfilter.optString("maxPrice");
if (!StringUtil.isNullOrEmpty(maxPrice)) {
- if(maxPrice.contains(".")) {
+ if (maxPrice.contains(".")) {
maxPrice = maxPrice.replace(".", "-");
- maxPrice = maxPrice.split("-")[0];
+ maxPrice = maxPrice.split("-")[0];
}
jdfilter.setToPrice(Integer.parseInt(maxPrice));
}
}
result = JDUtil.searchByKey(jdfilter);
-
+
}
-
+
long count = 0;
JSONObject data = new JSONObject();
JSONArray array = new JSONArray();
@@ -623,8 +643,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));
}
}
@@ -636,7 +655,7 @@
}
/**
- * 浜笢
+ * 鎷煎澶�
*
* @param kw
* @param page
@@ -672,14 +691,14 @@
break;
}
}
-
+
if (!StringUtil.isNullOrEmpty(filter)) {
JSONObject jsonfilter = JSONObject.fromObject(filter);
Boolean coupon = jsonfilter.optBoolean("coupon");
if (coupon != null && coupon) {
pddfilter.setHasCoupon(true); // 鏈夊埜
}
-
+
Boolean brand = jsonfilter.optBoolean("brand");
if (brand != null && brand) {
pddfilter.setIsBrand(true); // 鏄惁鏄搧鐗�
@@ -698,15 +717,14 @@
if (goodsList != null && goodsList.size() > 0) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
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));
}
}
}
-
+
data.put("result", array);
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0