From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 1916 ++++++++++++++++++++++++-----------------------------------
 1 files changed, 779 insertions(+), 1,137 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 7d9b4e2..1213d00 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
@@ -7,16 +7,17 @@
 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 java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
+import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -30,10 +31,6 @@
 
 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.admin.count.CountUserInfo;
 import com.yeshi.fanli.entity.bus.user.Extract;
 import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -45,7 +42,6 @@
 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;
@@ -53,1303 +49,949 @@
 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.common.entity.PageEntity;
 import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.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 ExtractService extractService;
 
-	@Resource
-	private ConfigService configService;
+    @Resource
+    private ConfigService configService;
 
-	@Resource
-	private UserInfoCountService userInfoCountService;
+    @Resource
+    private UserInfoCountService userInfoCountService;
 
-	@Resource
-	private ExtractCountService extractCountService;
+    @Resource
+    private ExtractCountService extractCountService;
 
-	@Resource
-	private PushRecordService pushRecordService;
+    @Resource
+    private ExtractAuditRecordService extractAuditRecordService;
 
-	@Resource
-	private PushController xingePushController;
+    @Resource
+    private HongBaoV2CountService hongBaoV2CountService;
 
-	@Resource
-	private ExtractAuditRecordService extractAuditRecordService;
+    @Resource
+    private UserInfoExtraService userInfoExtraService;
 
-	@Resource
-	private HongBaoV2CountService hongBaoV2CountService;
+    @Resource
+    private CommonOrderCountService commonOrderCountService;
 
-	@Resource
-	private AdminUserService adminUserService;
+    @Resource
+    private CommonOrderService commonOrderService;
 
-	@Resource
-	private RedisManager redisManager;
+    @Resource
+    private UserInfoService userInfoService;
 
-	@Resource
-	private TaoBaoOrderService taoBaoOrderService;
+    /**
+     * 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰 鍙痡sonP鏂瑰紡
+     *
+     * @param id
+     * @param code    楠岃瘉鐮�
+     * @param out
+     * @param request
+     */
+    @RequestMapping(value = "passExtractJP")
+    public void passExtractJP(AdminAcceptData acceptData, String callback, Long id, String code, PrintWriter out, HttpServletRequest request) {
 
-	@Resource
-	private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
+        /* 妫�楠屾槸鍚︾櫥闄� */
+        AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+        if (admin == null) {
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��"));
+            return;
+        }
 
-	@Resource
-	private UserInfoExtraService userInfoExtraService;
+        /* 妫�楠屾槸鍚﹂�氳繃楠岃瘉 */
+        String codeType = (String) request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);
+        if (!"1".equals(codeType)) {
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3, "閭楠岃瘉鏈�氳繃"));
+            return;
+        }
 
-	@Resource
-	private CommonOrderCountService commonOrderCountService;
+        /* 鍏佽鎻愮幇 鎿嶄綔 */
+        Integer integer = extractService.passExtract(id, admin);
 
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰 鍙痡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) {
+        // 鏃ュ織璁板綍
+        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 + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
+        }
 
-		/* 妫�楠屾槸鍚︾櫥闄� */
-		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;
-		}
+    /**
+     * 鏂规硶璇存槑: 鎷掔粷鎻愮幇璇锋眰jsonP
+     *
+     * @param id
+     * @param reason
+     * @param out
+     * @param request
+     * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55
+     */
+    @RequestMapping(value = "rejectExtractJP")
+    public void rejectExtractJP(AdminAcceptData acceptData, 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;
+        }
 
-		/* 鍏佽鎻愮幇 鎿嶄綔 */
-		Integer integer = extractService.passExtract(id, admin);
+        /* 妫�楠屾槸鍚﹂�氳繃楠岃瘉 */
+        String codeType = (String) request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);
+        if (!"1".equals(codeType)) {
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3, "閭楠岃瘉鏈�氳繃"));
+            return;
+        }
 
-		// 鏃ュ織璁板綍
-		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 + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
-		}
+        try {
+            // 缂栫爜杞崲
+            reason = URLDecoder.decode(reason, "UTF-8");
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
 
-	}
+        try {
 
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 鎷掔粷鎻愮幇璇锋眰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;
-		}
+            extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触
 
-		/* 妫�楠屾槸鍚﹂�氳繃楠岃瘉 */
-		String codeType = (String) request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);
-		if (!"1".equals(codeType)) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3, "閭楠岃瘉鏈�氳繃"));
-			return;
-		}
+            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
 
-		try {
-			// 缂栫爜杞崲
-			reason = URLDecoder.decode(reason, "UTF-8");
-		} catch (Exception e1) {
-			e1.printStackTrace();
-		}
+            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
+                    + "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
 
