From af7d191d6d333a2f4d851da4508ffaa99ac5389e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 五月 2026 11:36:57 +0800
Subject: [PATCH] 修改bug

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java
index 1b9a014..548274c 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java
@@ -207,6 +207,14 @@
         List<XpActivity> list = xpActicityService.list(new QueryWrapper<XpActivity>().in("status", Arrays.asList(1, 2)).eq("is_deleted", 0));
         for (XpActivity xpActivity : list) {
             Integer status = xpActivity.getStatus();
+            //即将开始的活动推送socket给前端用户
+            if(1 == status && LocalDateTime.now().isBefore(xpActivity.getStartTime())){
+
+            }
+
+            //即将结束的活动推送给前端用户
+            
+            //生效的活动修改状态和发放一次优惠券
             if(1 == status && LocalDateTime.now().isAfter(xpActivity.getStartTime()) && LocalDateTime.now().isBefore(xpActivity.getEndTime())){
                 xpActivity.setStatus(2);
                 //发放优惠券-发放一次的优惠券
@@ -216,7 +224,9 @@
                     pushCoupon(xpActivity, xpActicityStrategy);
                 }
 
-            }else if(2 == status & LocalDateTime.now().isAfter(xpActivity.getEndTime())){
+            }
+            //到期的活动修改状态为已结束
+            if(2 == status & LocalDateTime.now().isAfter(xpActivity.getEndTime())){
                 xpActivity.setStatus(3);
             }
             xpActicityService.updateById(xpActivity);

--
Gitblit v1.7.1