From 7436fc4a44b9f2677b3e3380f2cd2e5d841a6832 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 29 Apr 2025 15:10:01 +0800
Subject: [PATCH] feat(mall): 添加票据状态字段并更新相关服务
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 94ea777..5dff51a 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -4,13 +4,16 @@
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore,IFNULL(c.commission,0) commission
- ,d.description levelName
+ ,vipConfig.name levelName
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
LEFT JOIN mall_member_wallet c on c.member_id = m.id
- LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
+ left join mall_vip_config vipConfig on m.level = vipConfig.code
<where>
<if test="record != null" >
+ <if test="record.birthdayQuery!=null">
+ and date_format(m.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
+ </if>
<if test="record.name!=null and record.name!=''">
and m.name like concat('%', #{record.name},'%')
</if>
@@ -31,9 +34,12 @@
<if test="record.level!=null and record.level!=''">
and m.level=#{record.level}
</if>
+ <if test="record.isSale!=null and record.isSale!=''">
+ and m.is_sale=#{record.isSale}
+ </if>
</if>
</where>
- order by m.CREATED_TIME desc
+ GROUP BY m.id order by m.CREATED_TIME desc
</select>
<select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -79,20 +85,18 @@
a.invite_id,
2 isCurrent,
a.created_time,
- p.prize_score,
- u.description levelName,
+ a.avatar,
+ (select count(1) from mall_order_info orderInfo
+ where orderInfo.status in (2, 3, 4) and orderInfo.member_id=a.id) selfOrderCnt,
(select sum(e.amount)
from mall_order_info e
inner join mall_member b on e.member_id=b.ID
- inner join mall_order_item c on e.id = c.order_id -- and c.is_normal=2
where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
(select count(1) from mall_member e
inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
- where find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
+ where find_in_set(a.invite_id, e.referrer_ids) or a.invite_id=e.invite_id) orderCnt,
(select count(1) from mall_member x where find_in_set(a.invite_id, x.referrer_ids)) cnt
from mall_member a
- inner join mall_member_wallet p on a.id=p.member_id
- left join data_dictionary_custom u on a.level=u.code and u.type='AGENT_LEVEL'
where a.referrer_id=#{inviteId}
</select>
@@ -407,4 +411,43 @@
where a.open_id = #{openId} limit 1
</select>
+ <select id="getsalemanRuleList" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ SELECT m.*,
+ b.name couponName
+ FROM mall_member m
+ LEFT Join saleman_coupon a on m.id = a.member_id
+ LEFT Join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
+ <where>
+ <if test="record != null" >
+ <if test="record.name!=null and record.name!=''">
+ and m.name like concat('%', #{record.name},'%')
+ </if>
+ <if test="record.account!=null and record.account!=''">
+ and m.phone like concat('%', #{record.account},'%')
+ </if>
+ <if test="record.isSale!=null and record.isSale!=''">
+ and m.is_sale=#{record.isSale}
+ </if>
+ </if>
+ </where>
+ order by m.CREATED_TIME desc
+ </select>
+
+
+
+ <update id="updateReferrerId">
+ update mall_member
+ set referrer_id = '',
+ referrer_ids = ''
+ where id = #{id}
+ </update>
+
+
+
+ <update id="updateLastLoginTime">
+ update mall_member
+ set last_login_time = #{lastLoginTime}
+ where id = #{id}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1