From b57853496cc97ae99902ba34a47110204b74ea9d Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Mon, 26 May 2025 17:04:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E6=83=A0=E5=88=B8=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 111 ++++++++++++---------
.../apiService/impl/VouchersServiceImpl.java | 5 +-
2 files changed, 67 insertions(+), 49 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec26b6b..92a4e1e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,10 +6,7 @@
-
-
-
-
+
@@ -85,7 +82,7 @@
-
+
@@ -206,7 +203,9 @@
-
+
+
+
1741919155045
@@ -369,7 +368,21 @@
1747809213012
-
+
+ 1747815363401
+
+
+
+ 1747815363401
+
+
+ 1748246664910
+
+
+
+ 1748246664910
+
+
@@ -411,7 +424,9 @@
-
+
+
+
@@ -422,10 +437,10 @@
-
+
-
+
@@ -434,66 +449,66 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -502,18 +517,18 @@
-
+
-
+
-
+
-
+
@@ -524,7 +539,7 @@
file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
- 471
+ 520
@@ -537,11 +552,17 @@
162
+
+ file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
+ 344
+
+
+
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java
index e24a1ae..6356a12 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VouchersServiceImpl.java
@@ -67,14 +67,11 @@ public class VouchersServiceImpl implements VouchersService {
//优惠券类型
query.eq(MassageVouchersUser::getType, massageVouchersUser.getType());
}
- if(StringUtils.isNotBlank(massageVouchersUser.getStatus())){
- //优惠券使用状态
- query.eq(MassageVouchersUser::getStatus, massageVouchersUser.getStatus());
- }
//优惠券使用状态：0-未使用 1-已使用 2-已失效
if(StringUtils.isNotEmpty(massageVouchersUser.getStatus())){
if("2".equals(massageVouchersUser.getStatus())){
query.lt(MassageVouchersUser::getValidDate, CommonUtils.getCurrentTime());//已失效
+ query.notIn(MassageVouchersUser::getStatus, "1");
}else {
query.eq(MassageVouchersUser::getStatus, massageVouchersUser.getStatus());
if("0".equals(massageVouchersUser.getStatus())){