From c61295c7a6ca17857ff629ddb48c2ef65bb691b1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 14 三月 2026 11:52:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 b9624ef..b93ad8a 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
@@ -29,6 +29,8 @@
import org.springframework.stereotype.Controller;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@@ -101,11 +103,13 @@
return R.ok(userCouponVo);
}
@PostMapping("/inner/appUserCoupon/useUserCoupon")
- public R useUserCoupon(@RequestBody UseUserCouponDto dto) {
- XpAppUserCoupon appUserCoupon = xpAppUserCouponService.getById(dto.getUserId());
+ public R<BigDecimal> useUserCoupon(@RequestBody UseUserCouponDto dto) {
+ XpAppUserCoupon appUserCoupon = xpAppUserCouponService.getById(dto.getUserCouponId());
appUserCoupon.setStatus(2);
+ appUserCoupon.setUseTime(LocalDateTime.now());
+ appUserCoupon.setAppUserId(null);
xpAppUserCouponService.updateById(appUserCoupon);
- return R.ok();
+ return R.ok(appUserCoupon.getMoney());
}
--
Gitblit v1.7.1