From 951f90b82993acc835cdf58a9f1f39aeecd86674 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 16:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/resources/mapper/CouponMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
index 3a9e973..cbe7368 100644
--- a/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/CouponMapper.xml
@@ -50,7 +50,7 @@
             from t_coupon_city
             WHERE provinceCode = #{cityCode}) o)
         </if>
-        <if test="name != null">
+        <if test="name != null and name!=''">
             and `name` like concat('%', #{name}, '%')
         </if>
         <if test="type != null">
@@ -87,6 +87,8 @@
         illustrate
         from t_coupon
         where 1 = 1     and distributionMethod = 4
+        and auditStatus = 2
+        and startTime  &lt; now()
         <if test="cityCode != null">
             and id in(
             SELECT DISTINCT couponId FROM
@@ -134,7 +136,8 @@
         illustrate
         from t_coupon
         where 1 = 1     and distributionMethod = 4  and useScope = 1
-
+        and auditStatus = 2
+        and startTime  &lt; now()
         <if test="name != null">
             and `name` like concat('%', #{name}, '%')
         </if>

--
Gitblit v1.7.1