From 863b2ab1804ff02fc4459306dd0d10039b5999e0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 17:46:31 +0800
Subject: [PATCH] 11.3
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index c998d48..43c1b28 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -64,10 +65,15 @@
if (students.size() > 0) {
userPopulation.add(3);//已有学员用户
}
- List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", distributionMethod)
- .in("userPopulation", userPopulation)
- .eq("auditStatus", 2).eq("status", 2).eq("state", 1)
- .last(" and now() between startTime and endTime order by insertTime desc"));
+// List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", distributionMethod)
+// .in("userPopulation", userPopulation)
+// .eq("auditStatus", 2).eq("status", 2).eq("state", 1)
+// .last(" and now() between startTime and endTime order by insertTime desc"));
+
+
+ List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2).eq("userPopulation",2)
+ .le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
+ .eq("state", 1));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (Coupon coupon : list) {
CouponListVo couponListVo = new CouponListVo();
--
Gitblit v1.7.1