From ac70afa4e394626dc03d82def3df1db886bb7c2e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 14:43:59 +0800
Subject: [PATCH] 1.活动优惠券-管理端-类型是首页领取的活动优惠券，发布的时候将已经发布的设置为下架，只能留有一个已发布的优惠券 3.活动优惠券-小程序-新增首页弹窗优惠券-如果领取数量没有超过当前优惠券还可以再次领取，超过领取优惠券的话则不返回数据
---
src/main/resources/mapper/point/CustomerPointMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/point/CustomerPointMapper.xml b/src/main/resources/mapper/point/CustomerPointMapper.xml
index 91c18e8..9514779 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>
--
Gitblit v1.9.3