From b6eacbb6fc7658cabb51533692a9b9f5cb1e316b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 四月 2026 19:59:03 +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/service/impl/XpAppUserCouponServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java
index 2290687..be93da3 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java
@@ -84,9 +84,16 @@
public XpAppUserCouponVo userCouponList(XpUserCouponListQuery query, String uid) {
Page<XpAppUserCouponListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
Page<XpAppUserCouponListVo> list = baseMapper.userCouponList(page, query, Long.valueOf(uid));
+ List<XpAppUserCouponListVo> records = list.getRecords();
+ for (XpAppUserCouponListVo record : records) {
+ XpCoupon data = xpCouponClient.getCouponById(record.getCouponid()).getData();
+ if(null != data){
+ record.setConditionAmount(data.getConditionalAmount());
+ }
+ }
XpAppUserCouponVo vo = new XpAppUserCouponVo();
vo.setTotal((int) page.getTotal());
- vo.setList(list.getRecords());
+ vo.setList(records);
return vo;
}
--
Gitblit v1.7.1