From c22963a2ee796e59094524cadc5a78c450ed98f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:54:29 +0800
Subject: [PATCH] 动态分享无券 + 下架 不能分享

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java |  218 +++++++++++++----------------------------------------
 1 files changed, 55 insertions(+), 163 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 760a5aa..ba558da 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
@@ -16,7 +16,6 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.DateUtil;
 import org.yeshi.utils.IPUtil;
 import org.yeshi.utils.JsonUtil;
@@ -42,7 +41,6 @@
 import com.yeshi.fanli.service.inter.push.PushRecordService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.user.AccountMessageService;
 import com.yeshi.fanli.service.inter.user.ExtractAuditRecordService;
 import com.yeshi.fanli.service.inter.user.ExtractService;
 import com.yeshi.fanli.tag.PageEntity;
@@ -71,9 +69,6 @@
 	private ExtractCountService extractCountService;
 
 	@Resource
-	private AccountMessageService accountMessageService;
-
-	@Resource
 	private PushRecordService pushRecordService;
 
 	@Resource
@@ -88,7 +83,6 @@
 	@Resource
 	private AdminUserService adminUserService;
 
-
 	@Resource
 	private RedisManager redisManager;
 
@@ -97,66 +91,6 @@
 
 	@Resource
 	private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
-	
-
-	private final static String TODAY = "1";
-	private final static String THREE = "2";
-	private final static String AWEEK = "3";
-
-	@RequestMapping(value = "getExtractList", method = RequestMethod.POST)
-	public void getExtractList(int pageIndex, PrintWriter out) {
-		List<Extract> extractList = extractService.getExtractList(pageIndex - 1);
-		int count = extractService.getCount();
-		int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
-		PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
-		JSONObject data = new JSONObject();
-		data.put("pe", pe);
-		data.put("extractList", extractList);
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰
-	 * 
-	 * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:42
-	 * @param id
-	 * @param out
-	 * @param request
-	 */
-	@RequestMapping(value = "passExtract", method = RequestMethod.POST)
-	public void passExtract(String callback, long id, PrintWriter out, HttpServletRequest request) {
-
-		// TODO 闇�瑕侀偖绠卞彂閫佺煭淇￠獙璇�
-
-		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
-		Integer integer = extractService.passExtract(id, admin);
-		Extract extract = extractService.getExtractById(id);
-		long uid = extract.getUserInfo().getId();
-
-		if (integer == null) {
-			out.print(JsonUtil.loadTrueResult("閫氳繃"));
-			LogHelper
-					.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); // 鍚屾剰涔嬪悗鎴愬姛
-		} else if (integer == 1) {
-
-			out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ瀵硅薄")); // 鍚屾剰涔嬪悗澶辫触
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
-			String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
-			String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
-			// xingePushController.pushSystemZnx(uid, title, content, out);
-		} else {
-
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
-			out.print(JsonUtil.loadFalseResult("璇ョ姸鎬佷笉绛変簬涓嶄负鍒濆鐘舵��"));
-			String title = "浣犵殑鎻愮幇鐢宠涓嶆垚鍔�";
-			String content = "璇风‘淇濅綘鐨勬彁鐜拌处鎴风殑闅愮璁剧疆涓� 鍏佽閭銆佹墜鏈哄彿銆佷細鍛樺悕鎵惧埌鎴戙�傚惁鍒欐棤娉曟垚鍔熷畬鎴愯浆璐︺�傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
-			// xingePushController.pushSystemZnx(uid, title, content, out);
-		}
-	}
 
 	/**
 	 * 
@@ -188,74 +122,21 @@
 		/* 鍏佽鎻愮幇 鎿嶄綔 */
 		Integer integer = extractService.passExtract(id, admin);
 
-		Extract extract = extractService.getExtractById(id);
-		long uid = extract.getUserInfo().getId();
-
+		// 鏃ュ織璁板綍
 		if (integer == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("閫氳繃"));
-
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("宸查�氳繃"));
 			LogHelper
-					.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); // 鍚屾剰涔嬪悗鎴愬姛
+					.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!");
 		} else if (integer == 1) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ瀵硅薄"));
