From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 19 Dec 2024 17:50:05 +0800 Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑,使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义,确保数据展示正确 - 更新 buyVipList.html 中状态颜色,以更直观地显示不同状态 --- src/main/resources/mapper/modules/MallActWinRecordMapper.xml | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml index 5cbb9fb..2e3ee63 100644 --- a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml +++ b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml @@ -6,4 +6,27 @@ select a.* from mall_act_win_record a where a.record_id = #{id} </select> + + <select id="selectApiMallActWinDetailsListInPage" resultType="cc.mrbird.febs.mall.vo.ApiMallActWinDetailsVo"> + select + 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 = #{record.actId} + </if> + <if test="record.memberId != null and record.memberId != ''"> + and a.member_id = #{record.memberId} + </if> + </if> + </where> + order by a.created_time desc + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.1