From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
index 9c35a23..713caea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java
@@ -70,7 +70,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "newHotSearchList")
-	public void newHotSearchList(String callback, Integer pageIndex, String key, Long systemId,
+	public void newHotSearchList(String callback, Integer pageIndex, String key, Long systemId, Integer useType, 
 			PrintWriter out) {
 
 		if (pageIndex == null || pageIndex < 1) {
@@ -80,13 +80,13 @@
 		int pageSize = Constant.PAGE_SIZE;
 
 		try {
-			List<HotSearch> list = hotSearchService.listQuery(pageIndex - 1, pageSize, key, systemId);
+			List<HotSearch> list = hotSearchService.listQuery(pageIndex - 1, pageSize, key, systemId, useType);
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
 				return;
 			}
 
-			int count = hotSearchService.countList(key, systemId);
+			int count = hotSearchService.countList(key, systemId, useType);
 
 			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
 			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -123,6 +123,11 @@
 		}
 		
 		try {	
+			Integer useType = hotSearch.getUseType();
+			if (useType == null) {
+				hotSearch.setUseType(Constant.SOURCE_TYPE_TAOBAO);
+			}
+			
 			hotSearch.setId(null);
 			hotSearchService.addHotSearch(hotSearch);
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));

--
Gitblit v1.8.0