From 2a7792afe7d5241f3be43aa82c246e4df1298ddc Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 30 十一月 2018 15:59:17 +0800
Subject: [PATCH] IOS推送内容过滤

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java |  110 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index b6afc6e..29647e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1706,42 +1706,49 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
-	public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String nickname, PrintWriter out) {
+	public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {
 		
-		List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
-		if (listThreeSale == null || listThreeSale.size() == 0) {
-			out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
-			return;
+		try {
+			List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
+			if (listThreeSale == null || listThreeSale.size() == 0) {
+				out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+				return;
+			}
+			
+			UserInfo worker = listThreeSale.get(0).getWorker();
+			if (worker == null) {
+				out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+				return;
+			}
+			
+			List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());
+			if (list == null || list.size() == 0) {
+				
+				ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();
+				extraInfo.setWorker(worker);
+				extraInfo.setNickname(memoName);
+				extraInfo.setCreateTime(new Date());
+				extraInfo.setUpdateTime(new Date());
+				
+				UserInfo boss = new UserInfo(uid);
+				extraInfo.setBoss(boss);
+				
+				threeSaleExtraInfoSerivce.insert(extraInfo);
+				
+			} else {
+				ThreeSaleExtraInfo extraInfo = list.get(0);
+				extraInfo.setNickname(memoName);
+				extraInfo.setUpdateTime(new Date());
+				threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
+			}
+			
+			out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+			
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+			e.printStackTrace();
 		}
 		
-		UserInfo worker = listThreeSale.get(0).getWorker();
-		if (worker == null) {
-			out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
-			return;
-		}
-		
-		List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());
-		if (list == null || list.size() == 0) {
-			
-			ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();
-			extraInfo.setWorker(worker);
-			extraInfo.setNickname(nickname);
-			extraInfo.setCreateTime(new Date());
-			extraInfo.setUpdateTime(new Date());
-			
-			UserInfo boss = new UserInfo(uid);
-			extraInfo.setBoss(boss);
-			
-			threeSaleExtraInfoSerivce.insert(extraInfo);
-			
-		} else {
-			ThreeSaleExtraInfo extraInfo = list.get(0);
-			extraInfo.setNickname(nickname);
-			extraInfo.setUpdateTime(new Date());
-			threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
-		}
-		
-		out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
 	}
 	
 	/**
@@ -1753,25 +1760,30 @@
 	 */
 	@RequestMapping(value = "removethreesale", method = RequestMethod.POST)
 	public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) {
+		try {
+			List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
+			if (listThreeSale == null || listThreeSale.size() == 0) {
+				out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
+				return;
+			}
+			
+			UserInfo worker = listThreeSale.get(0).getWorker();
+			if (worker == null) {
+				out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
+				return;
+			}
+			
+			// 鍒犻櫎鍏崇郴
+			threeSaleSerivce.deleteByPrimaryKey(inviteId);
+			// 鍒犻櫎澶囨敞
+			threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());
 		
-		List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
-		if (listThreeSale == null || listThreeSale.size() == 0) {
-			out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
-			return;
+			out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+			e.printStackTrace();
 		}
 		
-		UserInfo worker = listThreeSale.get(0).getWorker();
-		if (worker == null) {
-			out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
-			return;
-		}
-		
-		// 鍒犻櫎鍏崇郴
-		threeSaleSerivce.deleteByPrimaryKey(inviteId);
-		// 鍒犻櫎澶囨敞
-		threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());
-	
-		out.print(JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
 	}
 	
 }

--
Gitblit v1.8.0