From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
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 b89823a..004ba1c 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>
@@ -26,17 +32,17 @@
<if test="dto.customerId!= null and dto.customerId != 0">
and t.customer_id = #{dto.customerId}
</if>
- <if test="dto.userId!= null and dto.userId != 0">
+ <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">
--
Gitblit v1.9.3