From 8a85fc834d98b2c14c5b886a957ccf3197aad293 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期日, 20 九月 2026 17:12:28 +0800
Subject: [PATCH] feat：优惠券使用入口：购买门票、预定场地、购买惠民卡
---
cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index 5f832fb..dde1265 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -18,7 +18,7 @@
<select id="getAmount" resultType="com.dsh.activity.model.PointMerchandiseIncomeVo">
- select COALESCE(t1.paymentTime, t1.insertTime) as insertTime, t1.cash from t_user_points_merchandise t1
+ select COALESCE(t1.paymentTime, t1.insertTime) as insertTime, t1.cash, t1.userCouponId from t_user_points_merchandise t1
left join t_points_merchandise t2 on t1.pointsMerchandiseId = t2.id
where t1.payStatus = 2
and (t1.state is null or t1.state = 1)
--
Gitblit v1.7.1