From 2862d5229b2564b45face7c6ec3d3e3acccc1749 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 四月 2026 18:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
index d0e9640..c964bcf 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java
@@ -140,7 +140,7 @@
             return R.ok();
         }
         XpAppUserCoupon appUserCoupon = xpAppUserCouponService.getById(dto.getUserCouponId());
-        //状态(1=未使用,2=已使用,3=已过期)
+        //状态(1=未使用,2=已使用,3=已过期  0=待领取 4=占用中)
         if(appUserCoupon.getExpirationTime().isAfter(LocalDateTime.now())){
             appUserCoupon.setStatus(3);
         }else{

--
Gitblit v1.7.1