-
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ユ彁鐜拌褰曞凡涓嶅瓨鍦�,璇峰埛鏂�"));
 			LogHelper.userInfo(
 					"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
-			String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
-			String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
-			// xingePushController.pushSystemZnx(uid, title, content, out);
 		} else {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ姸鎬佷笉绛変簬涓嶄负鍒濆鐘舵��"));
-
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡琚鐞�,璇峰埛鏂�"));
 			LogHelper.userInfo(
 					"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
-			String title = "浣犵殑鎻愮幇鐢宠涓嶆垚鍔�";
-			String content = "璇风‘淇濅綘鐨勬彁鐜拌处鎴风殑闅愮璁剧疆涓� 鍏佽閭銆佹墜鏈哄彿銆佷細鍛樺悕鎵惧埌鎴戙�傚惁鍒欐棤娉曟垚鍔熷畬鎴愯浆璐︺�傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
-			// xingePushController.pushSystemZnx(uid, title, content, out);
 		}
 
-	}
-
-	/**
-	 * 
-	 * 鏂规硶璇存槑: 鎷掔粷鎻愮幇璇锋眰
-	 * 
-	 * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55
-	 * @param id
-	 * @param reason
-	 * @param out
-	 * @param request
-	 */
-	@RequestMapping(value = "rejectExtract", method = RequestMethod.POST)
-	public void rejectExtract(String callback, long id, String reason, PrintWriter out, HttpServletRequest request) {
-		AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
-		Extract extract = extractService.getExtractById(id);
-		long uid = extract.getUserInfo().getId();
-		long extractTime = extract.getExtractTime();
-
-		try {
-			extractService.rejectExtract(id, reason, extractTime, admin);// 鎻愮幇澶辫触
-
-			// 璋冪敤鎺ㄩ�佺珯鍐呬俊缁欑敤鎴�
-			out.print(JsonUtil.loadTrueResult("鎷掔粷"));
-			LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
-					+ "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
-
-			String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
-			String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
-			// xingePushController.pushSystemZnx(uid, title, content, out);
-		} catch (ObjectStateException e) {
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); //
-
-			out.print(JsonUtil.loadFalseResult(e.getMessage()));
-		} catch (NotExistObjectException e) {
-			LogHelper.userInfo(
-					"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪!");
-
-			out.print(JsonUtil.loadFalseResult(e.getMessage()));
-		}
 	}
 
 	/**
@@ -285,29 +166,22 @@
 			return;
 		}
 
-		/* 鎷掔粷鎻愮幇 鎿嶄綔 */
-
 		try {
+			// 缂栫爜杞崲
 			reason = URLDecoder.decode(reason, "UTF-8");
 		} catch (Exception e1) {
 			e1.printStackTrace();
 		}
 
 		try {
-			Extract extract = extractService.getExtractById(id);
-			long extractTime = extract.getExtractTime();
-			extractService.rejectExtract(id, reason, extractTime, admin);// 鎻愮幇澶辫触
 
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷"));
+			extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触
 
-			// 璋冪敤鎺ㄩ�佺珯鍐呬俊缁欑敤鎴�
-			// out.print(JsonUtil.loadTrueResult("鎷掔粷"));
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
+
 			LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
 					+ "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
 
-			String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
-			String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
-			// xingePushController.pushSystemZnx(uid, title, content, out);
 		} catch (ObjectStateException e) {
 			LogHelper.userInfo(
 					"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); //
@@ -321,24 +195,6 @@
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
 		}
 
-	}
-
-	/**
-	 * 璧勯噾鏍￠獙鏄惁寮傚父
-	 * 
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "checkExtract", method = RequestMethod.POST)
-	public void checkExtract(String uid, PrintWriter out) {
-		JSONObject data = new JSONObject();
-		try {
-			extractService.checkExtract(uid);
-			data.put("code", "1"); // 姝ｅ父
-		} catch (ExtractException e) {
-			data.put("code", "0");// 寮傚父
-		}
-		out.print(data);
 	}
 
 	/**
@@ -438,8 +294,8 @@
 					if (extract != null) {
 						UserInfo userInfo = extract.getUserInfo();
 						Long id = userInfo.getId();
-						countByUid = hongBaoService.getCountByUid(id);
-						countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO); 
+						countByUid = hongBaoV2CountService.countNumberByUid(id);
+						countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO);
 					}
 					extractAuditRecord.setCancelOrderNum((long) countCancel);
 					extractAuditRecord.setOrderNum((long) countByUid);
@@ -492,13 +348,12 @@
 			// }
 
 			int pageSize = Constant.PAGE_SIZE;
-
 			Integer days = null;
-			if (TODAY.equals(timeSlot)) {
+			if ("1".equals(timeSlot)) {
 				days = 0; // 浠婃棩
-			} else if (THREE.equals(timeSlot)) {
+			} else if ("2".equals(timeSlot)) {
 				days = 3; // 鍓�3澶�
-			} else if (AWEEK.equals(timeSlot)) {
+			} else if ("3".equals(timeSlot)) {
 				days = 7; // 鍓�7澶�
 			}
 
@@ -532,16 +387,39 @@
 				Extract extract = record.getExtract();
 				if (extract != null) {
 					Integer extractState = extract.getState();
-					if (extractState != null && extractState == 0) {
+					if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) {
 						UserInfo userInfo = extract.getUserInfo();
 						if (userInfo != null) {
-							double countTodayMoney = extractService.countTodayMoney(userInfo.getId());
-							if (countTodayMoney >= 100) {
+							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("缁存潈璁㈠崟浣ｉ噾:" + 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());
 				}
 				record.setWarnLevel(warnLevel);
 			}
@@ -552,6 +430,8 @@
 
 			GsonBuilder gsonBuilder = new GsonBuilder();
 			gsonBuilder.serializeNulls();
+			gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
+			
 			Gson gson = gsonBuilder.create();
 
 			JSONObject data = new JSONObject();
@@ -776,6 +656,18 @@
 				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);
@@ -855,7 +747,7 @@
 		}
 
 		try {
-			extractService.checkExtract(uid);
+			extractService.checkExtract(Long.parseLong(uid));
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝ｅ父"));
 		} catch (ExtractException e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

--
Gitblit v1.8.0