From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
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