-		try {
+        } catch (ObjectStateException e) {
+            LogHelper.userInfo(
+                    "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); //
 
-			extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
 
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
+        } catch (NotExistObjectException e) {
+            LogHelper.userInfo(
+                    "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪!");
 
-			LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
-					+ "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
+        }
 
-		} catch (ObjectStateException 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(AdminAcceptData acceptData, String callback, PrintWriter out) {
 
-		} catch (NotExistObjectException e) {
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪!");
+        Map<String, Object> totalcount = extractCountService.getTodayCount();
 
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
-		}
+        // 浠婃棩鎻愮幇鎴愬姛閲戦
+        BigDecimal todayextractMoney = extractCountService.getTodayTotalSuccessMoney();
 
-	}
+        // 褰撳墠鐢ㄦ埛浣欓鎬昏锛氭墍鏈夌敤鎴锋�讳綑棰�
+        BigDecimal amountMoney = userInfoCountService.countAllMoney(null);
 
-	/**
-	 * 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁�
-	 * 
-	 * @param out
-	 */
-	@RequestMapping(value = "countExtract")
-	public void countExtract(String callback, PrintWriter out) {
+        // 鍙彁鐜伴噾棰濋檺鍒�
+        String minMoney = configService.getValue(ConfigKeyEnum.extractMoneyMin.getKey(), acceptData.getSystem());
+        if (minMoney == null) {
+            minMoney = "0";
+        }
+        // 褰撳墠鍙彁鐜伴噾棰濇�昏锛� 瓒呰繃鏈�浣庢彁鐜伴噾棰�---璁″叆缁熻
+        BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));
 
-		Map<String, Object> totalcount = extractCountService.getTodayCount();
+        // 绱宸叉彁鐜伴噾棰濇�昏锛氬凡鎻愮幇鎴愬姛鐨勬�婚/ 娆℃暟
+        Map<String, Object> resultData = extractCountService.countTotalSuccess();
 
-		// 浠婃棩鎻愮幇鎴愬姛閲戦
-		BigDecimal todayextractMoney = extractCountService.getTodayTotalSuccessMoney();
+        JSONObject data = new JSONObject();
+        data.put("todayCount", totalcount);
+        data.put("todayextractMoney", todayextractMoney);
 
-		// 褰撳墠鐢ㄦ埛浣欓鎬昏锛氭墍鏈夌敤鎴锋�讳綑棰�
-		BigDecimal amountMoney = userInfoCountService.countAllMoney(null);
+        data.put("amountMoney", amountMoney); // 鎵�鏈夌敤鎴锋�讳綑棰�
+        data.put("extractApply", extractApply); // 鍙彁鐜伴噾棰濇�昏
+        data.put("extractNumber", resultData.get("totalamount")); // 鎻愮幇鎴愬姛娆℃暟
+        data.put("extractMoney", resultData.get("totalmoney")); // 鎻愮幇鎴愬姛閲戦
 
-		// 鍙彁鐜伴噾棰濋檺鍒� 
-		String minMoney = configService.get(ConfigKeyEnum.extractMoneyMin.getKey());
-		if (minMoney == null) {
-			minMoney = "0";
-		}
-		// 褰撳墠鍙彁鐜伴噾棰濇�昏锛� 瓒呰繃鏈�浣庢彁鐜伴噾棰�---璁″叆缁熻
-		BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));
+        out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+    }
 
