Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

Helius

2022-09-23 7c6f033b8754b07bf5c75ae8745a982d76f9abb4

 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>