From 4eef62727fe9ec08a26abe66f620ccdac26c1713 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 二月 2026 15:36:02 +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, 9 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 c0f1768..eb40f33 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
@@ -52,10 +52,16 @@
public R<UserCouponVo> getUserCoupon(@RequestBody GetUserCouponDto dto) {
UserCouponVo userCouponVo = new UserCouponVo();
// 获取用户所有优惠券
- List<XpAppUserCoupon> couponList = xpAppUserCouponService.list(new LambdaQueryWrapper<XpAppUserCoupon>().eq(XpAppUserCoupon::getStatus, 1).eq(XpAppUserCoupon::getAppUserId, dto.getUserId()));
+ List<XpAppUserCoupon> couponList = xpAppUserCouponService.list(new LambdaQueryWrapper<XpAppUserCoupon>().eq(XpAppUserCoupon::getStatus, 1).eq(XpAppUserCoupon::getAppUserId, dto.getUserId()).apply("FIND_IN_SET({0}, open_city_id)", dto.getOpenCityId()) );
if(couponList.isEmpty()){
return R.ok(userCouponVo);
}
+ // 计算使用时间规则
+ couponList = xpAppUserCouponService.timeRule(couponList);
+ if(couponList.isEmpty()){
+ return R.ok(userCouponVo);
+ }
+
// 优先用满足条件且抵扣金额最大的
List<XpAppUserCoupon> discountUserCoupons = couponList.stream().filter(e -> e.getCouponType() == 1).sorted(Comparator.comparing(XpAppUserCoupon::getMoney).reversed()).collect(Collectors.toList());
if(!discountUserCoupons.isEmpty()){
@@ -73,6 +79,8 @@
}
+
+
/**
* 获取优惠券列表
*/
--
Gitblit v1.7.1