-		// 绱宸叉彁鐜伴噾棰濇�昏锛氬凡鎻愮幇鎴愬姛鐨勬�婚/ 娆℃暟
-		Map<String, Object> resultData = extractCountService.countTotalSuccess();
+    /**
+     * 鏌ヨ鎵�鏈夊鏍歌褰曚俊鎭�
+     *
+     * @param callback
+     * @param pageIndex
+     * @param key
+     * @param startTime
+     * @param endTime
+     * @param out
+     */
+    @RequestMapping(value = "getFinishRecordList")
+    public void getFinishRecordList(AdminAcceptData acceptData, String callback, Integer pageIndex, String key, String startTime, String endTime,
+                                    PrintWriter out) {
 
-		JSONObject data = new JSONObject();
-		data.put("todayCount", totalcount);
-		data.put("todayextractMoney", todayextractMoney);
+        try {
 
-		data.put("amountMoney", amountMoney); // 鎵�鏈夌敤鎴锋�讳綑棰�
-		data.put("extractApply", extractApply); // 鍙彁鐜伴噾棰濇�昏
-		data.put("extractNumber", resultData.get("totalamount")); // 鎻愮幇鎴愬姛娆℃暟
-		data.put("extractMoney", resultData.get("totalmoney")); // 鎻愮幇鎴愬姛閲戦
+            // 璧峰鏃堕棿 涓虹┖璁剧疆榛樿鍊硷細
+            if (StringUtil.isNullOrEmpty(startTime)) {
+                startTime = "1970-01-01";
+            }
 
-		out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-	}
+            // 缁撴潫鏃堕棿 涓虹┖璁剧疆榛樿鍊煎綋鍓嶆棩鏈�
+            if (StringUtil.isNullOrEmpty(endTime)) {
+                Date curDate = new Date();
+                endTime = TimeUtil.getSimpleDate(curDate);
+            }
 
-	/**
-	 * 鏌ヨ鎵�鏈夊鏍歌褰曚俊鎭�
-	 * 
-	 * @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) {
+            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澶�
 
-		try {
+            endTime = sdf.format(c.getTime());
 
-			// 璧峰鏃堕棿 涓虹┖璁剧疆榛樿鍊硷細
-			if (StringUtil.isNullOrEmpty(startTime)) {
-				startTime = "1970-01-01";
-			}
+            if (pageIndex == null)
+                pageIndex = 1;
 
-			// 缁撴潫鏃堕棿 涓虹┖璁剧疆榛樿鍊煎綋鍓嶆棩鏈�
-			if (StringUtil.isNullOrEmpty(endTime)) {
-				Date curDate = new Date();
-				endTime = TimeUtil.getSimpleDate(curDate);
-			}
+            int pageSize = Constant.PAGE_SIZE;
 
-			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澶�
+            List<ExtractAuditRecord> auditList = extractAuditRecordService.getList(pageIndex, pageSize, key, startTime,
+                    endTime);
 
-			endTime = sdf.format(c.getTime());
+            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 (pageIndex == null)
-				pageIndex = 1;
+            if (auditList == null || auditList.size() == 0) {
+                out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
+            } else {
 
-			int pageSize = Constant.PAGE_SIZE;
+                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);
+                }
 
-			List<ExtractAuditRecord> auditList = extractAuditRecordService.getList(pageIndex, pageSize, key, startTime,
-					endTime);
+                JSONObject data = new JSONObject();
+                GsonBuilder gsonBuilder = new GsonBuilder();
+                gsonBuilder.serializeNulls(); // 閲嶇偣
+                Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
 
-			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);
+                data.put("pe", pe);
+                data.put("auditList", gson.toJson(auditList));
 
-			if (auditList == null || auditList.size() == 0) {
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁")));
-			} else {
+                out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+            }
 
-				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);
-				}
+        } catch (Exception e) {
+            e.printStackTrace();
+            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
+        }
+    }
 
-				JSONObject data = new JSONObject();
-				GsonBuilder gsonBuilder = new GsonBuilder();
-				gsonBuilder.serializeNulls(); // 閲嶇偣
-				Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+    /**
+     * 鏌ヨ瀹㈡湇涓汉鎻愮幇瀹℃壒璁板綍淇℃伅
+     *
+     * @param callback
+     * @param pageIndex 椤电爜
+     * @param key       绛涢�夋潯浠�
+     * @param timeSlot  鏌ヨ鏃堕棿娈�
+     * @param state     鏌ョ湅瀹℃牳鐘舵��
+     * @param out
+     * @param request
+     */
+    @RequestMapping(value = "getMyAuditedList")
+    public void getMyAuditedList(AdminAcceptData acceptData, String callback, Integer pageIndex, String key, String timeSlot, Integer state,
+                                 PrintWriter out, HttpServletRequest request) {
 
-				data.put("pe", pe);
-				data.put("auditList", gson.toJson(auditList));
+        try {
 
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-			}
+            // AdminUser admin = (AdminUser)
+            // request.getSession().getAttribute(Constant.SESSION_ADMIN);
+            // if (admin == null) {
+            // JsonUtil.printMode(out, callback,
+            // JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
+            // return;
+            // }
 
-		} catch (Exception e) {
-			e.printStackTrace();
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
-		}
-	}
+            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澶�
+            }
 
