From 6a1806207b82c73a4c7ae55916fc638239a1f823 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:17:35 +0800
Subject: [PATCH] fix(mall): 优化会员优惠券使用逻辑
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 34db249..ed476e2 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -45,11 +45,17 @@
<select id="selectHappyMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
SELECT
a.*,
+ d.balance balance,
+ d.score score,
+ d.prize_score prizeScore,
+ d.commission commission,
+ d.total_score totalScore,
b.name storeMasterName,
c.name directorName
FROM mall_member a
left join happy_sale_level b on b.code = a.store_master
left join happy_member_level c on c.code = a.director
+ left join mall_member_wallet d on d.member_id = a.id
<where>
<if test="record != null" >
<if test="record.birthdayQuery!=null">
@@ -97,6 +103,7 @@
IFNULL(c.balance,0) balance,
IFNULL(c.score,0) score,
IFNULL(c.prize_score,0) prizeScore,
+ IFNULL(c.commission,0) commission,
d.description levelName,
b.name
FROM mall_member a
@@ -497,23 +504,33 @@
<select id="selectTeamPage" resultType="cc.mrbird.febs.mall.vo.sale.ApiTeamListInfoVo">
SELECT
- a.name memberName,
- a.CREATED_TIME createdTime,
+ a. NAME memberName,
+ a.is_sale isSale,
+ a.CREATED_TIME createdTime,
+ ifnull(
(
- SELECT
- count(c.id)
- FROM
- mall_achieve_record c
- where a.id = c.member_id
- ) orderCnt,
+ SELECT
+ count(c.id)
+ FROM
+ mall_achieve_record c
+ WHERE
+ a.id = c.member_id
+ ),
+ 0
+ ) orderCnt,
+ ifnull(
(
- SELECT
- sum(b.amount, 0)
- FROM
- mall_achieve_record b
- where a.id = b.member_id
- ) amount
- FROM mall_member a
+ SELECT
+ sum(b.amount)
+ FROM
+ mall_achieve_record b
+ WHERE
+ a.id = b.member_id
+ ),
+ 0
+ ) amount
+ FROM
+ mall_member a
<where>
and find_in_set(#{record.inviteId}, a.referrer_ids)
<if test="record != null" >
--
Gitblit v1.9.1