From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
index 1254df6..4b1c2e9 100644
--- a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
@@ -28,16 +28,15 @@
         <result column="get_user_type" property="getUserType" />
 
         <result column="point" property="point" />
-        <result column="order_no" property="orderNo" />
 
     </resultMap>
     <update id="checkCouponExpired">
-        update t_coupon_record set `status`='expired' where `status`='unused' and effective_end &lt; NOW()
+        update t_coupon_record  set `status`='expired' where `status`='unused' and effective_end &lt; NOW()
         <if test="param.userId != null and param.userId != ''">
-            AND t.user_id = #{param.userId}
+            AND user_id = #{param.userId}
         </if>
         <if test="param.customerId != null and param.customerId != ''">
-            AND t.customer_id =  #{param.customerId}
+            AND customer_id =  #{param.customerId}
         </if>
     </update>
 
@@ -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