From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 2223 +++++++++++++++++++++++++--------------------------------
 1 files changed, 985 insertions(+), 1,238 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index bcf883a..f35bcdc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -1,1238 +1,985 @@
-package com.yeshi.fanli.controller.admin;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-import org.yeshi.utils.DateUtil;
-import org.yeshi.utils.IPUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.entity.wx.RedPackRecord;
-import org.yeshi.utils.wx.WXRedPackUtil;
-
-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.ChartTDO;
-import com.yeshi.fanli.entity.bus.user.Extract;
-import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
-import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
-import com.yeshi.fanli.entity.common.AdminUser;
-import com.yeshi.fanli.exception.ExtractException;
-import com.yeshi.fanli.exception.NotExistObjectException;
-import com.yeshi.fanli.exception.ObjectStateException;
-import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.AdminUserService;
-import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
-import com.yeshi.fanli.service.inter.count.UserInfoCountService;
-import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;
-import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;
-import com.yeshi.fanli.service.inter.money.extract.ExtractService;
-import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
-import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
-import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.push.PushRecordService;
-import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
-import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-@Controller
-@RequestMapping("admin/new/api/v1/extract")
-public class ExtractAdminController {
-
-	@Resource
-	private ExtractService extractService;
-
-	@Resource
-	private ConfigService configService;
-
-	@Resource
-	private UserInfoCountService userInfoCountService;
-
-	@Resource
-	private ExtractCountService extractCountService;
-
-	@Resource
-	private PushRecordService pushRecordService;
-
-	@Resource
-	private PushController xingePushController;
-
-	@Resource
-	private ExtractAuditRecordService extractAuditRecordService;
-
-	@Resource
-	private HongBaoV2CountService hongBaoV2CountService;
-
-	@Resource
-	private AdminUserService adminUserService;
-
-	@Resource
-	private RedisManager redisManager;
-
-	@Resource
-	private TaoBaoOrderService taoBaoOrderService;
-
-	@Resource
-	private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
-
-	@Resource
-	private UserInfoExtraService userInfoExtraService;
-
-	@Resource
-	private CommonOrderCountService commonOrderCountService;
-
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰 鍙痡sonP鏂瑰紡
-	 * 
-	 * @param id
-	 * @param code
-	 *            楠岃瘉鐮�
-	 * @param out
-	 * @param request
-	 */
-	@RequestMapping(value = "passExtractJP")
-	public void passExtractJP(String callback, Long id, String code, PrintWriter out, HttpServletRequest request) {
-
-		/* 妫�楠屾槸鍚︾櫥闄� */
-		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-		if (admin == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��"));
-			return;
-		}
-
-		/* 妫�楠屾槸鍚﹂�氳繃楠岃瘉 */
-		String codeType = (String) request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);
-		if (!"1".equals(codeType)) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3, "閭楠岃瘉鏈�氳繃"));
-			return;
-		}
-
-		/* 鍏佽鎻愮幇 鎿嶄綔 */
-		Integer integer = extractService.passExtract(id, admin);
-
-		// 鏃ュ織璁板綍
-		if (integer == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("宸查�氳繃"));
-			LogHelper
-					.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!");
-		} else if (integer == 1) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ユ彁鐜拌褰曞凡涓嶅瓨鍦�,璇峰埛鏂�"));
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
-		} else {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡琚鐞�,璇峰埛鏂�"));
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
-		}
-
-	}
-
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 鎷掔粷鎻愮幇璇锋眰jsonP
-	 * 
-	 * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55
-	 * @param id
-	 * @param reason
-	 * @param out
-	 * @param request
-	 */
-	@RequestMapping(value = "rejectExtractJP")
-	public void rejectExtractJP(String callback, Long id, String code, String reason, PrintWriter out,
-			HttpServletRequest request) {
-		/* 妫�楠屾槸鍚︾櫥闄� */
-		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-		if (admin == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
-			return;
-		}
-
-		/* 妫�楠屾槸鍚﹂�氳繃楠岃瘉 */
-		String codeType = (String) request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);
-		if (!"1".equals(codeType)) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3, "閭楠岃瘉鏈�氳繃"));
-			return;
-		}
-
-		try {
-			// 缂栫爜杞崲
-			reason = URLDecoder.decode(reason, "UTF-8");
-		} catch (Exception e1) {
-			e1.printStackTrace();
-		}
-
-		try {
-
-			extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
-
-			LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
-					+ "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
-
-		} catch (ObjectStateException e) {
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); //
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
-
-		} catch (NotExistObjectException e) {
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪!");
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
-		}
-
-	}
-
-	/**
-	 * 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁�
-	 * 
-	 * @param out
-	 */
-	@RequestMapping(value = "countExtract")
-	public void countExtract(String callback, PrintWriter out) {
-
-		Map<String, Object> totalcount = extractCountService.getTodayCount();
-
-		// 浠婃棩鎻愮幇鎴愬姛閲戦
-		BigDecimal todayextractMoney = extractCountService.getTodayTotalSuccessMoney();
-
-		// 褰撳墠鐢ㄦ埛浣欓鎬昏锛氭墍鏈夌敤鎴锋�讳綑棰�
-		BigDecimal amountMoney = userInfoCountService.countAllMoney(null);
-
-		// 鍙彁鐜伴噾棰濋檺鍒�
-		String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
-		if (minMoney == null) {
-			minMoney = "0";
-		}
-		// 褰撳墠鍙彁鐜伴噾棰濇�昏锛� 瓒呰繃鏈�浣庢彁鐜伴噾棰�---璁″叆缁熻
-		BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));
-
-		// 绱宸叉彁鐜伴噾棰濇�昏锛氬凡鎻愮幇鎴愬姛鐨勬�婚/ 娆℃暟
-		Map<String, Object> resultData = extractCountService.countTotalSuccess();
-
-		JSONObject data = new JSONObject();
-		data.put("todayCount", totalcount);
-		data.put("todayextractMoney", todayextractMoney);
-
-		data.put("amountMoney", amountMoney); // 鎵�鏈夌敤鎴锋�讳綑棰�
-		data.put("extractApply", extractApply); // 鍙彁鐜伴噾棰濇�昏
-		data.put("extractNumber", resultData.get("totalamount")); // 鎻愮幇鎴愬姛娆℃暟
-		data.put("extractMoney", resultData.get("totalmoney")); // 鎻愮幇鎴愬姛閲戦
-
-		out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-	}
-
-	/**
-	 * 鏌ヨ鎵�鏈夊鏍歌褰曚俊鎭�
-	 * 
-	 * @param callback
-	 * @param pageIndex
-	 * @param key
-	 * @param startTime
-	 * @param endTime
-	 * @param out
-	 */
-	@RequestMapping(value = "getFinishRecordList")
-	public void getFinishRecordList(String callback, Integer pageIndex, String key, String startTime, String endTime,
-			PrintWriter out) {
-
-		try {
-
-			// 璧峰鏃堕棿 涓虹┖璁剧疆榛樿鍊硷細
-			if (StringUtil.isNullOrEmpty(startTime)) {
-				startTime = "1970-01-01";
-			}
-
-			// 缁撴潫鏃堕棿 涓虹┖璁剧疆榛樿鍊煎綋鍓嶆棩鏈�
-			if (StringUtil.isNullOrEmpty(endTime)) {
-				Date curDate = new Date();
-				endTime = TimeUtil.getSimpleDate(curDate);
-			}
-
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			Date enddate = sdf.parse(endTime);
-			Calendar c = Calendar.getInstance();
-			c.setTime(enddate);
-			c.add(Calendar.DAY_OF_MONTH, 1);// 浠婂ぉ+1澶�
-
-			endTime = sdf.format(c.getTime());
-
-			if (pageIndex == null)
-				pageIndex = 1;
-
-			int pageSize = Constant.PAGE_SIZE;
-
-			List<ExtractAuditRecord> auditList = extractAuditRecordService.getList(pageIndex, pageSize, key, startTime,
-					endTime);
-
-			int count = extractAuditRecordService.getCount(key, startTime, endTime);
-			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
-			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
-			if (auditList == null || auditList.size() == 0) {
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
-			} else {
-
-				for (ExtractAuditRecord extractAuditRecord : auditList) {
-					int countByUid = 0;
-					int countCancel = 0;
-					Extract extract = extractAuditRecord.getExtract();
-					if (extract != null) {
-						UserInfo userInfo = extract.getUserInfo();
-						Long id = userInfo.getId();
-						countByUid = hongBaoV2CountService.countNumberByUid(id);
-						countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO);
-					}
-					extractAuditRecord.setCancelOrderNum((long) countCancel);
-					extractAuditRecord.setOrderNum((long) countByUid);
-				}
-
-				JSONObject data = new JSONObject();
-				GsonBuilder gsonBuilder = new GsonBuilder();
-				gsonBuilder.serializeNulls(); // 閲嶇偣
-				Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
-
-				data.put("pe", pe);
-				data.put("auditList", gson.toJson(auditList));
-
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
-		}
-	}
-
-	/**
-	 * 鏌ヨ瀹㈡湇涓汉鎻愮幇瀹℃壒璁板綍淇℃伅
-	 * 
-	 * @param callback
-	 * @param pageIndex
-	 *            椤电爜
-	 * @param key
-	 *            绛涢�夋潯浠�
-	 * @param timeSlot
-	 *            鏌ヨ鏃堕棿娈�
-	 * @param state
-	 *            鏌ョ湅瀹℃牳鐘舵��
-	 * @param out
-	 * @param request
-	 */
-	@RequestMapping(value = "getMyAuditedList")
-	public void getMyAuditedList(String callback, Integer pageIndex, String key, String timeSlot, Integer state,
-			PrintWriter out, HttpServletRequest request) {
-
-		try {
-
-			// AdminUser admin = (AdminUser)
-			// request.getSession().getAttribute(Constant.SESSION_ADMIN);
-			// if (admin == null) {
-			// JsonUtil.printMode(out, callback,
-			// JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
-			// return;
-			// }
-
-			int pageSize = Constant.PAGE_SIZE;
-			Integer days = null;
-			if ("1".equals(timeSlot)) {
-				days = 0; // 浠婃棩
-			} else if ("2".equals(timeSlot)) {
-				days = 3; // 鍓�3澶�
-			} else if ("3".equals(timeSlot)) {
-				days = 7; // 鍓�7澶�
-			}
-
-			if (state != null && state != 0 && state != 1 && state != 2) {
-				state = null;
-			}
-
-			// 鏌ヨ褰撳墠浜哄憳鐨勫鏍稿垪琛ㄤ俊鎭�
-			// Long adminId = admin.getId();
-			// auditList =
-			// extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex,
-			// pageSize, key,state, adminId, days);
-			// count = extractAuditRecordService.getMyAuditedTimeSlotCount(key,
-			// state, adminId,days);
-
-			// 鏆備笉鍖哄垎璐﹀彿锛岄粯璁ゆ墍鏈�
-			List<ExtractAuditRecord> auditList = extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex, pageSize,
-					key, state, null, days);
-			if (auditList == null || auditList.size() == 0) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
-				return;
-			}
-
-			for (ExtractAuditRecord record : auditList) {
-				AdminUser adminUser = record.getAdminUser();
-				if (adminUser == null) {
-					record.setAdminUser(new AdminUser());
-				}
-				// 鏌ヨ鐢ㄦ埛澶囨敞淇℃伅
-				UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId());
-				if (extra != null) {
-					record.getExtract().getUserInfo().setStateDesc(extra.getMark());
-				}
-
-				int warnLevel = 0;
-				Extract extract = record.getExtract();
-				if (extract != null) {
-					Integer extractState = extract.getState();
-					if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) {
-						UserInfo userInfo = extract.getUserInfo();
-						if (userInfo != null) {
-							BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(),
-									TimeUtil.getGernalTime(extract.getExtractTime()));
-							if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) {
-								warnLevel = 1;
-							}
-						}
-					}
-				}
-
-				if (record.getExtraInfo() != null) {
-					StringBuffer desc = new StringBuffer();
-					if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2019-06-21", "yyyy-MM-dd")) {
-						desc.append("澶х瑪璁㈠崟鏁�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
-						desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
-						desc.append("缁存潈璁㈠崟浣i噾:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
-						if (record.getExtraInfo().getOrderCount50More() > 0
-								|| record.getExtraInfo().getWeiQuanOrderCount() > 1
-								|| record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0)
-							warnLevel = 2;
-					} else {
-						if (record.getExtraInfo().getOrderCount50More() > 0
-								|| record.getExtraInfo().getWeiQuanOrderCount() > 0
-								|| record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(0)) > 0)
-							warnLevel = 2;
-						desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
-						desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
-						desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
-						desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount());
-					}
-					record.setExtraInfoStr(desc.toString());
-				}
-
-				// if (warnLevel == 0) {
-				// // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
-				// List<Integer> typeList = new ArrayList<>();
-				// typeList.add(HongBaoV2.TYPE_ZIGOU);
-				// long sameGoodsOrderCount =
-				// commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
-				// record.getExtract().getUserInfo().getId(),
-				// Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
-				// long sameShopOrderCount =
-				// commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
-				// record.getExtract().getUserInfo().getId(),
-				// Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
-				// if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
-				// warnLevel = 3;
-				// record.setExtraInfoStr(
-				// String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount,
-				// sameGoodsOrderCount));
-				// }
-				// }
-
-				record.setWarnLevel(warnLevel);
-
-			}
-
-			int count = extractAuditRecordService.getMyAuditedTimeSlotCount(key, state, null, days);
-			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
-			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
-			GsonBuilder gsonBuilder = new GsonBuilder();
-			gsonBuilder.serializeNulls();
-			gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
-
-			Gson gson = gsonBuilder.create();
-
-			JSONObject data = new JSONObject();
-			data.put("pe", pe);
-			data.put("list", gson.toJson(auditList));
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			out.print(JsonUtil.loadFalseResult(e.getMessage()));
-		}
-	}
-
-	@RequestMapping(value = "getMyAuditedDanger")
-	public void getMyAuditedDanger(String callback, Long uid, PrintWriter out) {
-		if (uid == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇风櫥褰�"));
-			return;
-		}
-		// 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
-		List<Integer> typeList = new ArrayList<>();
-		typeList.add(HongBaoV2.TYPE_ZIGOU);
-		long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList, uid,
-				Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
-		long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,
-				Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
-		if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
-			String text = (String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsOrderCount));
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(text));
-			return;
-		}
-		JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("搴楅摵/鍟嗗搧鏃犲紓甯�"));
-	}
-
-	/**
-	 * 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁�
-	 * 
-	 * @param out
-	 */
-	@RequestMapping(value = "getMyAuditedCount")
-	public void getMyAuditedCount(String callback, HttpServletRequest request, PrintWriter out) {
-
-		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
-		if (admin == null) {
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
-		} else {
-			Long adminId = admin.getId();
-
-			int taskToday = extractCountService.countTodayApply();
-			// int countTodayComplete = extractService.countTodayComplete();
-
-			// 浠婃棩绱澶勭悊鏁版嵁
-			int countToday = extractAuditRecordService.getMyAuditedCountToday(adminId);
-			// 鏈懆绱澶勭悊鏁版嵁
-			int countWeek = extractAuditRecordService.getMyAuditedCountWeek(adminId);
-			// 鏈湀绱澶勭悊鏁版嵁
-			int countMonth = extractAuditRecordService.getMyAuditedCountMonth(adminId);
-
-			JSONObject data = new JSONObject();
-			data.put("adminUser", admin);
-			data.put("taskToday", taskToday);
-			data.put("countToday", countToday);
-			data.put("countWeek", countWeek);
-			data.put("countMonth", countMonth);
-
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-		}
-
-	}
-
-	/**
-	 * 瀹㈡湇浠诲姟椤甸潰灞曠ず鏁版嵁锛氫紶鍏ユ彁鐜扮敵璇穒d 鍒欐樉绀哄綋鍓嶇敵璇凤紝鑻ユ棤id鍒欐樉绀哄鏈嶄换鍔′笅绗竴涓敵璇锋暟鎹�
-	 * 
-	 * @param callback
-	 * @param extractId
-	 *            鎻愮幇id
-	 * @param request
-	 * @param out
-	 */
-	@RequestMapping(value = "getIaskInfo")
-	public void getIaskInfo(String callback, Long extractId, HttpServletRequest request, PrintWriter out) {
-		try {
-
-			String surplusTime = "";
-			JSONObject data = new JSONObject();
-			Extract extract = new Extract();
-			AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-			if (admin == null) {
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
-				return;
-			}
-
-			if (extractId != null) {
-				/* 浼犲叆鎻愮幇鐢宠id 鏌ヨ鍓嶅鏈嶄换鍔℃暟鎹� */
-
-				extract = extractService.selectByPrimaryKey(extractId);
-				if (extract == null) {
-					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠鐢宠宸蹭笉瀛樺湪")));
-					return;
-				}
-
-				// 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
-				/*
-				 * extract.setAdminId(admin.getId());
-				 * extractService.updateByPrimaryKeySelective(extract);
-				 */
-
-				BigDecimal beforeMoney = null;
-				List<ExtractAuditRecord> records = extractAuditRecordService.getbyExtractId(extract.getId());
-				if (records != null && records.size() > 0) {
-					ExtractAuditRecord extractAuditRecord = records.get(0);
-					if (extractAuditRecord != null) {
-						beforeMoney = extractAuditRecord.getBeforeMoney();
-					}
-				}
-
-				Long extractTime = extract.getExtractTime();
-				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-				Date date = new Date(extractTime);
-				Calendar c = Calendar.getInstance();
-				c.setTime(date);
-				c.add(Calendar.DAY_OF_MONTH, 3);// 浠婂ぉ+3澶�
-				Date todayTime = new Date();
-				String formattodayTime = sdf.format(todayTime);
-				String formatTime = sdf.format(c.getTime());
-
-				long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
-				if (diff <= 0) {
-					surplusTime = "宸茶秴鏃�";
-				} else {
-					surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
-				}
-
-				String mark = "";
-				UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());
-				if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
-					mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark();
-				}
-
-				data.put("mark", mark);
-				data.put("extract", extract);
-				data.put("beforeMoney", beforeMoney);
-				data.put("surplusTime", surplusTime);
-
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-
-			} else {
-				/* 鏈紶鍏ユ彁鐜扮敵璇穒d 鏌ヨ褰撳墠瀹㈡湇浠诲姟 涓殑绗竴涓� 鏁版嵁 */
-
-				boolean newTask = false;
-
-				// 鏌ヨ涔嬪墠鏈鐞嗗畬鐨勪换鍔�
-				extract = extractService.getMyTaskInfo(admin.getId());
-
-				if (extract == null) {
-					// 鏂颁换鍔�
-					extract = extractService.getNewTaskInfo();
-					if (extract != null)
-						newTask = true;
-				}
-
-				if (extract == null) {
-					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛鎻愮幇鐢宠")));
-				} else {
-
-					if (newTask) {
-						// 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
-						/*
-						 * extract.setAdminId(admin.getId());
-						 * 
-						 * extractService.updateByPrimaryKeySelective(extract);
-						 */
-					}
-
-					BigDecimal beforeMoney = null;
-
-					List<ExtractAuditRecord> records = extractAuditRecordService.getbyExtractId(extract.getId());
-					if (records != null && records.size() > 0) {
-						ExtractAuditRecord extractAuditRecord = records.get(0);
-						if (extractAuditRecord != null) {
-							beforeMoney = extractAuditRecord.getBeforeMoney();
-						}
-					}
-
-					Long extractTime = extract.getExtractTime();
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-					Date date = new Date(extractTime);
-
-					Calendar c = Calendar.getInstance();
-					c.setTime(date);
-					c.add(Calendar.DAY_OF_MONTH, 3);// 浠婂ぉ+3澶�
-					Date todayTime = new Date();
-
-					String formattodayTime = sdf.format(todayTime);
-					String formatTime = sdf.format(c.getTime());
-
-					long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
-					if (diff <= 0) {
-						surplusTime = "宸茶秴鏃�";
-					} else {
-						surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
-					}
-
-					String mark = "";
-					UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());
-					if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
-						mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark();
-					}
-
-					data.put("mark", mark);
-					data.put("extract", extract);
-					data.put("beforeMoney", beforeMoney);
-					data.put("surplusTime", surplusTime);
-
-					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-				}
-
-			}
-
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * 鏌ヨ鐢ㄦ埛鍘嗗彶鎻愮幇璁板綍
-	 * 
-	 * @param callback
-	 * @param pageIndex
-	 *            椤电爜
-	 * @param key
-	 *            鐢ㄦ埛id
-	 * @param request
-	 * @param out
-	 */
-	@RequestMapping(value = "getByUidList")
-	public void getByUidList(String callback, Integer pageIndex, Long uid, HttpServletRequest request,
-			PrintWriter out) {
-		try {
-			if (uid == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
-				return;
-			}
-
-			if (pageIndex == null)
-				pageIndex = 1;
-
-			int pageSize = Constant.PAGE_SIZE;
-
-			List<ExtractAuditRecord> list = extractAuditRecordService.getByUidList(pageIndex, pageSize, uid);
-			if (list == null || list.size() == 0) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愮幇璁板綍"));
-				return;
-			}
-
-			for (ExtractAuditRecord record : list) {
-
-				if (record.getExtraInfo() != null) {
-					StringBuffer desc = new StringBuffer();
-					desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
-					desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
-					desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
-					desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount());
-					record.setExtraInfoStr(desc.toString());
-				}
-			}
-
-			int count = extractAuditRecordService.getByUidCount(uid);
-			int totalPage = 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.create();
-
-			JSONObject data = new JSONObject();
-			data.put("pe", pe);
-			data.put("list", gson.toJson(list));
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
-		} catch (Exception e) {
-			// TODO: handle exception
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 鏁伴噺缁熻
-	 * 
-	 * @param callback
-	 * @param uid
-	 *            鐢ㄦ埛id
-	 * @param request
-	 * @param out
-	 */
-	@RequestMapping(value = "countByUid")
-	public void countByUid(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
-
-		try {
-
-			// 缁熻宸查鍙栭噾棰� 璐︽埛鍘嗗彶鎬绘敹鐩�
-			BigDecimal receiveMoneys = hongBaoV2CountService.countMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);
-			if (receiveMoneys == null) {
-				receiveMoneys = new BigDecimal(0);
-			}
-
-			// 鍘嗗彶鎻愮幇鎴愬姛閲戦
-			double successMoneys = extractCountService.countSuccessMoneysByUid(uid);
-
-			// 鍘嗗彶鎻愮幇鎬绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁�
-			Map<String, Object> map = extractCountService.countRecordsByUid(uid);
-
-			GsonBuilder gsonBuilder = new GsonBuilder();
-			gsonBuilder.serializeNulls();
-			Gson gson = gsonBuilder.create();
-
-			JSONObject data = new JSONObject();
-			data.put("map", gson.toJson(map));
-			data.put("successMoneys", gson.toJson(successMoneys));
-			data.put("receiveMoneys", gson.toJson(receiveMoneys));
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 鏍¢獙鐢ㄦ埛璧勯噾鏄惁寮傚父
-	 * 
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "checkMoney")
-	public void checkMoney(String callback, String uid, PrintWriter out) {
-
-		if (StringUtil.isNullOrEmpty(uid)) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("UID涓嶈兘涓虹┖"));
-			return;
-		}
-
-		try {
-			extractService.checkExtract(Long.parseLong(uid));
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝e父"));
-		} catch (ExtractException e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
-		}
-	}
-
-	/**
-	 * 缁熻瀹℃牳娆℃暟
-	 * 
-	 * @param callback
-	 * @param state
-	 *            瀹℃牳鐘舵�侊細鎵�鏈�-3 閫氳繃-1 鎷掔粷- 2
-	 * @param type
-	 *            缁熻绫诲瀷 1-24灏忔椂 2-鎵�鏈�3
-	 * @param dateType
-	 *            绫诲瀷 1鏃� 2鏈� 3骞�
-	 * @param year
-	 *            2018
-	 * @param startTime
-	 *            2018-12-01
-	 * @param endTime
-	 *            2018-12-01
-	 * @param out
-	 */
-	@RequestMapping(value = "getAuditTotal")
-	public void getAuditTotal(String callback, String stateArray, 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 && 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 {
-			Object objectDate = null;
-			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
-			Gson gson = new Gson();
-			List<Integer> stateList = gson.fromJson(stateArray, new TypeToken<ArrayList<Integer>>() {
-			}.getType());
-
-			JSONArray line_list = new JSONArray();
-			for (Integer state : stateList) {
-				JSONObject innerList = new JSONObject();
-				if (state == null || state == 3) {
-					innerList.put("name", "鎬昏");
-				} else if (state == 1) {
-					innerList.put("name", "閫氳繃鏁�");
-				} else if (state == 2) {
-					innerList.put("name", "椹冲洖鏁�");
-				}
-
-				List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year, startTime,
-						endTime);
-				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")));
-				}
-				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);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 缁熻鎻愮幇鐢宠鎬婚
-	 * 
-	 * @param callback
-	 * @param type
-	 *            缁熻绫诲瀷 1-24灏忔椂 2-鎵�鏈�
-	 * @param dateType
-	 *            绫诲瀷 1鏃� 2鏈� 3
-	 * @param year
-	 *            2018
-	 * @param startTime
-	 *            2018-12-01
-	 * @param endTime
-	 *            2018-12-01
-	 * @param out
-	 */
-	@RequestMapping(value = "getExtractApplyMoney")
-	public void getExtractApplyMoney(String callback, 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 && 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 {
-
-			Object objectDate = null;
-			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
-			Gson gson = new Gson();
-			JSONObject innerList = new JSONObject();
-			innerList.put("name", "鎬昏");
-
-			List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, startTime,
-					endTime);
-
-			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")));
-			}
-
-			JSONArray line_list = new JSONArray();
-			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);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 缁熻鎻愮幇鐢宠鎬绘鏁�
-	 * 
-	 * @param callback
-	 * @param state
-	 *            鎵�鏈�-绌哄�兼垨鑰呬笉浼� 寰呭鏍�-0 閫氳繃-1 鎷掔粷- 2
-	 * @param type
-	 *            缁熻绫诲瀷 1-24灏忔椂 2-鎵�鏈�
-	 * @param dateType
-	 *            绫诲瀷 1鏃� 2鏈� 3骞�
-	 * @param year
-	 *            2018
-	 * @param startTime
-	 *            2018-12-01
-	 * @param endTime
-	 *            2018-12-01
-	 * @param out
-	 */
-	@RequestMapping(value = "getExtractApplyNumber")
-	public void getExtractApplyNumber(String callback, Integer state, 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 && 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 {
-			Object objectDate = null;
-			Gson gson = new Gson();
-			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
-			JSONObject innerList = new JSONObject();
-			innerList.put("name", "鎬昏");
-
-			List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, startTime,
-					endTime);
-
-			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")));
-			}
-
-			JSONArray line_list = new JSONArray();
-			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);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 涓嬭浇鎻愮幇绾㈠寘Openid
-	 * 
-	 * @param callback
-	 * @param response
-	 * @param out
-	 */
-	@RequestMapping(value = "downAutoExtractTxt")
-	public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {
-		try {
-			List<String> list = extractService.getAutoExtractOpenIds();
-			if (list == null || list.size() <= 1) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
-				return;
-			}
-
-			String filepath = "鑷姩鎻愮幇OpenId " + java.lang.System.currentTimeMillis() + ".txt";
-			response.reset();
-			response.setContentType("application/octet-stream");
-			String fileName = URLDecoder.decode(filepath, "utf-8");
-			response.addHeader("Content-Disposition",
-					"attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\"");
-
-			StringBuilder sb = new StringBuilder();
-			for (String t : list) {
-				sb.append(t + "\r\n");
-			}
-
-			String opid_str = sb.toString();
-			if (!StringUtil.isNullOrEmpty(opid_str) && opid_str.endsWith("\r\n")) {
-				opid_str = opid_str.substring(0, opid_str.length() - 2);
-			}
-
-			OutputStream os = response.getOutputStream();
-			byte[] byt = opid_str.getBytes();
-			os.write(byt);
-			os.flush();
-			os.close();
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 涓婁紶鎻愮幇绾㈠寘Excel
-	 * 
-	 * @param file
-	 * @param out
-	 */
-	@RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
-	public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
-		if (file == null) {
-			out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖锛�"));
-			return;
-		}
-
-		try {
-			List<RedPackRecord> list = WXRedPackUtil.readCsv(file.getInputStream());
-			extractService.updateManualExtractRecord(list);
-			out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-		} catch (ExtractException e) {
-			out.print(JsonUtil.loadFalseResult(e.getMsg()));
-		} catch (Exception e) {
-			e.printStackTrace();
-			out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触"));
-		}
-	}
-
-	
-	public static String getValue(String[] item,int index){
-        if(item.length > index){
-            String value = item[index];
-            return value;
-        }
-        return "";
-    }
-	
-	/**
-	 * 棰勮绾㈠寘鍙戠敓浜�
-	 * 
-	 * @param callback
-	 * @param pageIndex
-	 * @param out
-	 */
-	@RequestMapping(value = "preAutoUser")
-	public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {
-		try {
-			List<UserInfo> list = extractService.preAutoUser();
-			if (list == null || list.isEmpty()) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
-				return;
-			}
-
-			if (pageIndex == null || pageIndex < 1) {
-				pageIndex = 1;
-			}
-
-			Integer pageSize = 100;
-			if (pageSize == null || pageSize < 1) {
-				pageSize = Constant.PAGE_SIZE;
-			}
-
-			int count = list.size();
-			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
-			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
-			List<UserInfo> listResult = null;
-			if (pageIndex < totalPage) {
-				int start = (pageIndex - 1) * pageSize;
-				listResult = list.subList(start, start + pageSize);
-			} else if (pageIndex == totalPage) {
-				listResult = list.subList((pageIndex - 1) * pageSize, list.size());
-			} else {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
-				return;
-			}
-
-			JSONObject data = new JSONObject();
-			data.put("pe", pe);
-			data.put("result_list", listResult);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-}
-	
+package com.yeshi.fanli.controller.admin;
+
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.IPUtil;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.entity.wx.RedPackRecord;
+import org.yeshi.utils.wx.WXRedPackUtil;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.exception.ExtractException;
+import com.yeshi.fanli.exception.NotExistObjectException;
+import com.yeshi.fanli.exception.ObjectStateException;
+import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.AdminUserService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
+import com.yeshi.fanli.service.inter.count.UserInfoCountService;
+import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;
+import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;
+import com.yeshi.fanli.service.inter.money.extract.ExtractService;
+import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
+import com.yeshi.fanli.service.inter.push.PushRecordService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
+
+import net.sf.json.JSONObject;
+
+@Controller
+@RequestMapping("admin/new/api/v1/extract")
+public class ExtractAdminController {
+
+	@Resource
+	private ExtractService extractService;
+
+	@Resource
+	private ConfigService configService;
+
+	@Resource
+	private UserInfoCountService userInfoCountService;
+
+	@Resource
+	private ExtractCountService extractCountService;
+
+	@Resource
+	private PushRecordService pushRecordService;
+
+	@Resource
+	private PushController xingePushController;
+
+	@Resource
+	private ExtractAuditRecordService extractAuditRecordService;
+
+	@Resource
+	private HongBaoV2CountService hongBaoV2CountService;
+
+	@Resource
+	private AdminUserService adminUserService;
+
+	@Resource
+	private RedisManager redisManager;
+
+	@Resource
+	private TaoBaoOrderService taoBaoOrderService;
+
+	@Resource
+	private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
+
+	@Resource
+	private UserInfoExtraService userInfoExtraService;
+
+	@Resource
+	private CommonOrderCountService commonOrderCountService;
+
+	/**
+	 * 
+	 * 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰 鍙痡sonP鏂瑰紡
+	 * 
+	 * @param id
+	 * @param code
+	 *            楠岃瘉鐮�
+	 * @param out
+	 * @param request
+	 */
+	@RequestMapping(value = "passExtractJP")
+	public void passExtractJP(String callback, Long id, String code, PrintWriter out, HttpServletRequest request) {
+
+		/* 妫�楠屾槸鍚︾櫥闄� */
+		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+		if (admin == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��"));
+			return;
+		}
+
+		/* 妫�楠屾槸鍚﹂�氳繃楠岃瘉 */
+		String codeType = (String) request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);
+		if (!"1".equals(codeType)) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3, "閭楠岃瘉鏈�氳繃"));
+			return;
+		}
+
+		/* 鍏佽鎻愮幇 鎿嶄綔 */
+		Integer integer = extractService.passExtract(id, admin);
+
+		// 鏃ュ織璁板綍
+		if (integer == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("宸查�氳繃"));
+			LogHelper
+					.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!");
+		} else if (integer == 1) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ユ彁鐜拌褰曞凡涓嶅瓨鍦�,璇峰埛鏂�"));
+			LogHelper.userInfo(
+					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
+		} else {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡琚鐞�,璇峰埛鏂�"));
+			LogHelper.userInfo(
+					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
+		}
+
+	}
+
+	/**
+	 * 
+	 * 鏂规硶璇存槑: 鎷掔粷鎻愮幇璇锋眰jsonP
+	 * 
+	 * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55
+	 * @param id
+	 * @param reason
+	 * @param out
+	 * @param request
+	 */
+	@RequestMapping(value = "rejectExtractJP")
+	public void rejectExtractJP(String callback, Long id, String code, String reason, PrintWriter out,
+			HttpServletRequest request) {
+		/* 妫�楠屾槸鍚︾櫥闄� */
+		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+		if (admin == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
+			return;
+		}
+
+		/* 妫�楠屾槸鍚﹂�氳繃楠岃瘉 */
+		String codeType = (String) request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);
+		if (!"1".equals(codeType)) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3, "閭楠岃瘉鏈�氳繃"));
+			return;
+		}
+
+		try {
+			// 缂栫爜杞崲
+			reason = URLDecoder.decode(reason, "UTF-8");
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+
+		try {
+
+			extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
+
+			LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
+					+ "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
+
+		} catch (ObjectStateException e) {
+			LogHelper.userInfo(
+					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); //
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
+
+		} catch (NotExistObjectException e) {
+			LogHelper.userInfo(
+					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪!");
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
+		}
+
+	}
+
+	/**
+	 * 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁�
+	 * 
+	 * @param out
+	 */
+	@RequestMapping(value = "countExtract")
+	public void countExtract(String callback, PrintWriter out) {
+
+		Map<String, Object> totalcount = extractCountService.getTodayCount();
+
+		// 浠婃棩鎻愮幇鎴愬姛閲戦
+		BigDecimal todayextractMoney = extractCountService.getTodayTotalSuccessMoney();
+
+		// 褰撳墠鐢ㄦ埛浣欓鎬昏锛氭墍鏈夌敤鎴锋�讳綑棰�
+		BigDecimal amountMoney = userInfoCountService.countAllMoney(null);
+
+		// 鍙彁鐜伴噾棰濋檺鍒� 
+		String minMoney = configService.get(ConfigKeyEnum.extractMoneyMin.getKey());
+		if (minMoney == null) {
+			minMoney = "0";
+		}
+		// 褰撳墠鍙彁鐜伴噾棰濇�昏锛� 瓒呰繃鏈�浣庢彁鐜伴噾棰�---璁″叆缁熻
+		BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));
+
+		// 绱宸叉彁鐜伴噾棰濇�昏锛氬凡鎻愮幇鎴愬姛鐨勬�婚/ 娆℃暟
+		Map<String, Object> resultData = extractCountService.countTotalSuccess();
+
+		JSONObject data = new JSONObject();
+		data.put("todayCount", totalcount);
+		data.put("todayextractMoney", todayextractMoney);
+
+		data.put("amountMoney", amountMoney); // 鎵�鏈夌敤鎴锋�讳綑棰�
+		data.put("extractApply", extractApply); // 鍙彁鐜伴噾棰濇�昏
+		data.put("extractNumber", resultData.get("totalamount")); // 鎻愮幇鎴愬姛娆℃暟
+		data.put("extractMoney", resultData.get("totalmoney")); // 鎻愮幇鎴愬姛閲戦
+
+		out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+	}
+
+	/**
+	 * 鏌ヨ鎵�鏈夊鏍歌褰曚俊鎭�
+	 * 
+	 * @param callback
+	 * @param pageIndex
+	 * @param key
+	 * @param startTime
+	 * @param endTime
+	 * @param out
+	 */
+	@RequestMapping(value = "getFinishRecordList")
+	public void getFinishRecordList(String callback, Integer pageIndex, String key, String startTime, String endTime,
+			PrintWriter out) {
+
+		try {
+
+			// 璧峰鏃堕棿 涓虹┖璁剧疆榛樿鍊硷細
+			if (StringUtil.isNullOrEmpty(startTime)) {
+				startTime = "1970-01-01";
+			}
+
+			// 缁撴潫鏃堕棿 涓虹┖璁剧疆榛樿鍊煎綋鍓嶆棩鏈�
+			if (StringUtil.isNullOrEmpty(endTime)) {
+				Date curDate = new Date();
+				endTime = TimeUtil.getSimpleDate(curDate);
+			}
+
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			Date enddate = sdf.parse(endTime);
+			Calendar c = Calendar.getInstance();
+			c.setTime(enddate);
+			c.add(Calendar.DAY_OF_MONTH, 1);// 浠婂ぉ+1澶�
+
+			endTime = sdf.format(c.getTime());
+
+			if (pageIndex == null)
+				pageIndex = 1;
+
+			int pageSize = Constant.PAGE_SIZE;
+
+			List<ExtractAuditRecord> auditList = extractAuditRecordService.getList(pageIndex, pageSize, key, startTime,
+					endTime);
+
+			int count = extractAuditRecordService.getCount(key, startTime, endTime);
+			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
+			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+			if (auditList == null || auditList.size() == 0) {
+				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
+			} else {
+
+				for (ExtractAuditRecord extractAuditRecord : auditList) {
+					int countByUid = 0;
+					int countCancel = 0;
+					Extract extract = extractAuditRecord.getExtract();
+					if (extract != null) {
+						UserInfo userInfo = extract.getUserInfo();
+						Long id = userInfo.getId();
+						countByUid = hongBaoV2CountService.countNumberByUid(id);
+						countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO);
+					}
+					extractAuditRecord.setCancelOrderNum((long) countCancel);
+					extractAuditRecord.setOrderNum((long) countByUid);
+				}
+
+				JSONObject data = new JSONObject();
+				GsonBuilder gsonBuilder = new GsonBuilder();
+				gsonBuilder.serializeNulls(); // 閲嶇偣
+				Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+				data.put("pe", pe);
+				data.put("auditList", gson.toJson(auditList));
+
+				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
+		}
+	}
+
+	/**
+	 * 鏌ヨ瀹㈡湇涓汉鎻愮幇瀹℃壒璁板綍淇℃伅
+	 * 
+	 * @param callback
+	 * @param pageIndex
+	 *            椤电爜
+	 * @param key
+	 *            绛涢�夋潯浠�
+	 * @param timeSlot
+	 *            鏌ヨ鏃堕棿娈�
+	 * @param state
+	 *            鏌ョ湅瀹℃牳鐘舵��
+	 * @param out
+	 * @param request
+	 */
+	@RequestMapping(value = "getMyAuditedList")
+	public void getMyAuditedList(String callback, Integer pageIndex, String key, String timeSlot, Integer state,
+			PrintWriter out, HttpServletRequest request) {
+
+		try {
+
+			// AdminUser admin = (AdminUser)
+			// request.getSession().getAttribute(Constant.SESSION_ADMIN);
+			// if (admin == null) {
+			// JsonUtil.printMode(out, callback,
+			// JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
+			// return;
+			// }
+
+			int pageSize = Constant.PAGE_SIZE;
+			Integer days = null;
+			if ("1".equals(timeSlot)) {
+				days = 0; // 浠婃棩
+			} else if ("2".equals(timeSlot)) {
+				days = 3; // 鍓�3澶�
+			} else if ("3".equals(timeSlot)) {
+				days = 7; // 鍓�7澶�
+			}
+
+			if (state != null && state != 0 && state != 1 && state != 2) {
+				state = null;
+			}
+
+			// 鏌ヨ褰撳墠浜哄憳鐨勫鏍稿垪琛ㄤ俊鎭�
+			// Long adminId = admin.getId();
+			// auditList =
+			// extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex,
+			// pageSize, key,state, adminId, days);
+			// count = extractAuditRecordService.getMyAuditedTimeSlotCount(key,
+			// state, adminId,days);
+
+			// 鏆備笉鍖哄垎璐﹀彿锛岄粯璁ゆ墍鏈�
+			List<ExtractAuditRecord> auditList = extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex, pageSize,
+					key, state, null, days);
+			if (auditList == null || auditList.size() == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+				return;
+			}
+
+			for (ExtractAuditRecord record : auditList) {
+				AdminUser adminUser = record.getAdminUser();
+				if (adminUser == null) {
+					record.setAdminUser(new AdminUser());
+				}
+				// 鏌ヨ鐢ㄦ埛澶囨敞淇℃伅
+				UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId());
+				if (extra != null) {
+					record.getExtract().getUserInfo().setStateDesc(extra.getMark());
+				}
+
+				int warnLevel = 0;
+				Extract extract = record.getExtract();
+				if (extract != null) {
+					Integer extractState = extract.getState();
+					if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) {
+						UserInfo userInfo = extract.getUserInfo();
+						if (userInfo != null) {
+							BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(),
+									TimeUtil.getGernalTime(extract.getExtractTime()));
+							if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) {
+								warnLevel = 1;
+							}
+						}
+					}
+				}
+
+				if (record.getExtraInfo() != null) {
+					StringBuffer desc = new StringBuffer();
+					if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2019-06-21", "yyyy-MM-dd")) {
+						desc.append("澶х瑪璁㈠崟鏁�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
+						desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
+						desc.append("缁存潈璁㈠崟浣i噾:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
+						if (record.getExtraInfo().getOrderCount50More() > 0
+								|| record.getExtraInfo().getWeiQuanOrderCount() > 0
+								|| record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0)
+							warnLevel = 2;
+					} else {
+						if (record.getExtraInfo().getOrderCount50More() > 0
+								|| record.getExtraInfo().getWeiQuanOrderCount() > 0
+								|| record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(0)) > 0)
+							warnLevel = 2;
+						desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
+						desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
+						desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
+						desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount());
+					}
+					
+					if (record.getExtraInfo().getLess10OrderCount() != null && record.getExtraInfo().getLess10OrderCount() > 10) {
+						desc.append("鍒峰崟瀚岀枒\n#");
+					}
+					
+					record.setExtraInfoStr(desc.toString());
+				}
+				
+
+				// if (warnLevel == 0) {
+				// // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
+				// List<Integer> typeList = new ArrayList<>();
+				// typeList.add(HongBaoV2.TYPE_ZIGOU);
+				// long sameGoodsOrderCount =
+				// commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
+				// record.getExtract().getUserInfo().getId(),
+				// Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));
+				// long sameShopOrderCount =
+				// commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
+				// record.getExtract().getUserInfo().getId(),
+				// Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));
+				// if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
+				// warnLevel = 3;
+				// record.setExtraInfoStr(
+				// String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount,
+				// sameGoodsOrderCount));
+				// }
+				// }
+
+				record.setWarnLevel(warnLevel);
+			}
+
+			int count = extractAuditRecordService.getMyAuditedTimeSlotCount(key, state, null, days);
+			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
+			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+			GsonBuilder gsonBuilder = new GsonBuilder();
+			gsonBuilder.serializeNulls();
+			gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
+
+			Gson gson = gsonBuilder.create();
+
+			JSONObject data = new JSONObject();
+			data.put("pe", pe);
+			data.put("list", gson.toJson(auditList));
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			out.print(JsonUtil.loadFalseResult(e.getMessage()));
+		}
+	}
+
+	@RequestMapping(value = "getMyAuditedDanger")
+	public void getMyAuditedDanger(String callback, Long uid, PrintWriter out) {
+		if (uid == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇风櫥褰�"));
+			return;
+		}
+		// 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
+		List<Integer> typeList = new ArrayList<>();
+		typeList.add(HongBaoV2.TYPE_ZIGOU);
+		long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList, uid,
+				Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));
+		long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,
+				Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));
+		if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
+			String text = (String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsOrderCount));
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(text));
+			return;
+		}
+		JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("搴楅摵/鍟嗗搧鏃犲紓甯�"));
+	}
+
+	/**
+	 * 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁�
+	 * 
+	 * @param out
+	 */
+	@RequestMapping(value = "getMyAuditedCount")
+	public void getMyAuditedCount(String callback, HttpServletRequest request, PrintWriter out) {
+
+		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+
+		if (admin == null) {
+			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
+		} else {
+			Long adminId = admin.getId();
+
+			int taskToday = extractCountService.countTodayApply();
+			// int countTodayComplete = extractService.countTodayComplete();
+
+			// 浠婃棩绱澶勭悊鏁版嵁
+			int countToday = extractAuditRecordService.getMyAuditedCountToday(adminId);
+			// 鏈懆绱澶勭悊鏁版嵁
+			int countWeek = extractAuditRecordService.getMyAuditedCountWeek(adminId);
+			// 鏈湀绱澶勭悊鏁版嵁
+			int countMonth = extractAuditRecordService.getMyAuditedCountMonth(adminId);
+
+			JSONObject data = new JSONObject();
+			data.put("adminUser", admin);
+			data.put("taskToday", taskToday);
+			data.put("countToday", countToday);
+			data.put("countWeek", countWeek);
+			data.put("countMonth", countMonth);
+
+			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+		}
+
+	}
+
+	/**
+	 * 瀹㈡湇浠诲姟椤甸潰灞曠ず鏁版嵁锛氫紶鍏ユ彁鐜扮敵璇穒d 鍒欐樉绀哄綋鍓嶇敵璇凤紝鑻ユ棤id鍒欐樉绀哄鏈嶄换鍔′笅绗竴涓敵璇锋暟鎹�
+	 * 
+	 * @param callback
+	 * @param extractId
+	 *            鎻愮幇id
+	 * @param request
+	 * @param out
+	 */
+	@RequestMapping(value = "getIaskInfo")
+	public void getIaskInfo(String callback, Long extractId, HttpServletRequest request, PrintWriter out) {
+		try {
+
+			String surplusTime = "";
+			JSONObject data = new JSONObject();
+			Extract extract = new Extract();
+			AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+			if (admin == null) {
+				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
+				return;
+			}
+
+			if (extractId != null) {
+				/* 浼犲叆鎻愮幇鐢宠id 鏌ヨ鍓嶅鏈嶄换鍔℃暟鎹� */
+
+				extract = extractService.selectByPrimaryKey(extractId);
+				if (extract == null) {
+					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠鐢宠宸蹭笉瀛樺湪")));
+					return;
+				}
+
+				// 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
+				/*
+				 * extract.setAdminId(admin.getId());
+				 * extractService.updateByPrimaryKeySelective(extract);
+				 */
+
+				BigDecimal beforeMoney = null;
+				List<ExtractAuditRecord> records = extractAuditRecordService.getbyExtractId(extract.getId());
+				if (records != null && records.size() > 0) {
+					ExtractAuditRecord extractAuditRecord = records.get(0);
+					if (extractAuditRecord != null) {
+						beforeMoney = extractAuditRecord.getBeforeMoney();
+					}
+				}
+
+				Long extractTime = extract.getExtractTime();
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				Date date = new Date(extractTime);
+				Calendar c = Calendar.getInstance();
+				c.setTime(date);
+				c.add(Calendar.DAY_OF_MONTH, 3);// 浠婂ぉ+3澶�
+				Date todayTime = new Date();
+				String formattodayTime = sdf.format(todayTime);
+				String formatTime = sdf.format(c.getTime());
+
+				long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
+				if (diff <= 0) {
+					surplusTime = "宸茶秴鏃�";
+				} else {
+					surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
+				}
+
+				String mark = "";
+				UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());
+				if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
+					mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark();
+				}
+
+				Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
+				if (countOrder != null && countOrder >= 10) {
+					if (StringUtil.isNullOrEmpty(mark)) {
+						mark = "鍒峰崟棰勮锛侊紒";
+					} else {
+						mark = mark + "     鍒峰崟棰勮锛侊紒";
+					}
+				}
+				data.put("mark", mark);
+				data.put("extract", extract);
+				data.put("beforeMoney", beforeMoney);
+				data.put("surplusTime", surplusTime);
+
+				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+
+			} else {
+				/* 鏈紶鍏ユ彁鐜扮敵璇穒d 鏌ヨ褰撳墠瀹㈡湇浠诲姟 涓殑绗竴涓� 鏁版嵁 */
+
+				boolean newTask = false;
+
+				// 鏌ヨ涔嬪墠鏈鐞嗗畬鐨勪换鍔�
+				extract = extractService.getMyTaskInfo(admin.getId());
+
+				if (extract == null) {
+					// 鏂颁换鍔�
+					extract = extractService.getNewTaskInfo();
+					if (extract != null)
+						newTask = true;
+				}
+
+				if (extract == null) {
+					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛鎻愮幇鐢宠")));
+				} else {
+
+					if (newTask) {
+						// 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
+						/*
+						 * extract.setAdminId(admin.getId());
+						 * 
+						 * extractService.updateByPrimaryKeySelective(extract);
+						 */
+					}
+
+					BigDecimal beforeMoney = null;
+
+					List<ExtractAuditRecord> records = extractAuditRecordService.getbyExtractId(extract.getId());
+					if (records != null && records.size() > 0) {
+						ExtractAuditRecord extractAuditRecord = records.get(0);
+						if (extractAuditRecord != null) {
+							beforeMoney = extractAuditRecord.getBeforeMoney();
+						}
+					}
+
+					Long extractTime = extract.getExtractTime();
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					Date date = new Date(extractTime);
+
+					Calendar c = Calendar.getInstance();
+					c.setTime(date);
+					c.add(Calendar.DAY_OF_MONTH, 3);// 浠婂ぉ+3澶�
+					Date todayTime = new Date();
+
+					String formattodayTime = sdf.format(todayTime);
+					String formatTime = sdf.format(c.getTime());
+
+					long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
+					if (diff <= 0) {
+						surplusTime = "宸茶秴鏃�";
+					} else {
+						surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
+					}
+
+					String mark = "";
+					UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());
+					if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
+						mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark();
+					}
+
+					Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
+					if (countOrder != null && countOrder >= 10) {
+						if (StringUtil.isNullOrEmpty(mark)) {
+							mark = "鍒峰崟棰勮锛侊紒";
+						} else {
+							mark = mark + "     鍒峰崟棰勮锛侊紒";
+						}
+					}
+					
+					data.put("mark", mark);
+					data.put("extract", extract);
+					data.put("beforeMoney", beforeMoney);
+					data.put("surplusTime", surplusTime);
+
+					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+				}
+
+			}
+
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+	}
+
+	/**
+	 * 鏌ヨ鐢ㄦ埛鍘嗗彶鎻愮幇璁板綍
+	 * 
+	 * @param callback
+	 * @param pageIndex
+	 *            椤电爜
+	 * @param key
+	 *            鐢ㄦ埛id
+	 * @param request
+	 * @param out
+	 */
+	@RequestMapping(value = "getByUidList")
+	public void getByUidList(String callback, Integer pageIndex, Long uid, HttpServletRequest request,
+			PrintWriter out) {
+		try {
+			if (uid == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+				return;
+			}
+
+			if (pageIndex == null)
+				pageIndex = 1;
+
+			int pageSize = Constant.PAGE_SIZE;
+
+			List<ExtractAuditRecord> list = extractAuditRecordService.getByUidList(pageIndex, pageSize, uid);
+			if (list == null || list.size() == 0) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愮幇璁板綍"));
+				return;
+			}
+
+			for (ExtractAuditRecord record : list) {
+
+				if (record.getExtraInfo() != null) {
+					StringBuffer desc = new StringBuffer();
+					desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#");
+					desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
+					desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
+					desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount());
+					record.setExtraInfoStr(desc.toString());
+				}
+			}
+
+			int count = extractAuditRecordService.getByUidCount(uid);
+			int totalPage = 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.create();
+
+			JSONObject data = new JSONObject();
+			data.put("pe", pe);
+			data.put("list", gson.toJson(list));
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+		} catch (Exception e) {
+			// TODO: handle exception
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鏁伴噺缁熻
+	 * 
+	 * @param callback
+	 * @param uid
+	 *            鐢ㄦ埛id
+	 * @param request
+	 * @param out
+	 */
+	@RequestMapping(value = "countByUid")
+	public void countByUid(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
+
+		try {
+
+			// 缁熻宸查鍙栭噾棰� 璐︽埛鍘嗗彶鎬绘敹鐩�
+			BigDecimal receiveMoneys = hongBaoV2CountService.countMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);
+			if (receiveMoneys == null) {
+				receiveMoneys = new BigDecimal(0);
+			}
+
+			// 鍘嗗彶鎻愮幇鎴愬姛閲戦
+			double successMoneys = extractCountService.countSuccessMoneysByUid(uid);
+
+			// 鍘嗗彶鎻愮幇鎬绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁�
+			Map<String, Object> map = extractCountService.countRecordsByUid(uid);
+
+			GsonBuilder gsonBuilder = new GsonBuilder();
+			gsonBuilder.serializeNulls();
+			Gson gson = gsonBuilder.create();
+
+			JSONObject data = new JSONObject();
+			data.put("map", gson.toJson(map));
+			data.put("successMoneys", gson.toJson(successMoneys));
+			data.put("receiveMoneys", gson.toJson(receiveMoneys));
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鏍¢獙鐢ㄦ埛璧勯噾鏄惁寮傚父
+	 * 
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "checkMoney")
+	public void checkMoney(String callback, String uid, PrintWriter out) {
+
+		if (StringUtil.isNullOrEmpty(uid)) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("UID涓嶈兘涓虹┖"));
+			return;
+		}
+
+		try {
+			extractService.checkExtract(Long.parseLong(uid));
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝e父"));
+		} catch (ExtractException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+		}
+	}
+
+
+	/**
+	 * 涓嬭浇鎻愮幇绾㈠寘Openid
+	 * 
+	 * @param callback
+	 * @param response
+	 * @param out
+	 */
+	@RequestMapping(value = "downAutoExtractTxt")
+	public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {
+		try {
+			List<String> list = extractService.getAutoExtractOpenIds();
+			if (list == null || list.size() <= 1) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
+				return;
+			}
+
+			String filepath = "鑷姩鎻愮幇OpenId " + java.lang.System.currentTimeMillis() + ".txt";
+			response.reset();
+			response.setContentType("application/octet-stream");
+			String fileName = URLDecoder.decode(filepath, "utf-8");
+			response.addHeader("Content-Disposition",
+					"attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\"");
+
+			StringBuilder sb = new StringBuilder();
+			for (String t : list) {
+				sb.append(t + "\r\n");
+			}
+
+			String opid_str = sb.toString();
+			if (!StringUtil.isNullOrEmpty(opid_str) && opid_str.endsWith("\r\n")) {
+				opid_str = opid_str.substring(0, opid_str.length() - 2);
+			}
+
+			OutputStream os = response.getOutputStream();
+			byte[] byt = opid_str.getBytes();
+			os.write(byt);
+			os.flush();
+			os.close();
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 涓婁紶鎻愮幇绾㈠寘Excel
+	 * 
+	 * @param file
+	 * @param out
+	 */
+	@RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
+	public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+		if (file == null) {
+			out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖锛�"));
+			return;
+		}
+
+		try {
+			List<RedPackRecord> list = WXRedPackUtil.readCsv(file.getInputStream());
+			extractService.updateManualExtractRecord(list);
+			out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
+		} catch (ExtractException e) {
+			out.print(JsonUtil.loadFalseResult(e.getMsg()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触"));
+		}
+	}
+
+	
+	public static String getValue(String[] item,int index){
+        if(item.length > index){
+            String value = item[index];
+            return value;
+        }
+        return "";
+    }
+	
+	/**
+	 * 棰勮绾㈠寘鍙戠敓浜�
+	 * 
+	 * @param callback
+	 * @param pageIndex
+	 * @param out
+	 */
+	@RequestMapping(value = "preAutoUser")
+	public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {
+		try {
+			List<UserInfo> list = extractService.preAutoUser();
+			if (list == null || list.isEmpty()) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
+				return;
+			}
+
+			if (pageIndex == null || pageIndex < 1) {
+				pageIndex = 1;
+			}
+
+			Integer pageSize = 100;
+			if (pageSize == null || pageSize < 1) {
+				pageSize = Constant.PAGE_SIZE;
+			}
+
+			int count = list.size();
+			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
+			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+			List<UserInfo> listResult = null;
+			if (pageIndex < totalPage) {
+				int start = (pageIndex - 1) * pageSize;
+				listResult = list.subList(start, start + pageSize);
+			} else if (pageIndex == totalPage) {
+				listResult = list.subList((pageIndex - 1) * pageSize, list.size());
+			} else {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
+				return;
+			}
+
+			JSONObject data = new JSONObject();
+			data.put("pe", pe);
+			data.put("result_list", listResult);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+}
+	

--
Gitblit v1.8.0