From 520dd4bec679e5febb3986f4bcdd0c9bf29a0542 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 21 十月 2019 16:18:49 +0800
Subject: [PATCH] 提现商品验证修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java |   67 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 21 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 4a2566d..83c40d2 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
@@ -445,22 +445,25 @@
 					record.setExtraInfoStr(desc.toString());
 				}
 
-//				if (warnLevel == 0) {
-//					// 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
-//					List<Integer> typeList = new ArrayList<>();
-//					typeList.add(HongBaoV2.TYPE_ZIGOU);
-//					long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
-//							record.getExtract().getUserInfo().getId(),
-//							Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
-//					long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
-//							record.getExtract().getUserInfo().getId(),
-//							Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
-//					if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
-//						warnLevel = 3;
-//						record.setExtraInfoStr(
-//								String.format("鍚屽簵閾�:%s   鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsOrderCount));
-//					}
-//				}
+				// if (warnLevel == 0) {
+				// // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
+				// List<Integer> typeList = new ArrayList<>();
+				// typeList.add(HongBaoV2.TYPE_ZIGOU);
+				// long sameGoodsOrderCount =
+				// commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
+				// record.getExtract().getUserInfo().getId(),
+				// Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
+				// long sameShopOrderCount =
+				// commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
+				// record.getExtract().getUserInfo().getId(),
+				// Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+				// if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
+				// warnLevel = 3;
+				// record.setExtraInfoStr(
+				// String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount,
+				// sameGoodsOrderCount));
+				// }
+				// }
 
 				record.setWarnLevel(warnLevel);
 
@@ -486,6 +489,27 @@
 			e.printStackTrace();
 			out.print(JsonUtil.loadFalseResult(e.getMessage()));
 		}
+	}
+
+	@RequestMapping(value = "getMyAuditedDanger")
+	public void getMyAuditedDanger(String callback, Long uid, PrintWriter out) {
+		if (uid == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇风櫥褰�"));
+			return;
+		}
+		// 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
+		List<Integer> typeList = new ArrayList<>();
+		typeList.add(HongBaoV2.TYPE_ZIGOU);
+		long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList, uid,
+				Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
+		long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,
+				Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+		if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
+			String text = (String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsOrderCount));
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(text));
+			return;
+		}
+		JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("搴楅摵/鍟嗗搧鏃犲紓甯�"));
 	}
 
 	/**
@@ -1082,9 +1106,10 @@
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * 涓嬭浇鎻愮幇绾㈠寘Openid
+	 * 
 	 * @param callback
 	 * @param response
 	 * @param out
@@ -1125,10 +1150,10 @@
 			e.printStackTrace();
 		}
 	}
-	
-	
+
 	/**
 	 * 涓婁紶鎻愮幇绾㈠寘Excel
+	 * 
 	 * @param file
 	 * @param out
 	 */
@@ -1150,10 +1175,10 @@
 			out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触"));
 		}
 	}
-	
-	
+
 	/**
 	 * 棰勮绾㈠寘鍙戠敓浜�
+	 * 
 	 * @param callback
 	 * @param pageIndex
 	 * @param out

--
Gitblit v1.8.0