From cdabe8b7b132b8d947020fa6e528c8d3dbfa9b41 Mon Sep 17 00:00:00 2001 From: gongzuming <gongzuming> Date: 星期一, 02 九月 2024 16:11:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2 --- src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml index 3aad231..2444d74 100644 --- a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml +++ b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml @@ -43,10 +43,24 @@ </select> <select id="getPage" resultType="com.mzl.flower.dto.response.coupon.CouponRecordVO"> - <include refid="QuerySql"></include> + <include refid="QuerySql"/> </select> <select id="getList" resultType="com.mzl.flower.dto.response.coupon.CouponRecordVO"> - <include refid="QuerySql"></include> + <include refid="QuerySql"/> + </select> + <select id="getMineCouponRecordList" resultType="com.mzl.flower.dto.response.coupon.CouponRecordVO"> + select * + from t_coupon_record t + where t.deleted=false + <if test="param.userId != null and param.userId != ''"> + AND t.user_id = #{param.userId} + </if> + <if test="param.customerId != null and param.customerId != ''"> + AND t.customer_id = #{param.customerId} + </if> + <if test="param.status != null and param.status != ''"> + AND t.status = #{param.status} + </if> </select> <sql id="QuerySql"> -- Gitblit v1.9.3