From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java |  531 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 431 insertions(+), 100 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 5d508ea..1e4aeb9 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
@@ -13,39 +13,49 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.IPUtil;
 import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.controller.admin.utils.AdminUtils;
-import com.yeshi.fanli.dto.money.AccountDetails;
+import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.entity.admin.count.CountUserInfo;
 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.ThreeSale;
+import com.yeshi.fanli.entity.bus.user.UserActiveNumHistory;
 import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
 import com.yeshi.fanli.entity.bus.user.UserRank;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
 import com.yeshi.fanli.entity.common.AdminUser;
 import com.yeshi.fanli.entity.money.UserMoneyDetail;
 import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
+import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.count.UserInfoCountService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.user.BindingAccountService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;
 import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
 import com.yeshi.fanli.service.inter.user.UserAccountService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.UserActiveLogService;
 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;
 import com.yeshi.fanli.service.inter.user.UserRankService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
 import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.factory.AccountDetailsFactory;
+import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.vo.user.UserGoldCoinVO;
 import com.yeshi.fanli.vo.user.UserInfoVO;
 
 import net.sf.json.JSONArray;
@@ -86,6 +96,13 @@
 
 	@Resource
 	private UserAccountService userAccountService;
+	
+	@Resource
+	private UserActiveLogService userActiveLogService;
+	
+	@Resource
+	private UserVIPInfoService userVIPInfoService;
+	
 
 	/**
 	 * 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃 姝e父鐢ㄦ埛/寮傚父鐢ㄦ埛
@@ -107,7 +124,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,
+	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,Integer userType,
 			Integer days, String startTime, String endTime, Integer orderMode, Integer type, PrintWriter out) {
 
 		try {
@@ -157,14 +174,14 @@
 			}
 
 			List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,
-					userRank, days, startTime, endTime, orderField, orderMode);
+					userRank, days, startTime, endTime, orderField, orderMode,userType);
 
 			if (userList == null || userList.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
 				return;
 			}
 
-			long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime);
+			long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType);
 
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
 			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -302,7 +319,7 @@
 
 			UserInfo find = userInfoService.getUserById(uid);
 			if (find == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐢ㄦ埛锛�"));
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛琚皝绂佹垨涓嶅瓨鍦�"));
 				return;
 			}
 
@@ -348,13 +365,81 @@
 			}
 
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("瑙g粦鎴愬姛"));
-
 		} catch (Exception e) {
 			e.printStackTrace();
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
 		}
 	}
+	
+	
 
+	/**
+	 * 淇敼鐢ㄦ埛澶囨敞
+	 * @param callback
+	 * @param uid
+	 * @param mark
+	 * @param out
+	 */
+	@RequestMapping("addUserMark")
+	public void addUserMark(String callback, Long uid, String mark, PrintWriter out) {
+		try {
+			if (uid == null || uid <= 0 || StringUtil.isNullOrEmpty(mark))
+				return;
+			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+			if (userInfoExtra == null) 
+				return;
+			UserInfoExtra updateExtra = new UserInfoExtra();
+			updateExtra.setId(userInfoExtra.getId());
+			updateExtra.setMark(mark);
+			userInfoExtraService.saveUserInfoExtra(updateExtra);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鍒犻櫎鐢ㄦ埛-鏀瑰彉鍏剁姸鎬�
+	 * @param callback
+	 * @param idArray
+	 * @param out
+	 */
+	@RequestMapping(value = "deleteUser")
+	public void delete(String callback, String idArray, HttpServletRequest request,  PrintWriter out) {
+		try {
+			
+			AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+			if (admin == null) {
+				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
+				return;
+			}
+			
+			if (StringUtil.isNullOrEmpty(idArray)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+				return;
+			}
+
+			Gson gson = new Gson();
+			List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+			if (list == null || list.size() == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
+				return;
+			}
+			
+			for (Long id: list) {
+				UserInfo user = new UserInfo(id);
+				user.setState(UserInfo.STATE_DELETE);
+				user.setStateDesc(admin.getId()+" " + admin.getName()+ "鍚庡彴鎵嬪姩鍒犻櫎");
+				userInfoService.updateByPrimaryKeySelective(user);
+			}
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎"));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+			e.printStackTrace();
+		}
+	}
+	
+	
+	
 	/**
 	 * 灏佺鐢ㄦ埛ID
 	 * 
@@ -806,99 +891,117 @@
 	@RequestMapping(value = "getNewUserCharts")
 	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());
-		}
-
-		if (channelList == null || channelList.size() == 0) {
-			channelList = new ArrayList<String>();
-			channelList.add("all");
-		}
-
-		if (dateType == 1 && year != null) {
-			year = null; // 璁剧疆涓虹┖
-		} else if (dateType == 2) {
-			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;
-		}
-
 		try {
+			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;
+			}
 
+			Date beginDate = null;
+			Date endDate = null;
+			
+			if (dateType == 1) {
+				beginDate = TimeUtil.parse(startTime);
+				endDate = TimeUtil.parse(endTime);
+			} else if (dateType == 2) {
+				Calendar calendar=Calendar.getInstance();  
+				int currentYear = calendar.get(Calendar.YEAR);
+				if (!StringUtil.isNullOrEmpty(year)) {
+					currentYear = Integer.parseInt(year);
+				}
+				calendar.clear();
+			    calendar.set(Calendar.YEAR, currentYear);
+			    beginDate =calendar.getTime();
+		
+				calendar.clear();
+				calendar.set(Calendar.YEAR, currentYear);
+				calendar.roll(Calendar.DAY_OF_YEAR, -1);
+				endDate=calendar.getTime(); 
+			} else if (dateType == 3) {
+				beginDate = TimeUtil.parse("2018-01-01");
+				endDate = new Date();
+			}
 			Gson gson = new Gson();
-			Object objectDate = null;
 			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
+			
+			// 娓犻亾
+			List<String> channelList = null;
+			if (channelArray != null && channelArray.trim().length() > 0) {
+				channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
+				}.getType());
+			}
+			
 			JSONArray line_list = new JSONArray();
-			for (String channel : channelList) {
-
-				List<Map<String, Object>> list = userInfoCountService.countNewUserByDate(channel, dateType, year,
-						startTime, endTime);
-
-				if ("all".equalsIgnoreCase(channel)) {
-					channel = "鎬昏";
+			
+			if (channelList != null && channelList.size() > 0) {
+				for (String channel : channelList) {
+					List<Object> list = getNewUserData(dateList, dateType, beginDate, endDate, channel);
+					JSONObject innerList = new JSONObject();
+					innerList.put("name", channel);
+					innerList.put("data", gson.toJson(list));
+					line_list.add(innerList);
 				}
-
+			} else {
+				List<Object> list = getNewUserData(dateList, dateType, beginDate, endDate, null);
 				JSONObject innerList = new JSONObject();
-				innerList.put("name", channel);
-
-				if (dateType != 3) {
-					innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
-				} else {
-					// 骞磋鍥�
-					Map<String, Object> map = AdminUtils.yearsDataFactory(list);
-
-					if (objectDate == null) {
-						objectDate = map.get("date");
-					}
-					innerList.put("data", gson.toJson(map.get("value")));
-				}
-
+				innerList.put("name", "鍏ㄩ儴");
+				innerList.put("data", gson.toJson(list));
 				line_list.add(innerList);
 			}
 
 			JSONObject data = new JSONObject();
-			if (objectDate != null) {
-				data.put("xAxis_list", gson.toJson(objectDate));
-			} else {
-				data.put("xAxis_list", gson.toJson(dateList));
-			}
-
 			data.put("line_list", line_list);
-
+			data.put("xAxis_list", gson.toJson(dateList));
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
 		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
 			e.printStackTrace();
 		}
+	}
+	
+	
+	private List<Object> getNewUserData(List<String> dateList, Integer dateType, Date beginDate, Date endDate, String channel) {
+		List<Object> list = new ArrayList<>();
+		List<CountUserInfo> listHistory = userInfoCountService.getNewUserData(beginDate, endDate, channel);
+		for (String date: dateList) {
+			int value = 0;
+			if (listHistory != null) {
+				for (CountUserInfo history: listHistory) {
+					if (dateType == 1) {
+						String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
+						if (gernalTime.equalsIgnoreCase(date)) {
+							value += history.getNum();
+							continue;
+						}
+					} else if (dateType == 2){
+						String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
+						if(gernalTime.startsWith("0")) {
+							gernalTime = gernalTime.substring(1, 2);
+						}
+							
+						if (gernalTime.equalsIgnoreCase(date)) {
+							value +=  history.getNum();
+							continue;
+						}
+					} else if (dateType == 3) {
+						String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
+						if (gernalTime.equalsIgnoreCase(date)) {
+							value +=  history.getNum();
+							continue;
+						}
+					}
+				}
+			}
+			list.add(value + "");
+		}
+		
+		return list;
 	}
 
 	/**
@@ -977,7 +1080,7 @@
 			JSONArray line_list = new JSONArray();
 			for (String channel : channelList) {
 
-				List<Map<String, Object>> list = userInfoCountService.getTodayBuyRate(channel, dateType, year,
+				List<ChartTDO> list = userInfoCountService.getTodayBuyRate(channel, dateType, year,
 						startTime, endTime);
 
 				if ("all".equalsIgnoreCase(channel)) {
@@ -1092,31 +1195,259 @@
 
 	
 	/**
-	 * 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼
-	 * 
+	 * 鑾峰彇閲戝竵鎺掕姒�
 	 * @param callback
-	 * @param channelArray
-	 *            娓犻亾鍚嶇О
-	 * @param startTime
-	 * @param endTime
-	 * @param orderNum
-	 *            璁㈠崟鏁伴噺
+	 * @param pageIndex
+	 * @param pageSize
+	 * @param type
 	 * @param out
 	 */
 	@RequestMapping(value = "getGoldTop")
-	public void getGoldTop(String callback, Integer pageIndex, Integer pageSize, Integer type,
+	public void getGoldTop(String callback, Integer pageIndex, Integer pageSize, Integer type, String key,
 			PrintWriter out) {
 		if (type == null) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("type涓嶈兘涓虹┖"));
 			return;
 		}
 		
-			
+		if (pageIndex == null)
+			pageIndex = 1;
 
+		if (pageSize == null)
+			pageSize = 50;
 		
+		long count = 0;
+		List<UserGoldCoinVO> list = null;
+		if (type == 0) {
+			count = userInfoCountService.countByHasGoldCoin(key);
+			list = userInfoCountService.listByHasGoldCoin((pageIndex - 1) * pageSize, pageSize, key);
+		} else if (type == 1 || type == 2) {
+			count = userInfoCountService.countByUserGoldCoin(type, key);
+			list = userInfoCountService.listByUserGoldCoin((pageIndex - 1) * pageSize, pageSize, type, key);
+		}
+		
+		if(list == null)
+			list = new ArrayList<>();
+		
+
+		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("list", list);
+		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+	}
+	
+	
+	/**
+	 * 璁″綋澶╂椿璺冪敤鎴蜂腑鏈夊灏戜釜鐢ㄦ埛鏄�90澶╁墠鎵嶆椿璺冭繃锛屾湡闂翠粠鏈椿璺冪殑鐢ㄦ埛鏁伴噺
+	 * @param callback
+	 * @param dateType
+	 * @param year
+	 * @param startTime
+	 * @param endTime
+	 * @param out
+	 */
+	@RequestMapping(value = "getUserActiveCharts")
+	public void getUserActiveCharts(String callback, Integer dateType, String year, String startTime,
+			String endTime, PrintWriter out){
+		try {
+			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;
+			}
+
+			
+			Date beginDate = null;
+			Date endDate = null;
+			
+			if (dateType == 1) {
+				beginDate = TimeUtil.parse(startTime);
+				endDate = TimeUtil.parse(endTime);
+			} else if (dateType == 2) {
+				Calendar calendar=Calendar.getInstance();  
+				int currentYear = calendar.get(Calendar.YEAR);
+				if (!StringUtil.isNullOrEmpty(year)) {
+					currentYear = Integer.parseInt(year);
+				}
+				
+				calendar.clear();
+			    calendar.set(Calendar.YEAR, currentYear);
+			    beginDate =calendar.getTime();
+		
+				calendar.clear();
+				calendar.set(Calendar.YEAR, currentYear);
+				calendar.roll(Calendar.DAY_OF_YEAR, -1);
+				endDate=calendar.getTime(); 
+			} else if (dateType == 3) {
+				beginDate = TimeUtil.parse("2018-01-01");
+				endDate = new Date();
+			}
+			Gson gson = new Gson();
+			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
+			
+			List<Object> list = new ArrayList<>();
+			List<UserActiveNumHistory> listHistory = userActiveLogService.query(beginDate, endDate);
+			for (String date: dateList) {
+				ChartTDO chartTDO = new ChartTDO();
+				chartTDO.setShowDate(date);
+				int value = 0;
+				
+				if (listHistory != null) {
+					for (UserActiveNumHistory history: listHistory) {
+						if (dateType == 1) {
+							String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
+							if (gernalTime.equalsIgnoreCase(date)) {
+								value += history.getNum();
+								continue;
+							}
+						} else if (dateType == 2){
+							String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
+							if(gernalTime.startsWith("0")) {
+								gernalTime = gernalTime.substring(1, 2);
+							}
+							if (gernalTime.equalsIgnoreCase(date)) {
+								value += history.getNum();
+								continue;
+							}
+						} else if (dateType == 3) {
+							String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
+							if (gernalTime.equalsIgnoreCase(date)) {
+								value += history.getNum();
+								continue;
+							}
+						}
+					}
+				}
+				
+				chartTDO.setShowValue(value + "");
+				list.add(value + "");
+			}
+			
+			JSONObject innerList = new JSONObject();
+			innerList.put("name", "鏁伴噺");
+			innerList.put("data", gson.toJson(list));
+
+			JSONArray line_list = new JSONArray();
+			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) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
+			e.printStackTrace();
+		}
+	}
+	
+	
+	/**
+	 * 
+	 * @param callback
+	 * @param pageIndex
+	 * @param pageSize
+	 * @param key 鎼滅储锛氭殏鍙彁渚泆id
+	 * @param state 鐘舵�侊細
+	 * @param out
+	 */
+	@RequestMapping(value = "queryVip")
+	public void queryVip(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+		try {
+			List<UserVIPInfo> list = userVIPInfoService.listQuery(pageIndex, pageSize, key, state);
+			if (list == null || list.size() == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+				return;
+			}
+			
+			long count = userVIPInfoService.countQuery(key, state);
+			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+			GsonBuilder gsonBuilder = new GsonBuilder();
+			gsonBuilder.serializeNulls();
+			Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+			JSONObject data = new JSONObject();
+			data.put("pe", pe);
+			data.put("result_list", gson.toJson(list));
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
 	}
 
 	
+
+	/**
+	 * 瓒呯骇浼氬憳鍗囩骇閫氳繃
+	 * @param callback
+	 * @param id
+	 * @param out
+	 * @param request
+	 */
+	@RequestSerializableByKey(key = "'passVIP-' +#id")
+	@RequestMapping(value = "passVIP")
+	public void passVIP(String callback, Long id,  PrintWriter out, HttpServletRequest request) {
+		try {
+			/* 妫�楠屾槸鍚︾櫥闄� */
+			AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+			if (admin == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��"));
+				return;
+			}
+			userVIPInfoService.passVIPApply(id);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+			LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勫崌绾ц秴绾т細鍛樼敵璇�!");
+		} catch (UserVIPInfoException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+			return;
+		} catch (Exception e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+			return;
+		}
+	}
 	
+	
+	/**
+	 * 瓒呯骇浼氬憳鍗囩骇鎷掔粷
+	 * @param callback
+	 * @param id
+	 * @param reason
+	 * @param out
+	 * @param request
+	 */
+	
+	@RequestMapping(value = "rejectVIP")
+	public void rejectVIP(String callback, Long id, String reason, PrintWriter out,	HttpServletRequest request) {
+		try {
+			/* 妫�楠屾槸鍚︾櫥闄� */
+			AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+			if (admin == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
+				return;
+			}
+			userVIPInfoService.rejectVIPApply(id, reason);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
+			LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勫崌绾ц秴绾т細鍛樼敵璇蜂笉瀛樺湪!");
+		} catch (UserVIPInfoException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+			return;
+		} catch (Exception e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+			return;
+		}
+	}
+
 }

--
Gitblit v1.8.0