From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index a78304b..067fd07 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -57,6 +57,7 @@
left join happy_member_level c on c.code = a.director
left join mall_member_wallet d on d.member_id = a.id
<where>
+ and a.phone is not null
<if test="record != null" >
<if test="record.birthdayQuery!=null">
and date_format(a.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
@@ -190,7 +191,7 @@
<select id="getAgentListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentVo">
- SELECT m.*,a.description levelName,
+ SELECT m.*,a.name levelName,
ifnull((
SELECT
sum(b.amount)
@@ -204,8 +205,9 @@
or find_in_set(m.invite_id, e.referrer_ids)
),0) amount
FROM mall_member m
- left join data_dictionary_custom a on a.code = m.level
+ left join happy_sale_level a on a.code = m.store_master
<where>
+ and m.store_master != 0
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
and m.name like concat('%', #{record.name},'%')
@@ -252,8 +254,8 @@
</select>
<select id="getAgentChildInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentMemberVo">
- select m.*,a.description levelName from mall_member m
- left join data_dictionary_custom a on a.code = m.level
+ select m.*,a.name levelName from mall_member m
+ left join happy_sale_level a on a.code = m.store_master
where find_in_set(#{record.inviteId}, m.referrer_ids)
GROUP BY m.id
ORDER BY
@@ -530,7 +532,7 @@
and b.status = 4
),
0
- ) amount
+ ) totalAmount
FROM
mall_member a
<where>
--
Gitblit v1.9.1