From b4c77c0839258280044cf65a15471fa3c20d465f Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期二, 21 十一月 2023 09:12:38 +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 | 13 +++++++------ 1 files changed, 7 insertions(+), 6 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 81ca00b..d5ea088 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,19 +89,20 @@ 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) { -- Gitblit v1.7.1