From 020d940ae4e16f55f69cef3dd4c8dc0b9764af07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 10:59:48 +0800
Subject: [PATCH] 邀请对应奖励红包加入版本区分

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 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 f085024..9c35a23 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
@@ -13,10 +13,10 @@
 import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.entity.bus.search.HotSearch;
 import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
 import com.yeshi.fanli.service.inter.config.HotSearchService;
 import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
-import com.yeshi.fanli.service.inter.config.SystemService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
@@ -31,7 +31,7 @@
 	private HotSearchService hotSearchService;
 	
 	@Resource
-	private SystemService systemService;
+	private BusinessSystemService businessSystemService;
 	
 	@Resource
 	private SuperHotSearchService superHotSearchService;
@@ -155,12 +155,8 @@
 				return;
 			}
 			
-			Integer type = hotSearchService.deleteHotSearch(hsids);
-			if(type==null){
-				JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
-			}else{
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
-			}
+			hotSearchService.deleteHotSearch(hsids);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
 			
 		} catch (Exception e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
@@ -178,7 +174,7 @@
 		}
 		
 		try {
-			System system = systemService.getById(systemId);
+			BusinessSystem system = businessSystemService.getById(systemId);
 			List<SuperHotSearch> list = superHotSearchService.getHotSearchSystem(id, systemId);
 			if (list == null || list.size() == 0) {
 				superHotSearchService.addSuper(id, system);
@@ -186,14 +182,11 @@
 				data.put("check", 1);
 				JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 			} else {
-				Integer count = superHotSearchService.deleteSuper(id, systemId);
-				if (count > 0) {
-					JSONObject data = new JSONObject();
-					data.put("check", 0);
-					JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-				} else {
-					JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
-				}
+				superHotSearchService.deleteSuper(id, systemId);
+				
+				JSONObject data = new JSONObject();
+				data.put("check", 0);
+				JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 			}
 			
 		} catch (Exception e) {

--
Gitblit v1.8.0