From e2af8608c0d243c6ec061791197fd446b4401b8a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 13:37:01 +0800
Subject: [PATCH] 1.统计报表-历史合伙人可查 2.小程序-花店：分类按照售罄放到最下面 3.小程序-合伙人：质检按照仓库排序
---
src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
index 820cc2d..67159fc 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">
@@ -39,6 +38,9 @@
<if test="param.customerId != null and param.customerId != ''">
AND customer_id = #{param.customerId}
</if>
+ </update>
+ <update id="expireCouponRecordAll">
+ update t_coupon_record set `status`='expired' where `status`='unused' and effective_end < NOW()
</update>
<select id="statisCouponTemplateCount" resultType="java.lang.Integer">
@@ -116,6 +118,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