From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
index 820cc2d..7970cda 100644
--- a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
@@ -28,7 +28,6 @@
<result column="get_user_type" property="getUserType" />
<result column="point" property="point" />
- <result column="order_no" property="orderNo" />
</resultMap>
<update id="checkCouponExpired">
@@ -116,6 +115,15 @@
AND (t.customerName like concat('%', #{param.keyword},'%')
or t.user_id like concat('%', #{param.keyword},'%') )
</if>
+ <if test="param.couponId != null and param.couponId != ''">
+ and t.coupon_id = #{param.couponId}
+ </if>
+ <if test="param.category != null and param.category != ''">
+ and t.category = #{param.category}
+ </if>
+
+
+
order by t.create_time desc
</sql>
--
Gitblit v1.9.3