-	/**
-	 * 鏌ヨ瀹㈡湇涓汉鎻愮幇瀹℃壒璁板綍淇℃伅
-	 * 
-	 * @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) {
+            if (state != null && state != 0 && state != 1 && state != 2) {
+                state = null;
+            }
 
-		try {
+            // 鏌ヨ褰撳墠浜哄憳鐨勫鏍稿垪琛ㄤ俊鎭�
+            // Long adminId = admin.getId();
+            // auditList =
+            // extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex,
+            // pageSize, key,state, adminId, days);
+            // count = extractAuditRecordService.getMyAuditedTimeSlotCount(key,
+            // state, adminId,days);
 
-			// AdminUser admin = (AdminUser)
-			// request.getSession().getAttribute(Constant.SESSION_ADMIN);
-			// if (admin == null) {
-			// JsonUtil.printMode(out, callback,
-			// JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
-			// return;
-			// }
+            // 鏆備笉鍖哄垎璐﹀彿锛岄粯璁ゆ墍鏈�
+            List<ExtractAuditRecord> auditList = extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex, pageSize,
+                    key, state, null, days);
+            if (auditList == null || auditList.size() == 0) {
+                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澶�
-			}
+            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());
+                }
 
-			if (state != null && state != 0 && state != 1 && state != 2) {
-				state = null;
-			}
+                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;
+                            }
+                        }
+                    }
+                }
 
-			// 鏌ヨ褰撳墠浜哄憳鐨勫鏍稿垪琛ㄤ俊鎭�
-			// Long adminId = admin.getId();
-			// auditList =
-			// extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex,
-			// pageSize, key,state, adminId, days);
-			// count = extractAuditRecordService.getMyAuditedTimeSlotCount(key,
-			// state, adminId,days);
+                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());
+                    }
 
-			// 鏆備笉鍖哄垎璐﹀彿锛岄粯璁ゆ墍鏈�
-			List<ExtractAuditRecord> auditList = extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex, pageSize,
-					key, state, null, days);
-			if (auditList == null || auditList.size() == 0) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
-				return;
-			}
+                    if (record.getExtraInfo().getLess10OrderCount() != null && record.getExtraInfo().getLess10OrderCount() > 10) {
+                        desc.append("鍒峰崟瀚岀枒\n#");
+                    }
 
-			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());
-				}
+                    record.setExtraInfoStr(desc.toString());
+                }
 
-				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));
+                // }
+                // }
 
-				// 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);
+            }
 
-				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);
 
-			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");
 
-			GsonBuilder gsonBuilder = new GsonBuilder();
-			gsonBuilder.serializeNulls();
-			gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
+            Gson gson = gsonBuilder.create();
 
-			Gson gson = gsonBuilder.create();
+            JSONObject data = new JSONObject();
+            data.put("pe", pe);
+            data.put("list", gson.toJson(auditList));
 
-			JSONObject data = new JSONObject();
-			data.put("pe", pe);
-			data.put("list", gson.toJson(auditList));
+            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+        } catch (Exception e) {
+            e.printStackTrace();
+            out.print(JsonUtil.loadFalseResult(e.getMessage()));
+        }
+    }
 
-		} catch (Exception e) {
-			e.printStackTrace();
-			out.print(JsonUtil.loadFalseResult(e.getMessage()));
-		}
-	}
+    @RequestMapping(value = "getMyAuditedDanger")
+    public void getMyAuditedDanger(AdminAcceptData acceptData, String callback, Long uid, PrintWriter out) {
+        if (uid == null) {
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇风櫥褰�"));
+            return;
+        }
+        SystemEnum system = userInfoService.getUserSystem(uid);
+        acceptData.setSystem(system);
 
-	@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) {
+        // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
+        List<Integer> typeList = new ArrayList<>();
+        typeList.add(HongBaoV2.TYPE_ZIGOU);
 
-		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+        List<Long> goodsIds = commonOrderCountService.listSameGoodsIdByUidAndHongBaoType(typeList, uid,
+                Integer.parseInt(configService.getValue(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey(), acceptData.getSystem())));
+        int sameGoodsDangerCount = 0;
+        if (goodsIds.size() > 0) {
+            for (int i = 0; i < goodsIds.size(); i++) {
+                long goodsId = goodsIds.get(i);
+                Date minDate = new Date(System.currentTimeMillis() - 1000 * 60 * 60L * 24 * 365L);
+                List<CommonOrder> commonOrdersList = commonOrderService.listByGoodsIdAndUidAndMinThirdCreateTime(goodsId, uid, minDate);
+                Map<String, Date> cmap = new HashMap<>();
+                if (commonOrdersList != null)
+                    for (CommonOrder co : commonOrdersList) {
+                        if (co.getState() == CommonOrder.STATE_FK || co.getState() == CommonOrder.STATE_JS || co.getState() == CommonOrder.STATE_WQ)
+                            cmap.put(co.getOrderNo(), co.getThirdCreateTime());
+                    }
+                List<Date> dateList = new ArrayList<>();
+                for (Iterator<String> its = cmap.keySet().iterator(); its.hasNext(); ) {
+                    String orderNo = its.next();
+                    dateList.add(cmap.get(orderNo));
+                }
+                Collections.sort(dateList);
+                Date lastDate = null;
 
-		if (admin == null) {
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
-		} else {
-			Long adminId = admin.getId();
+                for (Date date : dateList) {
+                    if (lastDate != null) {
+                        if (Math.abs(date.getTime() - lastDate.getTime()) < 1000 * 60 * 60 * 24L * 15) {
+                            sameGoodsDangerCount++;
+                            break;
+                        }
+                    } else {
+                        lastDate = date;
+                    }
+                }
+            }
+        }
 
-			int taskToday = extractCountService.countTodayApply();
-			// int countTodayComplete = extractService.countTodayComplete();
 
-			// 浠婃棩绱澶勭悊鏁版嵁
-			int countToday = extractAuditRecordService.getMyAuditedCountToday(adminId);
-			// 鏈懆绱澶勭悊鏁版嵁
-			int countWeek = extractAuditRecordService.getMyAuditedCountWeek(adminId);
-			// 鏈湀绱澶勭悊鏁版嵁
-			int countMonth = extractAuditRecordService.getMyAuditedCountMonth(adminId);
+        long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,
+                Integer.parseInt(configService.getValue(ConfigKeyEnum.adminMinSameShopOrderCount.getKey(), acceptData.getSystem())));
+        if (sameGoodsDangerCount>0 || sameShopOrderCount > 0) {
+            String text = (String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsDangerCount));
+            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(text));
+            return;
+        }
+        JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("搴楅摵/鍟嗗搧鏃犲紓甯�"));
+    }
 
-			JSONObject data = new JSONObject();
-			data.put("adminUser", admin);
-			data.put("taskToday", taskToday);
-			data.put("countToday", countToday);
-			data.put("countWeek", countWeek);
-			data.put("countMonth", countMonth);
+    /**
+     * 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁�
+     *
+     * @param out
+     */
+    @RequestMapping(value = "getMyAuditedCount")
+    public void getMyAuditedCount(AdminAcceptData acceptData, String callback, HttpServletRequest request, PrintWriter out) {
 
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-		}
+        AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
 
