From d8fc7a24f8a2be1bc62aa38083a9f3dd3fbb3dc4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 二月 2019 17:40:55 +0800
Subject: [PATCH] 封禁用户相关操作

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java |  585 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 344 insertions(+), 241 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index 8b2c409..2ef76b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -35,14 +35,19 @@
 import com.yeshi.fanli.controller.admin.utils.AdminUtils;
 import com.yeshi.fanli.entity.admin.UserInfoAdmin;
 import com.yeshi.fanli.entity.bus.user.AccountDetails;
+import com.yeshi.fanli.entity.bus.user.BindingAccount;
 import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
 import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.MoneyRecord;
 import com.yeshi.fanli.entity.bus.user.Order;
 import com.yeshi.fanli.entity.bus.user.ThreeSale;
+import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
 import com.yeshi.fanli.entity.taobao.PidOrder;
 import com.yeshi.fanli.entity.taobao.ScanHistory;
+import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.count.UserInfoCountService;
 import com.yeshi.fanli.service.inter.goods.ShareService;
@@ -54,9 +59,11 @@
 import com.yeshi.fanli.service.inter.user.AccountDetailsService;
 import com.yeshi.fanli.service.inter.user.BindingAccountService;
 import com.yeshi.fanli.service.inter.user.ExtractService;
+import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
 import com.yeshi.fanli.service.inter.user.MoneyRecordService;
 import com.yeshi.fanli.service.inter.user.ScanHistoryService;
 import com.yeshi.fanli.service.inter.user.UserActiveLogService;
+import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
@@ -103,16 +110,21 @@
 
 	@Resource
 	private AccountDetailsService accountDetailsService;
-	
+
 	@Resource
 	private BindingAccountService bindingAccountService;
-	
+
 	@Resource
 	private UserInfoCountService userInfoCountService;
-	
+
 	@Resource
 	private UserActiveLogService userActiveLogService;
-	
+
+	@Resource
+	private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
+
+	@Resource
+	private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
 
 	@RequestMapping(value = "getUserList", method = RequestMethod.POST)
 	public void getUserList(int pageIndex, String key, PrintWriter out) {
@@ -599,22 +611,28 @@
 		}
 	}
 
-	
 	/**
 	 * 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃--鐩稿叧鏁版嵁缁熻
+	 * 
 	 * @param callback
 	 * @param pageIndex
-	 * @param key   鏌ヨ鏉′欢
-	 * @param userType   鐢ㄦ埛绫诲瀷锛氶噾鍐犮�侀摱鍐犮�侀摐鍐�
-	 * @param days    鏌ヨ澶╂暟
-	 * @param startTime  娉ㄥ唽鏃堕棿 
-	 * @param endTime	   娉ㄥ唽鏃堕棿
-	 * @param orderMode  鎺掑簭鏂瑰紡  璁㈠崟鏁伴噺 浠婃棩璁㈠崟  绱闃熷憳
+	 * @param key
+	 *            鏌ヨ鏉′欢
+	 * @param userType
+	 *            鐢ㄦ埛绫诲瀷锛氶噾鍐犮�侀摱鍐犮�侀摐鍐�
+	 * @param days
+	 *            鏌ヨ澶╂暟
+	 * @param startTime
+	 *            娉ㄥ唽鏃堕棿
+	 * @param endTime
+	 *            娉ㄥ唽鏃堕棿
+	 * @param orderMode
+	 *            鎺掑簭鏂瑰紡 璁㈠崟鏁伴噺 浠婃棩璁㈠崟 绱闃熷憳
 	 * @param out
 	 */
 	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer userType, 
