From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
index 5053646..66f2f6f 100644
--- a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
@@ -33,9 +33,10 @@
<result column="usage_time_num" property="usageTimeNum" />
<result column="status" property="status" />
<result column="point" property="point" />
- <result column="vip_grade" property="vipGrade" />
-
+ <result column="member_id" property="memberId" />
</resultMap>
+
+
<update id="activeBatchCouponTemplate">
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=")">
@@ -72,6 +73,22 @@
<!-- app活动优惠券-->
<select id="getActivityEffectList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+ SELECT *
+ FROM t_coupon_template t
+ WHERE t.deleted = FALSE
+ AND t.get_start_date <= NOW()
+ AND NOW() <= t.get_end_date
+ <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.getType != null and param.getType != ''">
+ AND t.get_type = #{param.getType}
+ </if>
+ ORDER BY t.create_time DESC
+
</select>
<select id="getCouponCustomerList"
resultType="com.mzl.flower.dto.response.coupon.CouponTemplateCustomerVO">
@@ -86,6 +103,12 @@
where c.deleted= false
and c.id=#{id}
+ </select>
+ <select id="getVipList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+ <include refid="QuerySqlVip" />
+ </select>
+ <select id="getCouponTemplateVipPage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+ <include refid="QuerySqlVip" />
</select>
<sql id="QueryPointSql">
@@ -148,4 +171,45 @@
order by t.create_time desc
</sql>
+ <sql id="QuerySqlVip">
+ select *
+ from (
+ select t.*,
+ create_by_user.nick_name as createByName,
+ IFNULL(get_num.cnt, 0) as getNum,
+ IFNULL(t.coupon_amount, 0) - IFNULL(get_num.cnt, 0) as unGetNum,
+ m.`name` as member_name
+ from t_coupon_template t
+ left join t_user create_by_user
+ on t.create_by =create_by_user.id
+ left join (select coupon_id,count(1) as cnt from t_coupon_record where deleted=0 group by coupon_id) get_num
+ on t.id=get_num.coupon_id
+ left join t_member m
+ on t.member_id=m.id
+ ) t
+ where t.deleted=0
+ <if test="param.name != null and param.name != ''">
+ AND t.coupon_name like concat('%', #{param.name},'%')
+ </if>
+ <if test="param.couponDiscountType != null and param.couponDiscountType != ''">
+ AND t.coupon_discount_type = #{param.couponDiscountType}
+ </if>
+ <if test="param.getType != null and param.getType != ''">
+ AND t.get_type = #{param.getType}
+ </if>
+ <if test="param.getUserType != null and param.getUserType != ''">
+ AND t.get_user_type = #{param.getUserType}
+ </if>
+ <if test="param.id != null and param.id != ''">
+ AND t.id = #{param.id}
+ </if>
+ <if test="param.category != null and param.category != ''">
+ AND t.category = #{param.category}
+ </if>
+ <if test="param.status != null and param.status != ''">
+ AND t.status = #{param.status}
+ </if>
+ order by t.create_time desc
+ </sql>
+
</mapper>
--
Gitblit v1.9.3