From 86f241cb505691b3c172bd2bebf4e19340eb9f91 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Wed, 4 Sep 2024 22:11:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E6=83=A0=E5=88=B8=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/EtCouponMapper.xml          | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml
index 2e04001..79835a0 100644
--- a/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtCouponMapper.xml
@@ -47,22 +47,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         et_coupon c
         left join et_operating_area a on a.area_id = c.area_id
-        <where>
-            <if test="name != null "> and c.name like concat('%', #{name}, '%')</if>
-            <if test="type != null  and type != ''"> and c.type = #{type}</if>
-            <if test="discountPercent != null "> and c.discount_percent = #{discountPercent}</if>
-            <if test="areaId != null "> and c.area_id = #{areaId}</if>
-            <if test="areaName != null "> and a.area_name like concat('%', #{areaName}, '%')</if>
-            <if test="discountAmount != null "> and c.discount_amount = #{discountAmount}</if>
-            <if test="status != null  and status != ''"> and c.status = #{status}</if>
-            <if test="limitNum != null  and limitNum != ''"> and c.limit_num = #{limitNum}</if>
-            <if test="typeList != null">
-                AND c.type IN
-                <foreach item="item" index="index" collection="typeList" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
+        where del_flag != 2
+        <if test="name != null "> and c.name like concat('%', #{name}, '%')</if>
+        <if test="type != null  and type != ''"> and c.type = #{type}</if>
+        <if test="discountPercent != null "> and c.discount_percent = #{discountPercent}</if>
+        <if test="areaId != null "> and c.area_id = #{areaId}</if>
+        <if test="areaName != null "> and a.area_name like concat('%', #{areaName}, '%')</if>
+        <if test="discountAmount != null "> and c.discount_amount = #{discountAmount}</if>
+        <if test="status != null  and status != ''"> and c.status = #{status}</if>
+        <if test="limitNum != null  and limitNum != ''"> and c.limit_num = #{limitNum}</if>
+        <if test="typeList != null">
+            AND c.type IN
+            <foreach item="item" index="index" collection="typeList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectEtCouponByCouponId" parameterType="Long" resultMap="EtCouponResult">
@@ -132,7 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEtCouponByCouponIds" parameterType="String">
-        delete from et_coupon where coupon_id in
+        UPDATE et_coupon
+        SET del_flag = 2
+        WHERE coupon_id IN
         <foreach item="couponId" collection="array" open="(" separator="," close=")">
             #{couponId}
         </foreach>