From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +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 |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 3b78c2c..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,7 +89,7 @@
 
 
             LocalDateTime currentTime = LocalDateTime.now();
-            LocalDateTime oneMinuteAgo = currentTime.minusSeconds(120);
+            LocalDateTime oneMinuteAgo = currentTime.minusSeconds(6000);
 
 
 
@@ -106,6 +106,9 @@
 
 
             for (Coupon coupon : userId) {
+                if (coupon.getDistributionMethod()!=2){
+                    continue;
+                }
                 CouponListVo couponListVo = new CouponListVo();
                 couponListVo.setId(coupon.getId().longValue());
                 couponListVo.setName(coupon.getName());

--
Gitblit v1.7.1