From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java |  587 ++++++++++++++++++----------------------------------------
 1 files changed, 186 insertions(+), 401 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 c52afdd..a1731be 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
@@ -5,15 +5,14 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
@@ -24,25 +23,20 @@
 import com.yeshi.fanli.entity.bus.user.BindingAccount;
 import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
 import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
-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.UserRank;
+import com.yeshi.fanli.entity.common.AdminUser;
 import com.yeshi.fanli.entity.money.UserMoneyDetail;
-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;
 import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.order.OrderService;
 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.ScanHistoryService;
-import com.yeshi.fanli.service.inter.user.UserActiveLogService;
+import com.yeshi.fanli.service.inter.user.UserAccountService;
 import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
@@ -63,33 +57,14 @@
 	@Resource
 	private UserInfoService userInfoService;
 
-
-	@Resource
-	private OrderService orderService;
-
-	@Resource
-	private ScanHistoryService scanHistoryService;
-
-	@Resource
-	private ConfigService configService;
-
-	@Resource
-	private ExtractService extractService;
-
 	@Resource
 	private ThreeSaleSerivce threeSaleService;
-
-	@Resource
-	private ShareService shareService;
 
 	@Resource
 	private BindingAccountService bindingAccountService;
 
 	@Resource
 	private UserInfoCountService userInfoCountService;
-
-	@Resource
-	private UserActiveLogService userActiveLogService;
 
 	@Resource
 	private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
@@ -102,165 +77,18 @@
 
 	@Resource
 	private UserRankService userRankService;
-	
+
 	@Resource
 	private UserMoneyDetailService userMoneyDetailService;
 
