From 04f5c3bd20524c97dce07cc03bb24e190303083a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十月 2019 14:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 17 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 5f4b31a..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("搴楅摵/鍟嗗搧鏃犲紓甯�"));
}
/**
@@ -1083,6 +1107,13 @@
}
}
+ /**
+ * 涓嬭浇鎻愮幇绾㈠寘Openid
+ *
+ * @param callback
+ * @param response
+ * @param out
+ */
@RequestMapping(value = "downAutoExtractTxt")
public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {
try {
@@ -1120,6 +1151,12 @@
}
}
+ /**
+ * 涓婁紶鎻愮幇绾㈠寘Excel
+ *
+ * @param file
+ * @param out
+ */
@RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
@@ -1139,8 +1176,15 @@
}
}
+ /**
+ * 棰勮绾㈠寘鍙戠敓浜�
+ *
+ * @param callback
+ * @param pageIndex
+ * @param out
+ */
@RequestMapping(value = "preAutoUser")
- public void preAutoUser(String callback, Integer pageIndex, Integer pageSize, PrintWriter out) {
+ public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {
try {
List<UserInfo> list = extractService.preAutoUser();
if (list == null || list.isEmpty()) {
@@ -1152,6 +1196,7 @@
pageIndex = 1;
}
+ Integer pageSize = 100;
if (pageSize == null || pageSize < 1) {
pageSize = Constant.PAGE_SIZE;
}
--
Gitblit v1.8.0