From 8a1878856e4cdd735d03c1cb7cd1576ed5967d1c Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 09 三月 2020 17:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 3 +--
1 files changed, 1 insertions(+), 2 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 244f9f1..7d9b4e2 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
@@ -446,8 +446,7 @@
desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount());
}
- Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
- if (countOrder != null && countOrder > 10) {
+ if (record.getExtraInfo().getLess10OrderCount() != null && record.getExtraInfo().getLess10OrderCount() > 10) {
desc.append("鍒峰崟瀚岀枒\n#");
}
--
Gitblit v1.8.0