From f0814b737d790ae78096f38ba86e5421fc0265b5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 22 十月 2019 09:27:25 +0800
Subject: [PATCH] 订单列表优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 0f01968..76ff2b4 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
@@ -50,6 +50,7 @@
import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;
import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;
import com.yeshi.fanli.service.inter.money.extract.ExtractService;
+import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.inter.push.PushRecordService;
@@ -105,6 +106,9 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
/**
*
@@ -440,7 +444,26 @@
}
record.setExtraInfoStr(desc.toString());
}
+
+ if (warnLevel == 0) {
+ // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_ZIGOU);
+ long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
+ record.getExtract().getUserInfo().getId(),
+ Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
+ long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
+ record.getExtract().getUserInfo().getId(),
+ Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+ if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
+ warnLevel = 3;
+ record.setExtraInfoStr(
+ String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsOrderCount));
+ }
+ }
+
record.setWarnLevel(warnLevel);
+
}
int count = extractAuditRecordService.getMyAuditedTimeSlotCount(key, state, null, days);
@@ -1059,7 +1082,13 @@
e.printStackTrace();
}
}
-
+
+ /**
+ * 涓嬭浇鎻愮幇绾㈠寘Openid
+ * @param callback
+ * @param response
+ * @param out
+ */
@RequestMapping(value = "downAutoExtractTxt")
public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {
try {
@@ -1096,7 +1125,13 @@
e.printStackTrace();
}
}
-
+
+
+ /**
+ * 涓婁紶鎻愮幇绾㈠寘Excel
+ * @param file
+ * @param out
+ */
@RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
@@ -1115,9 +1150,16 @@
out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触"));
}
}
-
+
+
+ /**
+ * 棰勮绾㈠寘鍙戠敓浜�
+ * @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()) {
@@ -1129,6 +1171,7 @@
pageIndex = 1;
}
+ Integer pageSize = 100;
if (pageSize == null || pageSize < 1) {
pageSize = Constant.PAGE_SIZE;
}
--
Gitblit v1.8.0