From eb57efc4e28a2771fec52a261d0a74ca73dffec2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 15:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml |   63 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
index 11af393..5053646 100644
--- a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
@@ -37,31 +37,78 @@
 
     </resultMap>
     <update id="activeBatchCouponTemplate">
-        update t_coupon_template set status='active',update_by=#{dto.updateBy},update_time=now() where id in
-        <foreach collection="dto.idList" item="item" open="(" separator="," close=")">
+        update t_coupon_template set status='active',update_by=#{param.updateBy},update_time=now() where id in
+        <foreach collection="param.idList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
     </update>
     <update id="expireBatchCouponTemplate">
-        update t_coupon_template set status='expired',update_by=#{dto.updateBy},update_time=now() where id in
-        <foreach collection="dto.idList" item="item" open="(" separator="," close=")">
+        update t_coupon_template set status='expired',update_by=#{param.updateBy},update_time=now() where id in
+        <foreach collection="param.idList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
     </update>
 
     <update id="deleteBatchCouponTemplate">
-        update t_coupon_template set deleted=true ,update_by=#{dto.updateBy},update_time=now() where id in
-        <foreach collection="dto.idList" item="item" open="(" separator="," close=")">
+        update t_coupon_template set deleted=true ,update_by=#{param.updateBy},update_time=now() where id in
+        <foreach collection="param.idList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
     </update>
 
     <select id="getCouponTemplatePage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
-        <include refid="QuerySql2"></include>
+        <include refid="QuerySql2"/>
     </select>
     <select id="getList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
-        <include refid="QuerySql2"></include>
+        <include refid="QuerySql2"/>
     </select>
+    <select id="getCouponPointList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+        <include refid="QueryPointSql" />
+    </select>
+    <select id="getPointPage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+        <include refid="QueryPointSql" />
+    </select>
+
+<!--    app活动优惠券-->
+    <select id="getActivityEffectList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+
+    </select>
+    <select id="getCouponCustomerList"
+            resultType="com.mzl.flower.dto.response.coupon.CouponTemplateCustomerVO">
+        select ci.id,ci.name,u.tel
+        from t_coupon_template c
+        left JOIN t_coupon_template_customer cc
+        on c.id=cc.coupon_id
+        left join t_customer_info ci
+        on cc.custom_id=ci.id
+        left join t_user u
+        on ci.user_id=u.id
+        where c.deleted= false
+        and c.id=#{id}
+
+    </select>
+
+    <sql id="QueryPointSql">
+        select *
+        from t_coupon_template
+        where deleted=0
+        <if test="param.category != null and param.category != ''">
+            AND category =  #{param.category}
+        </if>
+        <if test="param.status != null and param.status != ''">
+            AND status =  #{param.status}
+        </if>
+        <if test="param.minPoint != null ">
+            AND point &gt;=  #{param.minPoint}
+        </if>
+        <if test="param.maxPoint != null ">
+            AND point &lt;=  #{param.maxPoint}
+        </if>
+        <if test="param.orderStr != null and param.orderStr != '' ">
+            order by ${param.orderStr}
+        </if>
+
+    </sql>
 
     <sql id="QuerySql2">
         select *

--
Gitblit v1.9.3