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 | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
index bc8691b..5053646 100644
--- a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
@@ -37,21 +37,21 @@
</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>
@@ -69,6 +69,25 @@
<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
--
Gitblit v1.9.3