-	}
+        if (admin == null) {
+            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
+        } else {
+            Long adminId = admin.getId();
 
-	/**
-	 * 瀹㈡湇浠诲姟椤甸潰灞曠ず鏁版嵁锛氫紶鍏ユ彁鐜扮敵璇穒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 {
+            int taskToday = extractCountService.countTodayApply();
+            // int countTodayComplete = extractService.countTodayComplete();
 
-			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;
-			}
+            // 浠婃棩绱澶勭悊鏁版嵁
+            int countToday = extractAuditRecordService.getMyAuditedCountToday(adminId);
+            // 鏈懆绱澶勭悊鏁版嵁
+            int countWeek = extractAuditRecordService.getMyAuditedCountWeek(adminId);
+            // 鏈湀绱澶勭悊鏁版嵁
+            int countMonth = extractAuditRecordService.getMyAuditedCountMonth(adminId);
 
-			if (extractId != null) {
-				/* 浼犲叆鎻愮幇鐢宠id 鏌ヨ鍓嶅鏈嶄换鍔℃暟鎹� */
+            JSONObject data = new JSONObject();
+            data.put("adminUser", admin);
+            data.put("taskToday", taskToday);
+            data.put("countToday", countToday);
+            data.put("countWeek", countWeek);
+            data.put("countMonth", countMonth);
 
-				extract = extractService.selectByPrimaryKey(extractId);
-				if (extract == null) {
-					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠鐢宠宸蹭笉瀛樺湪")));
-					return;
-				}
+            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+        }
 
-				// 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
-				/*
-				 * 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();
-					}
-				}
+    /**
+     * 瀹㈡湇浠诲姟椤甸潰灞曠ず鏁版嵁锛氫紶鍏ユ彁鐜扮敵璇穒d 鍒欐樉绀哄綋鍓嶇敵璇凤紝鑻ユ棤id鍒欐樉绀哄鏈嶄换鍔′笅绗竴涓敵璇锋暟鎹�
+     *
+     * @param callback
+     * @param extractId 鎻愮幇id
+     * @param request
+     * @param out
+     */
+    @RequestMapping(value = "getIaskInfo")
+    public void getIaskInfo(AdminAcceptData acceptData, String callback, Long extractId, HttpServletRequest request, PrintWriter out) {
+        try {
 
-				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());
+            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;
+            }
 
-				long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
-				if (diff <= 0) {
-					surplusTime = "宸茶秴鏃�";
-				} else {
-					surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
-				}
+            if (extractId != null) {
+                /* 浼犲叆鎻愮幇鐢宠id 鏌ヨ鍓嶅鏈嶄换鍔℃暟鎹� */
 
-				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 鏌ヨ褰撳墠瀹㈡湇浠诲姟 涓殑绗竴涓� 鏁版嵁 */
+                extract = extractService.selectByPrimaryKey(extractId);
+                if (extract == null) {
+                    out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠鐢宠宸蹭笉瀛樺湪")));
+                    return;
+                }
 
-				boolean newTask = false;
+                // 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
+                /*
+                 * extract.setAdminId(admin.getId());
+                 * extractService.updateByPrimaryKeySelective(extract);
+                 */
 
-				// 鏌ヨ涔嬪墠鏈鐞嗗畬鐨勪换鍔�
-				extract = extractService.getMyTaskInfo(admin.getId());
+                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();
+                    }
+                }
 
-				if (extract == null) {
-					// 鏂颁换鍔�
-					extract = extractService.getNewTaskInfo();
-					if (extract != null)
-						newTask = true;
-				}
+                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());
 
-				if (extract == null) {
-					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛鎻愮幇鐢宠")));
-				} else {
+                long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
+                if (diff <= 0) {
+                    surplusTime = "宸茶秴鏃�";
+                } else {
+                    surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
+                }
 
-					if (newTask) {
-						// 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
-						/*
-						 * extract.setAdminId(admin.getId());
-						 * 
-						 * extractService.updateByPrimaryKeySelective(extract);
-						 */
-					}
+                String mark = "";
+                UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());
+                if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
+                    mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark();
+                }
 
