From 5c03e2dd5afd65c483ef5da8346e78abc29dc7e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 四月 2020 14:39:54 +0800
Subject: [PATCH] 新增淘客接口，订单返利比例计算相关service修改
---
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