-	@RequestMapping(value = "getUserList", method = RequestMethod.POST)
-	public void getUserList(int pageIndex, String key, PrintWriter out) {
+	@Resource
+	private UserInfoDeleteRecordService userInfoDeleteRecordService;
 
-		List<UserInfo> userList = userInfoService.getUserList(pageIndex - 1, key);
-		int count = userInfoService.getUserCount(key);
-
-		int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
-		PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("key", key);
-		pe.setParams(map);
-		JSONObject data = new JSONObject();
-		data.put("pe", pe);
-		data.put("userList", userList);
-		out.print(JsonUtil.loadTrueResult(data));
-	}
+	@Resource
+	private UserAccountService userAccountService;
 
 	/**
-	 * 
-	 * 鏂规硶璇存槑: 涓夌骇鍒嗛攢
-	 * 
-	 * @author mawurui createTime 2018骞�5鏈�21鏃� 涓嬪崍4:55:07
-	 * @param pageIndex
-	 * @param key
-	 * @param out
-	 */
-	@RequestMapping(value = "getThreeSaleList", method = RequestMethod.POST)
-	public void getThreeSaleList(int pageIndex, String key, PrintWriter out) {
-		List<ThreeSale> list = threeSaleService.getLastestThreeSaleList(pageIndex, key);
-		int count = threeSaleService.getLastestThreeSaleCount(key);
-
-		int totalPage = (int) (count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE
-				: count / Constant.PAGE_SIZE + 1);
-		PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("key", key);
-		pe.setParams(map);
-		JSONObject data = new JSONObject();
-		data.put("pe", pe);
-		data.put("threeSaleList", list);
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-	/**
-	 * 
-	 * @param pageIndex
-	 * @param type
-	 *            1- 1绾у垎閿� 2-2绾у垎閿�
-	 * @param uid
-	 * @param key
-	 * @param out
-	 */
-	@RequestMapping(value = "getThreeSaleDetailList", method = RequestMethod.POST)
-	public void getThreeSaleDetailList(int pageIndex, int type, long uid, String key, PrintWriter out) {
-		List<UserInfo> userList = null;
-		long count = 0;
-		if (type == 1) {
-			userList = threeSaleService.getFirstUsers(uid, pageIndex);
-			count = threeSaleService.getFirstUsersCount(uid);
-		} else if (type == 2) {
-			userList = threeSaleService.getSecondUsers(uid, pageIndex);
-			count = threeSaleService.getSecondUsersCount(uid);
-		}
-
-		int totalPage = (int) (count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE
-				: count / Constant.PAGE_SIZE + 1);
-		PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("key", key);
-		pe.setParams(map);
-		JSONObject data = new JSONObject();
-		data.put("pe", pe);
-		data.put("userList", userList);
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-	@RequestMapping(value = "getUserListByUid", method = RequestMethod.POST)
-	public void getUserListByUid(long uid, PrintWriter out) {
-
-		List<UserInfo> userList = userInfoService.getUserListByUid(uid);
-		int count = userList.size();
-
-		int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
-		PageEntity pe = new PageEntity(1, Constant.PAGE_SIZE, count, totalPage);
-		Map<String, String> map = new HashMap<String, String>();
-		pe.setParams(map);
-		JSONObject data = new JSONObject();
-		data.put("pe", pe);
-		data.put("userList", userList);
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 鏌ヨ鐢ㄦ埛璁㈠崟鐘舵��
-	 * 
-	 * @author mawurui createTime 2018骞�5鏈�17鏃� 涓婂崍10:55:41
-	 * @param pageIndex
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "getUserOrderList", method = RequestMethod.POST)
-	public void getUserOrderList(int pageIndex, long uid, PrintWriter out) {
-		List<Order> orderList = orderService.getOrderByUid(pageIndex - 1, uid);
-		int count = orderService.getCount(uid);
-		int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
-		PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
-		JSONObject data = new JSONObject();
-		data.put("pe", pe);
-		data.put("orderList", JsonUtil.getSimpleGsonWithDateAndSerialization().toJson(orderList));
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 娓呴櫎鐢ㄦ埛鎵嬪娍瀵嗙爜
-	 * 
-	 * @author mawurui createTime 2018骞�5鏈�4鏃� 涓嬪崍4:47:29
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "cleanPassword", method = RequestMethod.POST)
-	public void cleanPassword(long id, PrintWriter out) {
-		userInfoService.cleanPassword(id);
-		out.print(JsonUtil.loadTrueResult("娓呴櫎鎴愬姛"));
-	}
-
-	@RequestMapping(value = "getScanHistoryList", method = RequestMethod.POST)
-	public void getScanHistoryList(int pageIndex, long uid, PrintWriter out) {
-		List<ScanHistory> scanHistoryList = scanHistoryService.getScanHistoryByUid(pageIndex - 1, uid);
-		int count = scanHistoryService.getCountByUid(uid);
-		int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
-		PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
-		JSONObject data = new JSONObject();
-		data.put("pe", pe);
-		data.put("scanHistoryList", GsonUtil.toDFJson(scanHistoryList));
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-	@RequestMapping(value = "getAssets", method = RequestMethod.POST)
-	public void getAssets(PrintWriter out) {
-		String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
-		double min = Double.parseDouble(minMoney);
-		double freeze = userInfoService.getFreezeAssets(min);
-		double canAssets = userInfoService.getCanAssets(min);
-		JSONObject data = new JSONObject();
-		data.put("freeze", freeze);
-		data.put("can", canAssets);
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-
-	/**
-	 * 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃   姝e父鐢ㄦ埛/寮傚父鐢ㄦ埛
+	 * 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃 姝e父鐢ㄦ埛/寮傚父鐢ㄦ埛
 	 * 
 	 * @param callback
 	 * @param pageIndex
@@ -287,7 +115,7 @@
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛绫诲瀷type涓嶈兘涓虹┖"));
 				return;
 			}
-			
+
 			if (pageIndex == null)
 				pageIndex = 1;
 
@@ -443,7 +271,6 @@
 		}
 	}
 
-
 	/**
 	 * 
 	 * @param data
@@ -459,15 +286,15 @@
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娌℃湁鍙洿鏀圭殑鍐呭"));
 				return;
 			}
-			
+
 			Gson gson = new Gson();
-			List<Integer> list = gson.fromJson(typeArray, new TypeToken<ArrayList<Integer>>() {}.getType());
+			List<Integer> list = gson.fromJson(typeArray, new TypeToken<ArrayList<Integer>>() {
+			}.getType());
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娌℃湁鍙洿鏀圭殑鍐呭"));
 				return;
 			}
-			
-			
+
 			if (uid == null) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛id涓嶈兘涓虹┖"));
 				return;
@@ -478,9 +305,8 @@
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐢ㄦ埛锛�"));
 				return;
 			}
-			
-			
-			for (Integer type: list) {
+
+			for (Integer type : list) {
 				String openid = find.getOpenid();
 				String wxUnionId = find.getWxUnionId();
 				String phone = find.getPhone();
@@ -507,7 +333,8 @@
 					}
 				} else if (4 == type) {
 					// 鏌ヨ鏀粯瀹濈粦瀹�
-					BindingAccount account = bindingAccountService.getBindingAccountByUidAndType(uid, BindingAccount.TYPE_ALIPAY);
+					BindingAccount account = bindingAccountService.getBindingAccountByUidAndType(uid,
+							BindingAccount.TYPE_ALIPAY);
 					if (account == null) {
 						JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠鐢ㄦ埛鏈粦瀹氭敮浠樺疂锛�"));
 						return;
@@ -521,6 +348,171 @@
 			}
 
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("瑙g粦鎴愬姛"));
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+		}
+	}
+
+	/**
+	 * 灏佺鐢ㄦ埛ID
+	 * 
+	 * @param callback
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "forbiddenUser")
+	public void forbiddenUser(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
+		try {
+
+			if (uid == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
+				return;
+			}
+
+			UserInfo currentInfo = userInfoService.selectByPKey(uid);
+			if (currentInfo == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡涓嶅瓨鍦�"));
+				return;
+			}
+
+			AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+			if (admin == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐧诲綍澶辨晥,璇风櫥褰�"));
+				return;
+			}
+
+			String reason = "鍚庡彴灏佺锛屾搷浣滀汉锛�" + admin.getId() + "-" + admin.getName();
+			userAccountService.forbiddenUserAll(uid, reason);
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鐢ㄦ埛灏佺鎴愬姛"));
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+		}
+	}
+
+	/**
+	 * 瑙i櫎灏佺鐢ㄦ埛ID
+	 * 
+	 * @param callback
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "relieveForbiddenUser")
+	public void relieveForbiddenUser(String callback, Long uid, PrintWriter out) {
+		try {
+
+			if (uid == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
+				return;
+			}
+
+			UserInfo currentInfo = userInfoService.selectByPKey(uid);
+			if (currentInfo == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡涓嶅瓨鍦�"));
+				return;
+			}
+
+			currentInfo.setState(UserInfo.STATE_NORMAL);
+			currentInfo.setStateDesc("绠$悊鍛樺凡瑙e皝");
+			userInfoService.updateByPrimaryKeySelective(currentInfo);
+
+			// 瑙e皝寰俊
+			ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService
+					.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId, currentInfo.getWxUnionId());
+			if (forbiddenUserIdentifyCode != null)
+				forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
+
+			// 瑙e皝鎵嬫満
+			forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService
+					.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, currentInfo.getPhone());
+			if (forbiddenUserIdentifyCode != null)
+				forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
+
+			// 瑙e皝娣樺疂
+			UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(uid);
+			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(uid);
+			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("鐢ㄦ埛瑙e皝鎴愬姛"));
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+		}
+	}
+
+	/**
+	 * 鐢ㄦ埛璐﹀彿- 灏佺/瑙e皝
+	 * 
+	 * @param callback
+	 * @param code
+	 * @param type
+	 *            1("寰俊unionId"), 2("娣樺疂ID"), 3("鎵嬫満鍙�"), 4("鏀粯瀹濊处鍙�");
+	 * @param out
+	 */
+	@RequestMapping(value = "saveForbiddenInfo")
+	public void saveForbiddenInfo(String callback, String code, Integer type, PrintWriter out) {
+		try {
+			if (code == null || code.trim().length() == 0 || type == null || "NULL".equalsIgnoreCase(code)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
+				return;
+			}
+
+			forbiddenUserIdentifyCodeService.saveForbiddenInfo(code, type);
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+
+		} catch (ForbiddenUserIdentifyCodeException e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+		}
+	}
+
+	/**
+	 * 鍒犻櫎闃熷憳鍏崇郴
+	 * 
+	 * @param callback
+	 * @param id
+	 * @param out
+	 */
+	@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 {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+			}
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -650,29 +642,6 @@
 		}
 	}
 
-	@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 {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-		}
-	}
-
 	/**
 	 * 闃熷憳鍏崇郴
 	 * 
@@ -794,7 +763,6 @@
 		}
 
 		try {
-
 			List<UserMoneyDetail> userMoneyDetailsList = userMoneyDetailService.listByUidWithState(uid, pageIndex,
 					pageSize);
 			if (userMoneyDetailsList == null || userMoneyDetailsList.size() == 0) {
@@ -802,18 +770,15 @@
 				return;
 			}
 
-			List<AccountDetails> detailList = new ArrayList<>();
-			for (UserMoneyDetail detail : userMoneyDetailsList)
-				detailList.add(AccountDetailsFactory.create(detail));
-
 			long count = userMoneyDetailService.countByUidWithState(uid);
 
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
 			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
 
+			Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
-			data.put("result_list", GsonUtil.toJsonExpose(detailList));
+			data.put("result_list", gson.toJson(userMoneyDetailsList));
 
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
@@ -1125,184 +1090,4 @@
 		}
 	}
 
-	
-
-	/**
-	 * 灏佺鐢ㄦ埛ID
-	 * @param callback
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "forbiddenUser")
-	public void forbiddenUser(String callback, Long uid, PrintWriter out) {
-		try {
-
-			if (uid == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
-				return;
-			}
-
-			UserInfo currentInfo = userInfoService.selectByPKey(uid);
-			if (currentInfo == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡涓嶅瓨鍦�"));
-				return;
-			}
-
-			currentInfo.setState(UserInfo.STATE_FORBIDDEN);
-			currentInfo.setStateDesc("绠$悊鍛樺皝绂�");
-			userInfoService.updateByPrimaryKeySelective(currentInfo);
-			
-			// 鍔犲叆灏佺鐨勮处鍙峰垪琛�
-			ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();
-			forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId);
-			forbiddenUserIdentifyCode.setIdentifyCode(currentInfo.getWxUnionId());
-			forbiddenUserIdentifyCode.setBeiZhu(currentInfo.getWxName());
-			try {
-				forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);
-			} catch (ForbiddenUserIdentifyCodeException e) {
-				e.printStackTrace();
-			}
-
-			// 鐢佃瘽鍙风爜
-			forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();
-			forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.phone);
-			forbiddenUserIdentifyCode.setIdentifyCode(currentInfo.getPhone());
-			try {
-				forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);
-			} catch (ForbiddenUserIdentifyCodeException e) {
-				e.printStackTrace();
-			}
-
-			// 娣樺疂
-			UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(uid);
-			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(uid);
-			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();
-					}
-				}
-			}
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鐢ㄦ埛灏佺鎴愬姛"));
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
-		}
-	}
-	
-	
-	/**
-	 * 瑙i櫎灏佺鐢ㄦ埛ID
-	 * @param callback
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "relieveForbiddenUser")
-	public void relieveForbiddenUser(String callback, Long uid, PrintWriter out) {
-		try {
-
-			if (uid == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭暟鎹�"));
-				return;
-			}
-
-			UserInfo currentInfo = userInfoService.selectByPKey(uid);
-			if (currentInfo == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡涓嶅瓨鍦�"));
-				return;
-			}
-
-			currentInfo.setState(UserInfo.STATE_NORMAL);
-			currentInfo.setStateDesc("绠$悊鍛樺凡瑙e皝");
-			userInfoService.updateByPrimaryKeySelective(currentInfo);
-
-			// 瑙e皝寰俊
-			ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService
-					.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId, currentInfo.getWxUnionId());
-			if (forbiddenUserIdentifyCode != null)
-				forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
-
-			// 瑙e皝鎵嬫満
-			forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService
-					.listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, currentInfo.getPhone());
-			if (forbiddenUserIdentifyCode != null)
-				forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);
-
-			// 瑙e皝娣樺疂
-			UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(uid);
-			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(uid);
-			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("鐢ㄦ埛瑙e皝鎴愬姛"));
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
-		}
-	}
-	
-	
-	/**
-	 * 鐢ㄦ埛璐﹀彿- 灏佺/瑙e皝 
-	 * @param callback
-	 * @param code
-	 * @param type 1("寰俊unionId"), 2("娣樺疂ID"), 3("鎵嬫満鍙�"), 4("鏀粯瀹濊处鍙�");
-	 * @param out
-	 */
-	@RequestMapping(value = "saveForbiddenInfo")
-	public void saveForbiddenInfo(String callback, String code, Integer type, PrintWriter out) {
-		try {
-			if (code == null || code.trim().length() == 0 || type == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
-			}
-			
-			forbiddenUserIdentifyCodeService.saveForbiddenInfo(code, type);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
-		} catch (ForbiddenUserIdentifyCodeException e) {
-			e.printStackTrace();
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
-		} catch (Exception e) {
-			e.printStackTrace();
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-		}
-	}
-	
 }

--
Gitblit v1.8.0