From f8c69357a1726a9e3154d6372c06e790abc96f88 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 09 Jul 2024 22:43:49 +0800
Subject: [PATCH] 后台

---
 src/test/java/cc/mrbird/febs/AgentTest.java                          |    9 ++++++---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |    9 ++++++++-
 src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java       |    2 ++
 src/main/resources/mapper/modules/MallMemberMapper.xml               |    6 ++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
index fc5f1fc..f4b0d59 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
@@ -128,4 +128,6 @@
     IPage<MallMemberCharge> getMemberChargeListInPage(Page<MallMemberCharge> page,  @Param("record")MoneyChargeListDto moneyChargeListDto);
 
     IPage<MallMemberWithdraw> getMemberWithDrawListInPage(Page<MallMemberWithdraw> page, @Param("record")MoneyChargeListDto moneyChargeListDto);
+
+    List<MallMember> selectMemberWithLevelAndInviteId(@Param("levelType")String levelType,@Param("inviteId")String inviteId);
 }
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 1b24461..385add2 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
@@ -2014,7 +2014,14 @@
                     List<MallMember> mallMembersAll = new ArrayList<>();
                     if(levelCode > 0){
                         String levelType = MemberLevelNewEnum.ZERO_LEVEL.getLevelType(levelCode - 1);
-                        mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(levelType,mallMemberRef.getInviteId());
+                        List<MallMember>  mallMembersDirects = memberMapper.selectByRefererId(mallMemberRef.getInviteId());
+                        for(MallMember memberDirect : mallMembersDirects){
+                            List<MallMember> mallMembers1 = memberMapper.selectMemberWithLevelAndMemberId(levelType, memberDirect.getInviteId());
+                            if(CollUtil.isEmpty(mallMembers1)){
+                                continue;
+                            }
+                            mallMembersAll.add(memberDirect);
+                        }
                     }else{
                         mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(level,mallMemberRef.getInviteId());
                     }
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index c518266..334e474 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -626,4 +626,10 @@
         </where>
         order by a.CREATED_TIME desc
     </select>
+
+    <select id="selectMemberWithLevelAndInviteId" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where level = #{levelType}
+          and invite_id = #{inviteId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 220c1b1..44e7804 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -45,8 +45,8 @@
 //    @Autowired
 //    private DataDictionaryCustomMapper dataDictionaryCustomMapper;
 //
-//    @Autowired
-//    private IAgentService agentService;
+    @Autowired
+    private IAgentService agentService;
 //
 //    @Autowired
 //    private MallGoodsStyleMapper mallGoodsStyleMapper;
@@ -63,7 +63,10 @@
 //    private  MallMemberWalletMapper mallMemberWalletMapper;
 //    @Autowired
 //    private  MallActSetMapper mallActSetMapper;
-//    @Test
+    @Test
+    public void memberLevelUp() {
+        agentService.memberLevelUp();
+    }
 //    public void skusTest() {
 //        ApiMallAwardDetailsVo apiMallAwardDetailsVo = new ApiMallAwardDetailsVo();
 //        Long memberId = 4L;

--
Gitblit v1.9.1