From 785c2eb517ed6f39b4fdf6c37ccb8bd9664a1047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Fri, 8 Dec 2023 16:21:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/CardValueRecordMapper.xml      | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
index f43bf0aaf..2c655409d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
@@ -4,7 +4,28 @@
 
     <select id="selectCardRecord"
             resultType="com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO">
-
+        SELECT
+            '储值卡' AS recordName,
+            mt_user_id mtUserId,
+            recharge_balance rechargeBalance,
+            gift_balance obtain,
+            create_time createTime,
+            chain_store_id chainStoreId,
+            store_id storeId
+        FROM
+            card_value_record
+        <where>
+            <if test="cardValueRecord.mtUserId != null">
+                and combined_result.mtUserId = #{cardValueRecord.mtUserId}
+            </if>
+            <if test="cardValueRecord.storeId != null">
+                and combined_result.storeId = #{cardValueRecord.storeId}
+            </if>
+            <if test="cardValueRecord.recordName != null">
+                and combined_result.recordName = #{cardValueRecord.recordName}
+            </if>
+        </where>
+        ORDER BY createTime
     </select>