From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
index 820cc2d..4b1c2e9 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,10 @@
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>
+
order by t.create_time desc
</sql>
--
Gitblit v1.9.3