-			Integer days, String startTime,	String endTime, Integer orderMode, PrintWriter out) {
+	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer userType, Integer days,
+			String startTime, String endTime, Integer orderMode, PrintWriter out) {
 
 		try {
 
@@ -634,30 +652,29 @@
 
 			if (pageSize == null)
 				pageSize = Constant.PAGE_SIZE;
-			
+
 			Integer orderField = null;
 			if (orderMode != null) {
-				if (orderMode == 1 || orderMode == 2){
+				if (orderMode == 1 || orderMode == 2) {
 					orderField = orderMode;
 					orderMode = 1;
-				} else if (orderMode == 3 || orderMode == 4){
+				} else if (orderMode == 3 || orderMode == 4) {
 					orderField = orderMode;
 					orderMode = 2;
-				} else if (orderMode == 5 || orderMode == 6){
+				} else if (orderMode == 5 || orderMode == 6) {
 					orderField = orderMode;
 					orderMode = 3;
 				}
 			}
-			
 
-			List<UserInfoAdmin> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize,
-					key, userType, days, startTime, endTime,orderField, orderMode);
+			List<UserInfoAdmin> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, key, userType,
+					days, startTime, endTime, orderField, orderMode);
 
 			if (userList == null || userList.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
 				return;
 			}
-			
+
 			long count = userInfoService.queryCount(key, userType, days, startTime, endTime);
 
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -669,9 +686,9 @@
 
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
-			//data.put("sumMoney", sumMoney);
+			// data.put("sumMoney", sumMoney);
 			data.put("resultList", gson.toJson(userList));
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
 		} catch (Exception e) {
@@ -679,18 +696,19 @@
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
-	
+
 	/**
 	 * 缁熻浠婃棩鐢ㄦ埛鎬绘儏鍐�
+	 * 
 	 * @param callback
 	 * @param out
 	 */
 	@RequestMapping(value = "countInfo")
 	public void countInfo(String callback, PrintWriter out) {
 		try {
-			
+
 			JSONObject data = new JSONObject();
-			
+
 			// 鎬绘暟-鏅�氱敤鎴�
 			long countNormal = userInfoCountService.countRank(0);
 			// 鎬绘暟-閾滅敤鎴�
@@ -699,56 +717,54 @@
 			long countSilver = userInfoCountService.countRank(2);
 			// 鎬绘暟-閲戠敤鎴�
 			long countGold = userInfoCountService.countRank(3);
-			
+
 			data.put("countNormal", countNormal);
 			data.put("countCuprum", countCuprum);
 			data.put("countSilver", countSilver);
 			data.put("countGold", countGold);
-			
+
 			/*
-			// 缁熻鎵�鏈夋�婚噾棰�
-			BigDecimal countTotalMoney = userInfoCountService.countAllMoney(null);
-			
-			// 缁熻鎵�鏈夊彲鎻愮幇閲戦
-			String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
-			if (minMoney == null) {
-				minMoney = "20";
-			}
-			double min = Double.parseDouble(minMoney);
-			BigDecimal countCanAssets = userInfoCountService.countAllMoney(min);
-			data.put("countTotalMoney", countTotalMoney);
-			data.put("countCanAssets", countCanAssets);
-			*/
-			
+			 * // 缁熻鎵�鏈夋�婚噾棰� BigDecimal countTotalMoney =
+			 * userInfoCountService.countAllMoney(null);
+			 * 
+			 * // 缁熻鎵�鏈夊彲鎻愮幇閲戦 String minMoney =
+			 * configService.get(Constant.EXTRACT_MIN_MONEY); if (minMoney ==
+			 * null) { minMoney = "20"; } double min =
+			 * Double.parseDouble(minMoney); BigDecimal countCanAssets =
+			 * userInfoCountService.countAllMoney(min);
+			 * data.put("countTotalMoney", countTotalMoney);
+			 * data.put("countCanAssets", countCanAssets);
+			 */
+
 			// 绱鐢ㄦ埛鏁伴噺
 			long totalUser = userInfoCountService.countNewUser(null, null);
 			// 娴佸け鐢ㄦ埛鏁伴噺锛�180澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
 			long loseUser = userInfoCountService.countLoseUser(180);
 			// 绱鏈夎喘涔扮敤鎴锋暟
 			long orderUser = userInfoCountService.countHasOrderUser();
-			
+
 			data.put("totalUser", totalUser);
 			data.put("loseUser", loseUser);
 			data.put("orderUser", orderUser);
-			
+
 			// 浠婃棩鏂板鐢ㄦ埛鏁伴噺
 			long todayUser = userInfoCountService.countNewUser(1, null);
 			// 鏈湀鏂板鐢ㄦ埛鏁伴噺
 			long monthUser = userInfoCountService.countNewUser(null, 1);
 			data.put("todayUser", todayUser);
 			data.put("monthUser", monthUser);
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
-	
-	
+
 	/**
 	 * 淇敼鐢ㄦ埛鐨勭姸鎬併�佺瓑绾т俊鎭�
+	 * 
 	 * @param callback
 	 * @param userInfo
 	 * @param out
@@ -756,51 +772,140 @@
 	@RequestMapping(value = "setInfo")
 	public void setInfo(String callback, UserInfo userInfo, PrintWriter out) {
 		try {
-			
+
 			Long id = userInfo.getId();
-			
+
 			if (id == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
 				return;
 			}
-			
+
 			UserInfo currentInfo = userInfoService.selectByPKey(id);
 			if (currentInfo == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡涓嶅瓨鍦�"));
 				return;
 			}
-			
+
+			currentInfo = new UserInfo(id);
+
 			boolean hasChange = false;
-			
+
 			// 绛夌骇淇敼
 			Integer rank = userInfo.getRank();
 			if (rank != null) {
 				hasChange = true;
 				currentInfo.setRank(rank);
 			}
-			
+
 			// 鐘舵�佷慨鏀�
 			Integer state = userInfo.getState();
 			if (state != null) {
 				hasChange = true;
 				currentInfo.setState(state);
+				if (state != null && state == UserInfo.STATE_FORBIDDEN)
+					currentInfo.setStateDesc("绠$悊鍛樺皝绂�");
 			}
-			
+
 			if (hasChange) {
 				userInfoService.updateByPrimaryKeySelective(currentInfo);
+				UserInfo nowUser = userInfoService.selectByPKey(id);
+				if (state != null && state == UserInfo.STATE_FORBIDDEN) {
+					// 鍔犲叆灏佺鐨勮处鍙峰垪琛�
+					ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();
+					forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId);
+					forbiddenUserIdentifyCode.setIdentifyCode(nowUser.getWxUnionId());
+					forbiddenUserIdentifyCode.setBeiZhu(nowUser.getWxName());
+					try {
+						forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);
+					} catch (ForbiddenUserIdentifyCodeException e) {
+						e.printStackTrace();
+					}
+
+					// 鐢佃瘽鍙风爜
+					forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();
+					forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.phone);
+					forbiddenUserIdentifyCode.setIdentifyCode(nowUser.getPhone());
+					try {
+						forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);
+					} catch (ForbiddenUserIdentifyCodeException e) {
+						e.printStackTrace();
+					}
+
+					// 娣樺疂
+					UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(nowUser.getId());
+					if (taoBao != null && !StringUtil.isNullOrEmpty(taoBao.getTaoBaoUid())) {
+						forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();
+						forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.taobaoUid);
+						forbiddenUserIdentifyCode.setIdentifyCode(taoBao.getTaoBaoUid());
+						try {
+							forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);
+						} catch (ForbiddenUserIdentifyCodeException e) {
+							e.printStackTrace();
+						}
+					}
+
+					// 鏌ヨ鏀粯瀹濈粦瀹�
+
+					List<BindingAccount> list = bindingAccountService.getBindingAccountByUid(nowUser.getId());
+					if (list != null)
+						for (BindingAccount ba : list) {
+							forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();
+							forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.alipayAccount);
+							forbiddenUserIdentifyCode.setIdentifyCode(ba.getAccount());
+							forbiddenUserIdentifyCode.setBeiZhu(ba.getName());
+							try {
+								forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);
+							} catch (ForbiddenUserIdentifyCodeException e) {
+								e.printStackTrace();
+							}
+						}
+				} else if (state != null && state == UserInfo.STATE_NORMAL) {
+					// 瑙e皝寰俊
+					ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService
+							.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId,
+									nowUser.getWxUnionId());
+					if (forbiddenUserIdentifyCode != null)
+						forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
+					// 瑙e皝鎵嬫満
+					forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService
+							.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, nowUser.getPhone());
+					if (forbiddenUserIdentifyCode != null)
+						forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
+					// 瑙e皝娣樺疂
+					UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(nowUser.getId());
+					if (taoBao != null && !StringUtil.isNullOrEmpty(taoBao.getTaoBaoUid())) {
+						forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService.listByTypeAndIdentifyCode(
+								ForbiddenUserIdentifyCodeTypeEnum.taobaoUid, taoBao.getTaoBaoUid());
+						if (forbiddenUserIdentifyCode != null)
+							forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
+					}
+					// 瑙e皝鏀粯瀹�
+					List<BindingAccount> list = bindingAccountService.getBindingAccountByUid(nowUser.getId());
+					if (list != null)
+						for (BindingAccount ba : list) {
+							forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService.listByTypeAndIdentifyCode(
+									ForbiddenUserIdentifyCodeTypeEnum.alipayAccount, ba.getAccount());
+							if (forbiddenUserIdentifyCode != null)
+								forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
+						}
+				}
+
 				JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
 			} else {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏃犲彲淇敼鍐呭"));
 			}
-			
-		} catch (Exception e) {
+
+		} catch (
+
+		Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
 		}
 	}
-	
+
 	/**
-	 * 鍒犻櫎缁戝畾鐨勮处鎴蜂俊鎭細 鏀粯瀹�  寰俊
+	 * 鍒犻櫎缁戝畾鐨勮处鎴蜂俊鎭細 鏀粯瀹� 寰俊
+	 * 
 	 * @param callback
 	 * @param bindId
 	 * @param out
@@ -827,7 +932,7 @@
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
-	
+
 	/**
 	 * 
 	 * @param data
@@ -839,19 +944,17 @@
 	@RequestMapping("unBindUserInfo")
 	public void unBindUserInfo(String callback, Long id, Integer type, PrintWriter out) {
 		try {
-			
+
 			if (id == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐢ㄦ埛锛�"));
 				return;
 			}
 
-			
 			if (type == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璐︽埛绫诲瀷涓嶅彲涓虹┖锛�"));
 				return;
 			}
 
-			
 			UserInfo find = userInfoService.getUserById(id);
 
 			if (find == null) {
@@ -885,48 +988,45 @@
 			userInfoService.deleteBindInfo(find, type);
 
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("瑙g粦鎴愬姛"));
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
-	
-	
 
 	@RequestMapping(value = "queryMyFirstTeams")
-	public void queryMyFirstTeams(String callback, Integer pageIndex, Integer pageSize, String key, 
-			Long bossId, PrintWriter out) {
+	public void queryMyFirstTeams(String callback, Integer pageIndex, Integer pageSize, String key, Long bossId,
+			PrintWriter out) {
 		try {
-			
+
 			if (bossId == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
 				return;
 			}
-			
+
 			if (pageIndex == null)
 				pageIndex = 1;
 
 			if (pageSize == null)
 				pageSize = Constant.PAGE_SIZE;
-			
-			
-			List<ThreeSale> firstTeamList = 
-					threeSaleService.queryMyFirstTeamList((pageIndex - 1) * pageSize, pageSize, key, bossId);
+
+			List<ThreeSale> firstTeamList = threeSaleService.queryMyFirstTeamList((pageIndex - 1) * pageSize, pageSize,
+					key, bossId);
 			if (firstTeamList == null || firstTeamList.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤涓�搴﹂槦鍛�"));
 				return;
 			}
-			
+
 			/* 鑾峰彇閭�璇风敤鎴峰ご鍍� 銆佹樀绉� */
-			for (ThreeSale threeSale: firstTeamList) {
+			for (ThreeSale threeSale : firstTeamList) {
 				UserInfo worker = threeSale.getWorker();
 				if (worker == null) {
 					worker = new UserInfo();
 					threeSale.setWorker(worker);
-				} else{
+				} else {
 					Long id = worker.getId();
-					
+
 					UserInfo currentInfo = userInfoService.selectByPKey(id);
 					if (currentInfo != null) {
 						worker.setNickName(currentInfo.getNickName());
@@ -934,7 +1034,7 @@
 					}
 				}
 			}
-			
+
 			long count = threeSaleService.queryCountMyFirstTeamList(key, bossId);
 
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -947,49 +1047,47 @@
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
 			data.put("list", gson.toJson(firstTeamList));
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
-	
-	
+
 	@RequestMapping(value = "queryMySecondTeams")
-	public void queryMySecondTeams(String callback, Integer pageIndex, Integer pageSize, String key, 
-			Long bossId, PrintWriter out) {
+	public void queryMySecondTeams(String callback, Integer pageIndex, Integer pageSize, String key, Long bossId,
+			PrintWriter out) {
 		try {
-			
+
 			if (bossId == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
 				return;
 			}
-			
+
 			if (pageIndex == null)
 				pageIndex = 1;
 
 			if (pageSize == null)
 				pageSize = Constant.PAGE_SIZE;
-			
-			
-			List<ThreeSale> firstTeamList = 
-					threeSaleService.queryMySecondTeamList((pageIndex - 1) * pageSize, pageSize, key, bossId);
+
+			List<ThreeSale> firstTeamList = threeSaleService.queryMySecondTeamList((pageIndex - 1) * pageSize, pageSize,
+					key, bossId);
 			if (firstTeamList == null || firstTeamList.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤浜屽害闃熷憳"));
 				return;
 			}
-			
+
 			/* 鑾峰彇閭�璇风敤鎴峰ご鍍� 銆佹樀绉� */
-			for (ThreeSale threeSale: firstTeamList) {
+			for (ThreeSale threeSale : firstTeamList) {
 				UserInfo worker = threeSale.getWorker();
 				if (worker == null) {
 					worker = new UserInfo();
 					threeSale.setWorker(worker);
-				} else{
+				} else {
 					Long id = worker.getId();
-					
+
 					UserInfo currentInfo = userInfoService.selectByPKey(id);
 					if (currentInfo != null) {
 						worker.setNickName(currentInfo.getNickName());
@@ -997,7 +1095,7 @@
 					}
 				}
 			}
-			
+
 			long count = threeSaleService.queryCountMySecondTeamList(key, bossId);
 
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -1010,43 +1108,41 @@
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
 			data.put("list", gson.toJson(firstTeamList));
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
-	
-	
+
 	@RequestMapping(value = "deleteThreeSale")
 	public void deleteThreeSale(String callback, Long id, PrintWriter out) {
 		try {
-			
+
 			if (id == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
 				return;
 			}
-			
+
 			int count = threeSaleService.deleteByPrimaryKey(id);
-			
+
 			if (count > 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
-			} else{
+			} else {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
 			}
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
-	
-	
-	
+
 	/**
 	 * 闃熷憳鍏崇郴
+	 * 
 	 * @param pageIndex
 	 * @param key
 	 * @param state
@@ -1057,7 +1153,7 @@
 	@RequestMapping(value = "getRelationList")
 	public void getRelationList(String callback, Integer pageIndex, Integer pageSize, Long uid, Integer type,
 			Integer state, String startTime, String endTime, PrintWriter out) {
-		
+
 		if (pageIndex == null || pageIndex < 1) {
 			pageIndex = 1;
 		}
@@ -1065,9 +1161,9 @@
 		if (pageSize == null || pageSize < 1) {
 			pageSize = Constant.PAGE_SIZE;
 		}
-		
+
 		try {
-			
+
 			if (!StringUtil.isNullOrEmpty(endTime)) {
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 				Date enddate = sdf.parse(endTime);
@@ -1076,7 +1172,7 @@
 				c.add(Calendar.DAY_OF_MONTH, 1);// 浠婂ぉ+1澶�
 				endTime = sdf.format(c.getTime());
 			}
-			
+
 			List<ThreeSale> listQuery = null;
 			if (type == 0) {
 				// 涓婄骇鐢ㄦ埛
@@ -1087,20 +1183,20 @@
 				listQuery = threeSaleService.listSuperiorQuery((pageIndex - 1) * pageSize, pageSize, state, uid);
 			} else if (type == 1) {
 				// 涓�绾х敤鎴�
-				listQuery = threeSaleService.listFirstTeamQuery((pageIndex - 1) * pageSize, pageSize, uid, 
-						state, startTime, endTime);
+				listQuery = threeSaleService.listFirstTeamQuery((pageIndex - 1) * pageSize, pageSize, uid, state,
+						startTime, endTime);
 			} else if (type == 2) {
 				// 浜岀骇鐢ㄦ埛
-				listQuery = threeSaleService.listSecondTeamQuery((pageIndex - 1) * pageSize, pageSize, uid,
-						state, startTime, endTime);
+				listQuery = threeSaleService.listSecondTeamQuery((pageIndex - 1) * pageSize, pageSize, uid, state,
+						startTime, endTime);
 			}
-			
+
 			if (listQuery == null || listQuery.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
 				return;
 			}
-			
-			for (ThreeSale threeSale: listQuery) {
+
+			for (ThreeSale threeSale : listQuery) {
 				Integer expire = threeSale.getExpire();
 				if (threeSale.getState()) {
 					threeSale.setExpire(1); // 閭�璇锋垚鍔�
@@ -1112,7 +1208,7 @@
 					}
 				}
 			}
-			
+
 			long count = 0;
 			if (type == 0) {
 				// 涓婄骇鐢ㄦ埛
@@ -1124,25 +1220,25 @@
 				// 浜岀骇鐢ㄦ埛
 				count = threeSaleService.countSecondTeamQuery(uid, state, startTime, endTime);
 			}
-			
+
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
 			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-			
+
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
 			data.put("result_list", listQuery);
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-			
+
 		} catch (Exception e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
 			e.printStackTrace();
-		}		
+		}
 	}
-	
-	
+
 	/**
 	 * 鐢ㄦ埛璐︽埛鏄庣粏
+	 * 
 	 * @param callback
 	 * @param pageIndex
 	 * @param pageSize
@@ -1150,7 +1246,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "getAccountDetails")
-	public void getAccountDetails(String callback, Integer pageIndex,Integer pageSize, Long uid, PrintWriter out) {
+	public void getAccountDetails(String callback, Integer pageIndex, Integer pageSize, Long uid, PrintWriter out) {
 		if (pageIndex == null || pageIndex < 1) {
 			pageIndex = 1;
 		}
@@ -1158,67 +1254,72 @@
 		if (pageSize == null || pageSize < 1) {
 			pageSize = Constant.PAGE_SIZE;
 		}
-		
+
 		if (uid == null) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
 			return;
 		}
-		
+
 		try {
-			
+
 			List<AccountDetails> detailsList = accountDetailsService.findAccountDetailsList(uid, pageIndex);
 			if (detailsList == null || detailsList.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
 				return;
 			}
-			
+
 			int count = accountDetailsService.getCount(uid);
-			
+
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
 			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-			
-			
+
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
 			data.put("result_list", GsonUtil.toJsonExpose(detailsList));
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-			
+
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
 		}
 	}
-	
+
 	/**
-	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
-	 * @param channelArray 鍚嶅瓧鏁扮粍
-	 * @param dateType 绫诲瀷  1鏃�  2鏈�  3骞�
-	 * @param year 2018
-	 * @param startTime 2018-12-01 
-	 * @param endTime   2018-12-01 
+	 * 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
+	 * 
+	 * @param channelArray
+	 *            鍚嶅瓧鏁扮粍
+	 * @param dateType
+	 *            绫诲瀷 1鏃� 2鏈� 3骞�
+	 * @param year
+	 *            2018
+	 * @param startTime
+	 *            2018-12-01
+	 * @param endTime
+	 *            2018-12-01
 	 * @param out
 	 */
 	@RequestMapping(value = "getNewUserCharts")
-	public void getNewUserCharts(String callback, String channelArray, Integer dateType, 
-		 String year, String startTime, String endTime, PrintWriter out) {
-		
-		
+	public void getNewUserCharts(String callback, String channelArray, Integer dateType, String year, String startTime,
+			String endTime, PrintWriter out) {
+
 		String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
 		if (validateMsg != null) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
 			return;
 		}
-		
+
 		if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
 			startTime = null;
 			endTime = null;
 		}
-		
+
 		List<String> channelList = null;
 		if (channelArray != null && channelArray.trim().length() > 0) {
 			Gson gson = new Gson();
-			channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
+			channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
+			}.getType());
 		}
 
 		if (channelList == null || channelList.size() == 0) {
@@ -1226,44 +1327,42 @@
 			channelList.add("all");
 		}
 
-		
 		if (dateType == 1 && year != null) {
 			year = null; // 璁剧疆涓虹┖
 		} else if (dateType == 2) {
-			if (startTime != null) 
-				startTime = null; 
-			
-			if (endTime != null) 
-				endTime = null; 
-			
+			if (startTime != null)
+				startTime = null;
+
+			if (endTime != null)
+				endTime = null;
+
 		} else if (dateType == 3) {
 			if (year != null)
-				year = null; 
-			
-			if (startTime != null) 
-				startTime = null; 
-			
-			if (endTime != null) 
-				endTime = null; 
+				year = null;
+
+			if (startTime != null)
+				startTime = null;
+
+			if (endTime != null)
+				endTime = null;
 		}
-		
-		
+
 		try {
 
 			Gson gson = new Gson();
 			Object objectDate = null;
 			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-			
+
 			JSONArray line_list = new JSONArray();
 			for (String channel : channelList) {
-				
-				List<Map<String, Object>> list = userInfoCountService.countNewUserByDate(channel, 
-						dateType, year, startTime, endTime);
-				
+
+				List<Map<String, Object>> list = userInfoCountService.countNewUserByDate(channel, dateType, year,
+						startTime, endTime);
+
 				if ("all".equalsIgnoreCase(channel)) {
 					channel = "鎬昏";
 				}
-				
+
 				JSONObject innerList = new JSONObject();
 				innerList.put("name", channel);
 
@@ -1278,10 +1377,9 @@
 					}
 					innerList.put("data", gson.toJson(map.get("value")));
 				}
-				
+
 				line_list.add(innerList);
 			}
-
 
 			JSONObject data = new JSONObject();
 			if (objectDate != null) {
@@ -1289,9 +1387,9 @@
 			} else {
 				data.put("xAxis_list", gson.toJson(dateList));
 			}
-			
+
 			data.put("line_list", line_list);
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
 		} catch (Exception e) {
@@ -1299,41 +1397,47 @@
 			e.printStackTrace();
 		}
 	}
-	
-	
+
 	/**
-	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
-	 * @param channelArray 鍚嶅瓧鏁扮粍
-	 * @param dateType 绫诲瀷  1鏃�  2鏈�  3骞�
-	 * @param year 2018
-	 * @param startTime 2018-12-01 
-	 * @param endTime   2018-12-01 
+	 * 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
+	 * 
+	 * @param channelArray
+	 *            鍚嶅瓧鏁扮粍
+	 * @param dateType
+	 *            绫诲瀷 1鏃� 2鏈� 3骞�
+	 * @param year
+	 *            2018
+	 * @param startTime
+	 *            2018-12-01
+	 * @param endTime
+	 *            2018-12-01
 	 * @param out
 	 */
 	@RequestMapping(value = "getTodayBuyRate")
-	public void getTodayBuyRate(String callback, String channelArray, Integer dateType, 
-		 String year, String startTime, String endTime, Integer orderNum, PrintWriter out) {
-		
+	public void getTodayBuyRate(String callback, String channelArray, Integer dateType, String year, String startTime,
+			String endTime, Integer orderNum, PrintWriter out) {
+
 		String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
 		if (validateMsg != null) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
 			return;
 		}
-		
+
 		if (dateType == 2 && StringUtil.isNullOrEmpty(year)) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇疯緭鍏ュ勾浠�"));
 			return;
 		}
-		
+
 		if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
 			startTime = null;
 			endTime = null;
 		}
-		
+
 		List<String> channelList = null;
 		if (channelArray != null && channelArray.trim().length() > 0) {
 			Gson gson = new Gson();
-			channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
+			channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
+			}.getType());
 		}
 
 		if (channelList == null || channelList.size() == 0) {
@@ -1341,44 +1445,42 @@
 			channelList.add("all");
 		}
 
-		
 		if (dateType == 1 && year != null) {
 			year = null; // 璁剧疆涓虹┖
 		} else if (dateType == 2) {
-			if (startTime != null) 
-				startTime = null; 
-			
-			if (endTime != null) 
-				endTime = null; 
-			
+			if (startTime != null)
+				startTime = null;
+
+			if (endTime != null)
+				endTime = null;
+
 		} else if (dateType == 3) {
 			if (year != null)
-				year = null; 
-			
-			if (startTime != null) 
-				startTime = null; 
-			
-			if (endTime != null) 
-				endTime = null; 
+				year = null;
+
+			if (startTime != null)
+				startTime = null;
+
+			if (endTime != null)
+				endTime = null;
 		}
-		
-		
+
 		try {
 
 			Gson gson = new Gson();
 			Object objectDate = null;
 			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-			
+
 			JSONArray line_list = new JSONArray();
 			for (String channel : channelList) {
-				
-				List<Map<String, Object>> list = userInfoCountService.getTodayBuyRate(channel, dateType,
-						year, startTime, endTime);
-				
+
+				List<Map<String, Object>> list = userInfoCountService.getTodayBuyRate(channel, dateType, year,
+						startTime, endTime);
+
 				if ("all".equalsIgnoreCase(channel)) {
 					channel = "鎬昏";
 				}
-				
+
 				JSONObject innerList = new JSONObject();
 				innerList.put("name", channel);
 
@@ -1393,10 +1495,9 @@
 					}
 					innerList.put("data", gson.toJson(map.get("value")));
 				}
-				
+
 				line_list.add(innerList);
 			}
-
 
 			JSONObject data = new JSONObject();
 			if (objectDate != null) {
@@ -1404,78 +1505,80 @@
 			} else {
 				data.put("xAxis_list", gson.toJson(dateList));
 			}
-			
+
 			data.put("line_list", line_list);
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
 		} catch (Exception e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 			e.printStackTrace();
 		}
