From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 129 ++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 80 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 045790d..165ada6 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
@@ -98,12 +98,10 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
-
/**
* 绮樿创鏉夸俊鎭帹鑽�
*
@@ -145,37 +143,13 @@
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
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));
- return;
- }
-
- out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔璇ョ被鍨嬶紒"));
+ root.put("type", 2);
+ JSONObject data = new JSONObject();
+ data.put("title", text);
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
return;
}
@@ -236,9 +210,7 @@
out.print(JsonUtil.loadTrueResult(root));
}
-
-
-
+
/**
* 鎼滅储鍊欓�夎瘝
*
@@ -281,32 +253,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() {
@@ -317,12 +290,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();
@@ -332,19 +304,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);
}
@@ -375,25 +347,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));
@@ -405,10 +377,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() {
@@ -420,7 +392,7 @@
}
});
}
-
+
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = null;
if (result != null) {
taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
@@ -428,7 +400,7 @@
if (taoBaoGoodsBriefs == null) {
taoBaoGoodsBriefs = new ArrayList<>();
}
-
+
if (daTaoKeList != null && daTaoKeList.size() > 0) {
try {
Collections.reverse(daTaoKeList);
@@ -438,7 +410,7 @@
} catch (Exception e) {
}
}
-
+
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
@@ -448,7 +420,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());
@@ -464,7 +436,6 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
* 浜笢
*
@@ -477,7 +448,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)) {
@@ -510,31 +481,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 {
// 缃戦〉鐖彇
@@ -573,39 +542,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();
@@ -671,14 +640,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); // 鏄惁鏄搧鐗�
@@ -697,7 +666,7 @@
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);
@@ -705,7 +674,7 @@
}
}
}
-
+
data.put("result", array);
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0