From 44311853fa68f04db11d341bd374a4ac9b5ea567 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 07 十月 2023 17:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index 4601dee..fff3a7b 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -3,4 +3,9 @@
 <mapper namespace="com.dsh.activity.mapper.UserPointsMerchandiseMapper">
 
 
+    <select id="getAmount" resultType="com.dsh.activity.model.PointMerchandiseIncomeVo">
+        select t1.*,t2.cash  from t_user_points_merchandise t1
+        left join t_points_merchandise t2 on t1.pointsMerchandiseId = t2.id
+        where t1.payStatus =2
+    </select>
 </mapper>

--
Gitblit v1.7.1