-		
+
 	}
-	
-	
+
 	/**
-	 * 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼 
+	 * 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼
+	 * 
 	 * @param callback
-	 * @param channelArray 娓犻亾鍚嶇О
-	 * @param startTime 
+	 * @param channelArray
+	 *            娓犻亾鍚嶇О
+	 * @param startTime
 	 * @param endTime
-	 * @param orderNum 璁㈠崟鏁伴噺
+	 * @param orderNum
+	 *            璁㈠崟鏁伴噺
 	 * @param out
 	 */
 	@RequestMapping(value = "getWeekBuyRate")
-	public void getWeekBuyRate(String callback, String channelArray, String startTime, String endTime, 
-			Integer orderNum, PrintWriter out) {
-		
+	public void getWeekBuyRate(String callback, String channelArray, String startTime, String endTime, Integer orderNum,
+			PrintWriter out) {
+
 		if (StringUtil.isNullOrEmpty(startTime) || StringUtil.isNullOrEmpty(endTime)) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳懆璁㈠崟缁熻瀵瑰簲鏃堕棿鍖哄煙涓嶈兘涓虹┖"));
 			return;
 		}
-		
+
 		List<String> channelList = null;
 		if (channelArray != null && channelArray.trim().length() > 0) {
 			Gson gson = new Gson();
-			channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
+			channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
+			}.getType());
 		}
 
 		if (channelList == null || channelList.size() == 0) {
 			channelList = new ArrayList<String>();
 			channelList.add("all");
 		}
-		
+
 		if (orderNum < 1) {
 			orderNum = 1;
 		}
-		
+
 		try {
 
 			Gson gson = new Gson();
 			List<String> dateList = AdminUtils.getDateList(1, startTime, endTime, null);
-			
+
 			JSONArray line_list = new JSONArray();
 			for (String channel : channelList) {
-				
-				List<Object> list = userInfoCountService.getWeekBuyRate(channel, startTime, endTime,
-						orderNum, dateList);
-				
+
+				List<Object> list = userInfoCountService.getWeekBuyRate(channel, startTime, endTime, orderNum,
+						dateList);
+
 				if ("all".equalsIgnoreCase(channel)) {
 					channel = "鎬昏";
 				}
-				
+
 				JSONObject innerList = new JSONObject();
 				innerList.put("name", channel);
 				innerList.put("data", gson.toJson(list));
 				line_list.add(innerList);
 			}
 
-
 			JSONObject data = new JSONObject();
 			data.put("xAxis_list", gson.toJson(dateList));
 			data.put("line_list", line_list);
-			
+
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
 		} catch (Exception e) {
@@ -1483,5 +1586,5 @@
 			e.printStackTrace();
 		}
 	}
-	
+
 }

--
Gitblit v1.8.0