From c04327c1e6271e10c6d4f13ebb53438f6edca50e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 09:06:16 +0800
Subject: [PATCH] 细节优化调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 168 +++++++++++++++++++++++++++----------------------------
1 files changed, 83 insertions(+), 85 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 209f9a1..8a53dde 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
@@ -94,7 +94,6 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
/**
* 鎼滅储-鏂扮増
*
@@ -102,9 +101,8 @@
* @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
@@ -112,10 +110,11 @@
*/
@RequestMapping(value = "searchGoods")
public void searchGoods(AcceptData acceptData, String kw, int page, String filter, String order, String startprice,
- String endprice, Double startTkRate, Double endTkRate, String fastFilter, Integer goodsType, PrintWriter out) {
+ String endprice, Double startTkRate, Double endTkRate, String fastFilter, Integer goodsType,
+ PrintWriter out) {
String bid = getHistorySearchBid(acceptData);
-
+
// 鍔犲叆鎼滅储鍘嗗彶璁板綍
historySearchService.addHistorySearch(kw, bid);
@@ -127,7 +126,7 @@
out.print(JsonUtil.loadTrueResult(data));
return;
}
-
+
if (!StringUtil.isNullOrEmpty(fastFilter)) {
if (!StringUtil.isNullOrEmpty(filter)) {
JSONArray filterArray = JSONArray.fromObject(filter);
@@ -143,20 +142,18 @@
if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
-
+
// 浜笢鍟嗗搧
if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) {
searchJDGoods(kw, page, filter, order, startprice, endprice, out);
return;
}
-
+
if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {
// 鎷煎澶氬晢鍝� TODO
searchPDDGoods(kw, page, filter, order, startprice, endprice, out);
return;
}
-
-
// 鏄惁鏄帹鑽�
boolean recommend = false;
@@ -190,7 +187,7 @@
listRecommendWords = new ArrayList<String>();
}
- List<TaoBaoShopVO> listShop =taoBaoShopService.getShopByKey(kw);
+ List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKey(kw);
if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoods() != null
&& listShop.get(0).getListGoods().size() > 2) {
data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));
@@ -204,7 +201,6 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
private String getHistorySearchBid(AcceptData acceptData) {
StringBuffer sb = new StringBuffer();
String link = "#$$$#";
@@ -215,7 +211,6 @@
return StringUtil.Md5(sb.toString());
}
-
/**
* 鎵ц鎼滅储-鏂扮増
*
@@ -410,7 +405,7 @@
boolean ft = sf.isTmall();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+
if (fq == 0 && fh == 0 && !ft) {
if (result != null && taoBaoGoodsBriefs != null)
for (TaoBaoGoodsBrief bf : taoBaoGoodsBriefs) {
@@ -422,18 +417,18 @@
list.add(GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate));
}
}
-
+
Gson gson2 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().create();
-
+
data.put("result", gson2.toJson(list));
data.put("count", result.getTaoBaoHead().getDocsfound());
return data;
}
-
/**
* 澶ф窐瀹㈠晢鍝�
+ *
* @param key
* @param page
* @param filter
@@ -510,9 +505,9 @@
}
}
}
-
+
/**
- * 浜笢
+ * 浜笢
*
* @param kw
* @param page
@@ -522,8 +517,8 @@
* @param endprice
* @return
*/
- private void searchJDGoods(String kw, int page, String filter, String order, String startprice,
- String endprice, PrintWriter out) {
+ private void searchJDGoods(String kw, int page, String filter, String order, String startprice, String endprice,
+ PrintWriter out) {
JDSearchFilter jdfilter = new JDSearchFilter();
jdfilter.setKey(SearchFilterUtil.filterSearchContent(kw));
jdfilter.setPageNo(page);
@@ -536,42 +531,43 @@
if (!StringUtil.isNullOrEmpty(endprice)) {
jdfilter.setToPrice(Integer.parseInt(endprice));
}
-
-
+
int sort = 1;
if (!StringUtil.isNullOrEmpty(order)) {
sort = Integer.parseInt(order);
}
-
+
switch (sort) {
- case 1: // 閿�閲� desc
- jdfilter.setSort(JDSearchFilter.SORT_DESC);
- jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
- break;
- case 2: // 浠锋牸鈥攄esc
- jdfilter.setSort(JDSearchFilter.SORT_DESC);
- jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE);
- break;
- case 3: // 浠锋牸鈥攁sc
- jdfilter.setSort(JDSearchFilter.SORT_ASC);
- jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE);
- break;
- case 5: // 杩斿埄姣斺�攁sc
- jdfilter.setSort(JDSearchFilter.SORT_DESC);
- jdfilter.setSortName(JDSearchFilter.SORTNAME_COMMISSION_SHARE);
- break;
- default: // 榛樿锛氶攢閲� desc
- jdfilter.setSort(JDSearchFilter.SORT_DESC);
- jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
- break;
+ case 1: // 閿�閲� desc
+ jdfilter.setSort(JDSearchFilter.SORT_DESC);
+ jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
+ break;
+ case 2: // 浠锋牸鈥攄esc
+ jdfilter.setSort(JDSearchFilter.SORT_DESC);
+ jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE);
+ break;
+ case 3: // 浠锋牸鈥攁sc
+ jdfilter.setSort(JDSearchFilter.SORT_ASC);
+ jdfilter.setSortName(JDSearchFilter.SORTNAME_PRICE);
+ break;
+ case 5: // 杩斿埄姣斺�擠ESC
+ jdfilter.setSort(JDSearchFilter.SORT_DESC);
+ jdfilter.setSortName(JDSearchFilter.SORTNAME_COMMISSION_SHARE);
+ break;
+ default: // 榛樿锛氶攢閲� desc
+ //jdfilter.setSort(JDSearchFilter.SORT_DESC);
+ //jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
+ break;
}
if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(filter)) {
JSONArray array = JSONArray.fromObject(filter);
for (int i = 0; i < array.size(); i++) {
String ty = array.optJSONObject(i).optString("type");
- if ("quantype".equalsIgnoreCase(ty)) {
- jdfilter.setHasCoupon(1); // 鏈夊埜
+ if ("quantype".equalsIgnoreCase(ty)) {
+ jdfilter.setHasCoupon(1); // 鏈夊埜
+ } else if ("zy".equalsIgnoreCase(ty)) {
+ jdfilter.setIsZY(1); // 鏄惁鑷惀
}
}
}
@@ -585,28 +581,28 @@
if (pageEntity != null) {
count = pageEntity.getTotalCount();
}
-
+
List<JDGoods> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- for (JDGoods goods: goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate, shareRate);
+ for (JDGoods goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
+ shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
}
-
+
data.put("result", array);
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
- * 浜笢
+ * 浜笢
*
* @param kw
* @param page
@@ -616,8 +612,8 @@
* @param endprice
* @return
*/
- private void searchPDDGoods(String kw, int page, String filter, String order, String startprice,
- String endprice, PrintWriter out) {
+ private void searchPDDGoods(String kw, int page, String filter, String order, String startprice, String endprice,
+ PrintWriter out) {
PDDSearchFilter pddfilter = new PDDSearchFilter();
pddfilter.setKw(SearchFilterUtil.filterSearchContent(kw));
pddfilter.setPage(page);
@@ -627,38 +623,39 @@
if (!StringUtil.isNullOrEmpty(order)) {
sort = Integer.parseInt(order);
}
-
+
switch (sort) {
- case 1: // 閿�閲� desc
- pddfilter.setSortType(6);
- break;
- case 2: // 浠锋牸鈥攄esc
- pddfilter.setSortType(4);
- break;
- case 3: // 浠锋牸鈥攁sc
- pddfilter.setSortType(3);
- break;
- case 5: // 杩斿埄姣斺�攁sc
- pddfilter.setSortType(2);
- break;
- case 6: // 杩斿埄姣斺�攁sc
- pddfilter.setSortType(1);
- break;
- case 20: // 缁煎悎鎺掑簭
- pddfilter.setSortType(0);
- break;
- default: // 榛樿锛氶攢閲� desc
- pddfilter.setSortType(6);
- break;
+ case 1: // 閿�閲� desc
+ pddfilter.setSortType(6);
+ break;
+ case 2: // 浠锋牸鈥攄esc
+ pddfilter.setSortType(4);
+ break;
+ case 3: // 浠锋牸鈥攁sc
+ pddfilter.setSortType(3);
+ break;
+ case 5: // 杩斿埄姣斺�攁sc
+ pddfilter.setSortType(2);
+ break;
+ case 6: // 杩斿埄姣斺�攁sc
+ pddfilter.setSortType(1);
+ break;
+ case 20: // 缁煎悎鎺掑簭
+ pddfilter.setSortType(0);
+ break;
+ default: // 榛樿锛氶攢閲� desc
+ // pddfilter.setSortType(6);
+ break;
}
-
-
+
if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(filter)) {
JSONArray array = JSONArray.fromObject(filter);
for (int i = 0; i < array.size(); i++) {
String ty = array.optJSONObject(i).optString("type");
- if ("quantype".equalsIgnoreCase(ty)) {
- pddfilter.setHasCoupon(true); // 鏈夊埜
+ if ("quantype".equalsIgnoreCase(ty)) {
+ pddfilter.setHasCoupon(true); // 鏈夊埜
+ } else if ("brand".equalsIgnoreCase(ty)) {
+ pddfilter.setIsBrand(true); // 鏄惁鏄搧鐗�
}
}
}
@@ -666,7 +663,7 @@
int count = 0;
JSONObject data = new JSONObject();
JSONArray array = new JSONArray();
-
+
PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
if (result != null) {
count = result.getTotalCount();
@@ -676,13 +673,14 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- for (PDDGoodsDetail goods: goodsList) {
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate, shareRate);
+ for (PDDGoodsDetail goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
+ shareRate);
array.add(gson.toJson(goodsDetailVO));
}
}
}
-
+
data.put("result", array);
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0