From 25b53e6a1cf900a61ae7fb63d943c72e0f7eeb3f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 11:07:58 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |    9 +++++++++
 src/main/resources/mapper/modules/MallMemberMapper.xml               |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 494ad60..b4373f0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -254,6 +254,10 @@
             );
             memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId());
         }
+
+        if(StrUtil.isEmpty(mallMemberOne.getReferrerId())){
+            return;
+        }
         //下单人的直推上级的直推
         MallMember mallMemberTwo = memberMapper.selectInfoByInviteId(mallMemberOne.getReferrerId());
         if(ObjectUtil.isNotEmpty(mallMemberTwo)){
@@ -279,6 +283,11 @@
         /**
          * 团队管理补贴
          */
+
+
+        if(StrUtil.isEmpty(mallMember.getReferrerIds())){
+            return;
+        }
         //下单人所有的上级
         String referrerIds = mallMember.getReferrerIds();
         List<String> refererIdList = StrUtil.split(referrerIds, ",", -1, true, true);
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 29e5f06..2fe42d8 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -8,8 +8,9 @@
         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 data_dictionary_custom d on d.code = m.level
         <where>
+            m.id != 1
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and m.name like concat('%',  #{record.name},'%')

--
Gitblit v1.9.1