From 5046ecde3cd849511a337e25e13af7df7f1894bc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java
index 78d19cb..39202e5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java
@@ -179,7 +179,15 @@
sf.setStartTkRate(Integer.parseInt(rate));
} catch (Exception e) {
}
-
+ if (!StringUtil.isNullOrEmpty(order))
+ if (Integer.parseInt(order) == 0)
+ sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
+ else if (Integer.parseInt(order) == 2)
+ sf.setSort(TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH);
+ else if (Integer.parseInt(order) == 3)
+ sf.setSort(TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW);
+ else if (Integer.parseInt(order) == 4)
+ sf.setSort(TaoBaoUtil.SORT_TKRATE_HIGH_TO_LOW);
if (StringUtil.isNullOrEmpty(kw))
recommend = true;
@@ -243,12 +251,12 @@
}
} else {
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
- if(taoBaoGoodsBriefs!=null)
- for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
- proportion.toString(), "");
- listExtra.add(taoBaoGoodsBriefExtra);
- }
+ if (taoBaoGoodsBriefs != null)
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), "");
+ listExtra.add(taoBaoGoodsBriefExtra);
+ }
}
count = result.getTaoBaoHead().getDocsfound();
}
@@ -428,7 +436,7 @@
* out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
* return; }
*/
- List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4); // 杩斿埄鍒竌pp
+ List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4,null); // 杩斿埄鍒竌pp
if (superHotSearchList == null || superHotSearchList.size() == 0) {
out.print(JsonUtil.loadFalseResult(WebControllerUtil.NODATA));
return;
--
Gitblit v1.8.0