From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 7 +++----
1 files changed, 3 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 244f9f1..bb0729d 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#");
}
@@ -628,7 +627,7 @@
}
Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
- if (countOrder != null && countOrder > 10) {
+ if (countOrder != null && countOrder >= 10) {
if (StringUtil.isNullOrEmpty(mark)) {
mark = "鍒峰崟棰勮锛侊紒";
} else {
@@ -706,7 +705,7 @@
}
Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
- if (countOrder != null && countOrder > 10) {
+ if (countOrder != null && countOrder >= 10) {
if (StringUtil.isNullOrEmpty(mark)) {
mark = "鍒峰崟棰勮锛侊紒";
} else {
--
Gitblit v1.8.0