-					BigDecimal beforeMoney = null;
+                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);
 
-					List<ExtractAuditRecord> records = extractAuditRecordService.getbyExtractId(extract.getId());
-					if (records != null && records.size() > 0) {
-						ExtractAuditRecord extractAuditRecord = records.get(0);
-						if (extractAuditRecord != null) {
-							beforeMoney = extractAuditRecord.getBeforeMoney();
-						}
-					}
+                out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
 
-					Long extractTime = extract.getExtractTime();
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-					Date date = new Date(extractTime);
+            } else {
+                /* 鏈紶鍏ユ彁鐜扮敵璇穒d 鏌ヨ褰撳墠瀹㈡湇浠诲姟 涓殑绗竴涓� 鏁版嵁 */
 
-					Calendar c = Calendar.getInstance();
-					c.setTime(date);
-					c.add(Calendar.DAY_OF_MONTH, 3);// 浠婂ぉ+3澶�
-					Date todayTime = new Date();
+                boolean newTask = false;
 
-					String formattodayTime = sdf.format(todayTime);
-					String formatTime = sdf.format(c.getTime());
+                // 鏌ヨ涔嬪墠鏈鐞嗗畬鐨勪换鍔�
+                extract = extractService.getMyTaskInfo(admin.getId());
 
-					long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
-					if (diff <= 0) {
-						surplusTime = "宸茶秴鏃�";
-					} else {
-						surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
-					}
+                if (extract == null) {
+                    // 鏂颁换鍔�
+                    extract = extractService.getNewTaskInfo();
+                    if (extract != null)
+                        newTask = true;
+                }
 
-					String mark = "";
-					UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());
-					if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
-						mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark();
-					}
+                if (extract == null) {
+                    out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛鎻愮幇鐢宠")));
+                } else {
 
-					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);
+                    if (newTask) {
+                        // 褰撳墠浠诲姟鎸囧畾涓鸿璐︽埛澶勭悊
+                        /*
+                         * extract.setAdminId(admin.getId());
+                         *
+                         * extractService.updateByPrimaryKeySelective(extract);
+                         */
+                    }
 
-					out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
-				}
+                    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();
+                        }
+                    }
 
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+                    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();
 
-	/**
-	 * 鏌ヨ鐢ㄦ埛鍘嗗彶鎻愮幇璁板綍
-	 * 
-	 * @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;
-			}
+                    String formattodayTime = sdf.format(todayTime);
+                    String formatTime = sdf.format(c.getTime());
 
-			if (pageIndex == null)
-				pageIndex = 1;
+                    long diff = sdf.parse(formatTime).getTime() - sdf.parse(formattodayTime).getTime();
+                    if (diff <= 0) {
+                        surplusTime = "宸茶秴鏃�";
+                    } else {
+                        surplusTime = DateUtil.dateDiff(formattodayTime, formatTime);
+                    }
 
-			int pageSize = Constant.PAGE_SIZE;
+                    String mark = "";
+                    UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId());
+                    if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
+                        mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark();
+                    }
 
-			List<ExtractAuditRecord> list = extractAuditRecordService.getByUidList(pageIndex, pageSize, uid);
-			if (list == null || list.size() == 0) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愮幇璁板綍"));
-				return;
-			}
+                    Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
+                    if (countOrder != null && countOrder >= 10) {
+                        if (StringUtil.isNullOrEmpty(mark)) {
+                            mark = "鍒峰崟棰勮锛侊紒";
+                        } else {
+                            mark = mark + "     鍒峰崟棰勮锛侊紒";
+                        }
+                    }
 
-			for (ExtractAuditRecord record : list) {
+                    data.put("mark", mark);
+                    data.put("extract", extract);
+                    data.put("beforeMoney", beforeMoney);
+                    data.put("surplusTime", surplusTime);
 
-				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());
-				}
-			}
+                    out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+                }
 
-			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();
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
 
-			JSONObject data = new JSONObject();
-			data.put("pe", pe);
-			data.put("list", gson.toJson(list));
+    }
 
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+    /**
+     * 鏌ヨ鐢ㄦ埛鍘嗗彶鎻愮幇璁板綍
+     *
+     * @param callback
+     * @param pageIndex 椤电爜
+     *                  鐢ㄦ埛id
+     * @param request
+     * @param out
+     */
+    @RequestMapping(value = "getByUidList")
+    public void getByUidList(AdminAcceptData acceptData, String callback, Integer pageIndex, Long uid, HttpServletRequest request,
+                             PrintWriter out) {
+        try {
+            if (uid == null) {
+                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+                return;
+            }
 
-		} catch (Exception e) {
-			// TODO: handle exception
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
+            if (pageIndex == null)
+                pageIndex = 1;
 
-	/**
-	 * 鏁伴噺缁熻
-	 * 
-	 * @param callback
-	 * @param uid
-	 *            鐢ㄦ埛id
-	 * @param request
-	 * @param out
-	 */
-	@RequestMapping(value = "countByUid")
-	public void countByUid(String callback, Long uid, HttpServletRequest request, PrintWriter out) {
+            int pageSize = Constant.PAGE_SIZE;
 
-		try {
+            List<ExtractAuditRecord> list = extractAuditRecordService.getByUidList(pageIndex, pageSize, uid);
+            if (list == null || list.size() == 0) {
+                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愮幇璁板綍"));
+                return;
+            }
 
-			// 缁熻宸查鍙栭噾棰� 璐︽埛鍘嗗彶鎬绘敹鐩�
-			BigDecimal receiveMoneys = hongBaoV2CountService.countMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);
-			if (receiveMoneys == null) {
-				receiveMoneys = new BigDecimal(0);
-			}
+            for (ExtractAuditRecord record : list) {
 
-			// 鍘嗗彶鎻愮幇鎴愬姛閲戦
-			double successMoneys = extractCountService.countSuccessMoneysByUid(uid);
+                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());
+                }
+            }
 
-			// 鍘嗗彶鎻愮幇鎬绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁�
-			Map<String, Object> map = extractCountService.countRecordsByUid(uid);
+            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();
+            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));
+            JSONObject data = new JSONObject();
+            data.put("pe", pe);
+            data.put("list", gson.toJson(list));
 
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            // TODO: handle exception
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+            e.printStackTrace();
+        }
+    }
 
