From 2b7ec842c2b0fff4b872084e828edd5c3f5dbaf5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 九月 2024 22:51:21 +0800
Subject: [PATCH] 1.优惠券-活动优惠券-定时任务-领取时间小于当前时间，自动下架 2.优惠券-优惠券使用记录-定时任务-使用时间小于当前时间，自动过期 3.优惠券-积分优惠券-增加已领取数和未领取数
---
src/main/resources/mapper/point/CustomerPointMapper.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/point/CustomerPointMapper.xml b/src/main/resources/mapper/point/CustomerPointMapper.xml
index 91c18e8..a4647e2 100644
--- a/src/main/resources/mapper/point/CustomerPointMapper.xml
+++ b/src/main/resources/mapper/point/CustomerPointMapper.xml
@@ -3,15 +3,21 @@
<mapper namespace="com.mzl.flower.mapper.point.CustomerPointMapper">
<select id="queryPage" resultType="com.mzl.flower.dto.response.point.CustomerPointDTO">
SELECT
- p.*,
c.`name` as customerName,
+ c.user_id as userId,
+ p.id as id,
+ c.id as customerId,
+ IFNULL(p.total_point, 0) as totalPoint,
+ IFNULL(p.used_point, 0) as usedPoint,
+ IFNULL(p.expired_point, 0) as expiredPoint,
+ IFNULL(p.deduction_point, 0) as deductionPoint,
t.tel as customerTel
FROM
- t_customer_point p
- LEFT JOIN t_customer_info c ON c.id = p.customer_id
- LEFT JOIN t_user t on p.user_id = t.id
+ t_customer_info c
+ LEFT JOIN t_customer_point p ON c.id = p.customer_id
+ LEFT JOIN t_user t on c.user_id = t.id
WHERE
- p.deleted = 0
+ c.deleted = 0
<if test="dto.customerName!= null and dto.customerName != ''">
AND c.`name` LIKE CONCAT('%',#{dto.customerName},'%')
</if>
@@ -29,17 +35,17 @@
<if test="dto.userId!= null and dto.userId != ''">
and t.user_id = #{dto.userId}
</if>
- <if test="dto.recordDateStart!=null ">
+ <if test="dto.recordDateStart!=null and dto.recordDateStart!='' ">
<![CDATA[
- AND t.record_date >= #{dto.createDateBegin}
+ AND t.record_date >= #{dto.recordDateStart}
]]>
</if>
- <if test="dto.recordDateEnd!=null ">
+ <if test="dto.recordDateEnd!=null and dto.recordDateEnd!='' ">
<![CDATA[
- AND t.record_date <= #{dto.createDateEnd}
+ AND t.record_date <= #{dto.recordDateEnd}
]]>
</if>
- <if test="dto.type!=null and dto.type != null">
+ <if test="dto.type!=null and dto.type != ''">
and t.type = #{dto.type}
</if>
<if test="dto.remarks!=null and dto.remarks != null">
--
Gitblit v1.9.3