From 406ae5451ecde0b4b40a9ecfee07f2171fda80bc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 四月 2026 15:04:07 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

---
 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 352cc7a..d0e9640 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
@@ -129,6 +129,29 @@
         return R.ok(appUserCoupon.getMoney());
     }
 
+    /**
+     * 退回用户的优惠卷
+     * @param dto
+     * @return
+     */
+    @PostMapping("/logan/inner/appUserCoupon/backUserCoupon")
+    public R<BigDecimal> backUserCoupon(@RequestBody UseUserCouponDto dto) {
+        if(dto.getUserCouponId() == null){
+            return R.ok();
+        }
+        XpAppUserCoupon appUserCoupon = xpAppUserCouponService.getById(dto.getUserCouponId());
+        //状态(1=未使用,2=已使用,3=已过期)
+        if(appUserCoupon.getExpirationTime().isAfter(LocalDateTime.now())){
+            appUserCoupon.setStatus(3);
+        }else{
+            appUserCoupon.setStatus(1);
+        }
+        appUserCoupon.setUseTime(null);
+        appUserCoupon.setAppUserId(null);
+        xpAppUserCouponService.updateById(appUserCoupon);
+        return R.ok();
+    }
+
 
 
 

--
Gitblit v1.7.1