From cadeca36ff86f74371c77a05dc8422abc1e48855 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:28:40 +0800
Subject: [PATCH] feat(table): 添加合计行功能 - 在 mallMemberList.html 中添加了 totalRow 属性,用于显示碳币和碳积分的合计 - 在 moneyFlowList.html 中移除了 description 字段的 totalRow属性 - 在 sellVipList.html 中将 amount 和 amountFee 字段的 totalRow 属性改为 true

---
 src/main/resources/mapper/modules/MallActWinRecordMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml
index 6fc92fd..2e3ee63 100644
--- a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml
@@ -12,20 +12,21 @@
         a.award_name awardName,
         a.award_type awardType,
         a.award_value awardValue,
+        a.created_time createdTime,
         b.award_image awardImage
         from mall_act_win_record a
         left join mall_act_award_set b on a.award_id = b.id
         <where>
             <if test="record != null">
                 <if test="record.actId != null and record.actId != ''">
-                    and a.act_id = #{actId}
+                    and a.act_id = #{record.actId}
                 </if>
                 <if test="record.memberId != null and record.memberId != ''">
-                    and a.member_id = #{memberId}
+                    and a.member_id = #{record.memberId}
                 </if>
             </if>
         </where>
-        order by a.act_start_time desc
+        order by a.created_time desc
     </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1