From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 5c061b3..031bf29 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
@@ -89,22 +89,26 @@
LocalDateTime currentTime = LocalDateTime.now();
- LocalDateTime oneMinuteAgo = currentTime.minusSeconds(30);
+ LocalDateTime oneMinuteAgo = currentTime.minusSeconds(6000);
+
+
List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", uid).ge("insertTime", oneMinuteAgo));
List<Integer> ids = new ArrayList<>();
for (UserCoupon userCoupon : list) {
ids.add(userCoupon.getCouponId());
}
+ List<Coupon> userId = new ArrayList<>();
+ if (ids.size()>0) {
-// if (ids.size()>0){
- List<Coupon> userId = couponService.list(new QueryWrapper<Coupon>().in("id",ids));
-// return userId;
-//
-// }
+ userId = couponService.list(new QueryWrapper<Coupon>().in("id", ids));
+ }
for (Coupon coupon : userId) {
+ if (coupon.getDistributionMethod()!=2){
+ continue;
+ }
CouponListVo couponListVo = new CouponListVo();
couponListVo.setId(coupon.getId().longValue());
couponListVo.setName(coupon.getName());
@@ -148,7 +152,6 @@
ofSearch.getUserPopulation(),
ofSearch.getStatus(),
ofSearch.getState(),
- ofSearch.getPage(),
ofSearch.getCityCode(),
ofSearch.getStoreId(),
ofSearch.getOperatorId(),
--
Gitblit v1.7.1