From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 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 285404b..7141466 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
@@ -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("娣诲姞鎴愬姛"));
@@ -155,12 +160,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("鍒犻櫎澶辫触"));
@@ -186,14 +187,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