-	/**
-	 * 鏍¢獙鐢ㄦ埛璧勯噾鏄惁寮傚父
-	 * 
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "checkMoney")
-	public void checkMoney(String callback, String uid, PrintWriter out) {
+    /**
+     * 鏁伴噺缁熻
+     *
+     * @param callback
+     * @param uid      鐢ㄦ埛id
+     * @param request
+     * @param out
+     */
+    @RequestMapping(value = "countByUid")
+    public void countByUid(AdminAcceptData acceptData, String callback, Long uid, HttpServletRequest request, PrintWriter out) {
 
-		if (StringUtil.isNullOrEmpty(uid)) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("UID涓嶈兘涓虹┖"));
-			return;
-		}
+        try {
 
-		try {
-			extractService.checkExtract(Long.parseLong(uid));
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝e父"));
-		} catch (ExtractException e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
-		}
-	}
+            // 缁熻宸查鍙栭噾棰� 璐︽埛鍘嗗彶鎬绘敹鐩�
+            BigDecimal receiveMoneys = hongBaoV2CountService.countMoneyByUidAndState(uid, HongBaoV2.STATE_YILINGQU);
+            if (receiveMoneys == null) {
+                receiveMoneys = new BigDecimal(0);
+            }
 
-	/**
-	 * 缁熻瀹℃牳娆℃暟
-	 * 
-	 * @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) {
-		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;
-			}
+            // 鍘嗗彶鎻愮幇鎴愬姛閲戦
+            double successMoneys = extractCountService.countSuccessMoneysByUid(uid);
 
-			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);
-			
-			String substring = stateArray.substring(1, stateArray.length()-1);
-			List<Integer> channelList = null;
-			if (stateArray != null && stateArray.trim().length() > 4) {
-				channelList = gson.fromJson(stateArray, new TypeToken<ArrayList<Integer>>() {}.getType());
-			}
-			
-			JSONArray line_list = new JSONArray();
-			
-			if (channelList != null && channelList.size() > 0) {
-				for (Integer state : channelList) {
-					List<Object> list = getAuditData(dateList, dateType, beginDate, endDate, state);
-					String name = "";
-					if (state == 1) {
-						name = "閫氳繃";
-					} else if (state == 2) {
-						name = "椹冲洖";
-					}
-					JSONObject innerList = new JSONObject();
-					innerList.put("name", name);
-					innerList.put("data", gson.toJson(list));
-					line_list.add(innerList);
-				}
-			} else {
-				List<Object> list = getAuditData(dateList, dateType, beginDate, endDate, null);
-				JSONObject innerList = new JSONObject();
-				innerList.put("name", "鍏ㄩ儴");
-				innerList.put("data", gson.toJson(list));
-				line_list.add(innerList);
-			}
+            // 鍘嗗彶鎻愮幇鎬绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁�
+            Map<String, Object> map = extractCountService.countRecordsByUid(uid);
 
-			JSONObject data = new JSONObject();
-			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("绯荤粺寮傚父"));
-			e.printStackTrace();
-		}
-	}
-	
-	private List<Object> getAuditData(List<String> dateList, Integer dateType, Date beginDate, Date endDate, 
-			Integer state) throws Exception{
-		List<Object> list = new ArrayList<>();
-		List<CountUserInfo> listHistory = extractAuditRecordService.getAuditCount(beginDate, endDate, state);
-		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;
-	}
+            GsonBuilder gsonBuilder = new GsonBuilder();
+            gsonBuilder.serializeNulls();
+            Gson gson = gsonBuilder.create();
 
-	/**
-	 * 缁熻鎻愮幇鐢宠鎬婚
-	 * 
-	 * @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) {
-		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;
-			}
+            JSONObject data = new JSONObject();
+            data.put("map", gson.toJson(map));
+            data.put("successMoneys", gson.toJson(successMoneys));
+            data.put("receiveMoneys", gson.toJson(receiveMoneys));
 
-			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<String> list = new ArrayList<>();
-			List<CountUserInfo> listHistory = extractAuditRecordService.getApplyMoney(beginDate, endDate);
-			for (String date: dateList) {
-				BigDecimal money = new BigDecimal("0");
-				if (listHistory == null) {
-					list.add(money.toString());
-					continue;
-				}
-				
-				for (CountUserInfo history: listHistory) {
-					if (dateType == 1) {
-						String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							money = MoneyBigDecimalUtil.add(money, history.getMoney());
-							continue;
-						}
-					} else if (dateType == 2){
-						String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
-						if(gernalTime.startsWith("0")) {
-							gernalTime = gernalTime.substring(1, 2);
-						}
-						if (gernalTime.equalsIgnoreCase(date)) {
-							money = MoneyBigDecimalUtil.add(money, history.getMoney());
-							continue;
-						}
-					} else if (dateType == 3) {
-						String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							money = MoneyBigDecimalUtil.add(money, history.getMoney());
-							continue;
-						}
-					}
-				}
-				list.add(money.toString());
-			}
-			
-			JSONObject innerList = new JSONObject();
-			innerList.put("name", "閲戦");
-			innerList.put("data", gson.toJson(list));
+            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 
-			JSONArray line_list = new JSONArray();
-			line_list.add(innerList);
+        } catch (Exception e) {
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+            e.printStackTrace();
+        }
+    }
 
-			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 uid
+     * @param out
+     */
+    @RequestMapping(value = "checkMoney")
+    public void checkMoney(AdminAcceptData acceptData, String callback, String uid, PrintWriter out) {
 
-	/**
-	 * 缁熻鎻愮幇鐢宠鎬绘鏁�
-	 * 
-	 * @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) {
-		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;
-			}
+        if (StringUtil.isNullOrEmpty(uid)) {
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("UID涓嶈兘涓虹┖"));
+            return;
+        }
 
-			
-			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<CountUserInfo> listHistory = extractAuditRecordService.geApplyNumber(beginDate, endDate);
-			for (String date: dateList) {
-				int value = 0;
-				if (listHistory == null) {
-					list.add(value + "");
-					continue;
-				}
-				
-				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 + "");
-			}
-			
-			JSONObject innerList = new JSONObject();
-			innerList.put("name", "鏁伴噺");
-			innerList.put("data", gson.toJson(list));
+        try {
+            extractService.checkExtract(Long.parseLong(uid));
+            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝e父"));
+        } catch (ExtractException e) {
+            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+        }
+    }
 
-			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();
-		}
-	}
+    /**
+     * 涓嬭浇鎻愮幇绾㈠寘Openid
+     *
+     * @param callback
+     * @param response
+     * @param out
+     */
+    @RequestMapping(value = "downAutoExtractTxt")
+    public void downAutoExtractTxt(AdminAcceptData acceptData, 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;
+            }
 
-	/**
-	 * 涓嬭浇鎻愮幇绾㈠寘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") + "\"");
 
-			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");
+            }
 
-			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);
+            }
 
-			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();
+        }
+    }
 
-			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(AdminAcceptData acceptData, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+        if (file == null) {
+            out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖锛�"));
+            return;
+        }
 
-	/**
-	 * 涓婁紶鎻愮幇绾㈠寘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("涓婁紶澶辫触"));
+        }
+    }
 
-		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){
+    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;
-			}
+    /**
+     * 棰勮绾㈠寘鍙戠敓浜�
+     *
+     * @param callback
+     * @param pageIndex
+     * @param out
+     */
+    @RequestMapping(value = "preAutoUser")
+    public void preAutoUser(AdminAcceptData acceptData, String callback, Integer pageIndex, PrintWriter out) {
+        try {
+            List<UserInfo> list = extractService.preAutoUser();
+            if (list == null || list.isEmpty()) {
+                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
+                return;
+            }
 
-			Integer pageSize = 100;
-			if (pageSize == null || pageSize < 1) {
-				pageSize = Constant.PAGE_SIZE;
-			}
+            if (pageIndex == null || pageIndex < 1) {
+                pageIndex = 1;
+            }
 
-			int count = list.size();
-			int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
-			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+            Integer pageSize = 100;
+            if (pageSize == null || pageSize < 1) {
+                pageSize = Constant.PAGE_SIZE;
+            }
 
-			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;
-			}
+            int count = list.size();
+            int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
+            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
 
-			JSONObject data = new JSONObject();
-			data.put("pe", pe);
-			data.put("result_list", listResult);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
+            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