From 9e3cad74d0eb3f0b8a21bc90b651667c3252bad7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 14:54:52 +0800
Subject: [PATCH] 积分明细
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java | 46 ++--------------------------------------------
1 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
index 47ef255..9a5e6d9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
@@ -77,7 +77,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(XcxMiniControllerUtil.NODATA));
return;
@@ -177,7 +177,7 @@
return;
}
- String kw = goodsClassService.getKwById(id);
+ String kw = goodsClassService.getKeysById(id);
filter = "[{\"type\": \"quantype\"}]";
JSONObject data = search(kw, pagesize, filter, order, startprice, endprice);
// if (StringUtil.isNullOrEmpty(kw)) {
@@ -404,48 +404,6 @@
data.put("result", gson2.toJson(re));
data.put("count", result.getTaoBaoHead().getDocsfound());
return data;
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鍘嗗彶鎼滅储
- *
- * @author mawurui createTime 2018骞�4鏈�25鏃� 涓嬪崍3:04:06
- * @param acceptData
- * @param out
- */
- @RequestMapping(value = "gethistorysearch", method = RequestMethod.POST)
- public void getHistorySearch(AcceptData acceptData, PrintWriter out) {
- String bid = getHistorySearchBid(acceptData);
- List<HistorySearch> historySearchList = historySearchService.getHistorySearch(bid);
- if (historySearchList == null || historySearchList.size() == 0) {
- out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NODATA));
- return;
- }
- JSONObject data = new JSONObject();
- data.put("count", historySearchList.size());
- Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
- data.put("historySearchList", gson.toJson(historySearchList));
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
-
- /**
- *
- * 鏂规硶璇存槑: 娓呯┖鍘嗗彶鎼滅储
- *
- * @author mawurui createTime 2018骞�4鏈�25鏃� 涓嬪崍3:04:23
- * @param acceptData
- * @param out
- */
- @RequestMapping(value = "clearhistorysearch", method = RequestMethod.POST)
- public void clearHistorySearch(AcceptData acceptData, PrintWriter out) {
- String bid = getHistorySearchBid(acceptData);
- long count = historySearchService.clearHistorySearch(bid);
- JSONObject data = new JSONObject();
- data.put("count", count);
- out.print(JsonUtil.loadTrueResult(data));
- return;
}
/**
--
Gitblit v1.8.0