From 54361a3649852dd53cf71ac86ff0d74c4a346605 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 24 Apr 2023 01:15:20 +0800
Subject: [PATCH] fxi

---
 src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java                         |   13 +++++++++++++
 src/test/java/cc/mrbird/febs/AgentTest.java                                  |    9 +++++++--
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java         |    2 +-
 src/main/resources/mapper/modules/MallMemberMapper.xml                       |    4 ++--
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    5 +----
 5 files changed, 24 insertions(+), 9 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 76d9a66..0714d62 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
@@ -81,7 +81,7 @@
 
         matrixTreeNode = new MatrixTreeNode();
         matrixTreeNode.setTreeNode(memberId);
-        matrixTreeNode.setParentNode(parentNode.getMemberId());
+        matrixTreeNode.setParentNode(parentNode == null ? null : parentNode.getMemberId());
         matrixTreeNodeMapper.insert(matrixTreeNode);
 
         List<DataDictionaryCustom> dicList = dataDictionaryCustomMapper.selectDicByType(AppContants.AGENT_LEVEL);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 844c1f9..b01e39a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -501,10 +501,7 @@
             commissionVo.setAvatar(referMember.getAvatar());
         }
 
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
-        if (dic != null) {
-            commissionVo.setLevelName(dic.getDescription());
-        }
+        commissionVo.setLevelName(MemberLevelTagDicEnums.getDesc(mallMember.getSex(), mallMember.getLevel()));
 
         MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
         commissionVo.setCommission(wallet.getBalance());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
index d92a485..e64eb05 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.mall.vo;
 
+import cc.mrbird.febs.common.enumerates.MemberLevelTagDicEnums;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,4 +51,16 @@
     @ApiModelProperty(value = "用户等级")
     private String levelName;
 
+    private String level;
+
+    private Integer sex;
+
+    public String getLevelName() {
+        if (sex != null) {
+            return MemberLevelTagDicEnums.getDesc(sex, level);
+        }
+
+        return null;
+    }
+
 }
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 2f24008..4530945 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -87,10 +87,11 @@
             a.name,
             a.phone,
             a.invite_id,
+            a.sex,
+            a.level,
             2 isCurrent,
             a.created_time,
             p.prize_score,
-            u.description levelName,
             (select sum(e.amount)
              from mall_order_info e
                       inner join mall_member b on e.member_id=b.ID
@@ -102,7 +103,6 @@
             (select count(1) from mall_member x where x.invite_id=a.invite_id or 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>
 
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 220c1b1..0474302 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -39,8 +39,13 @@
 @SpringBootTest
 public class AgentTest {
 
-//    @Autowired
-//    private AgentProducer agentProducer;
+    @Autowired
+    private AgentProducer agentProducer;
+
+    @Test
+    public void autoLevelUpTest() {
+        agentProducer.sendAutoLevelUpMsg(1L);
+    }
 //
 //    @Autowired
 //    private DataDictionaryCustomMapper dataDictionaryCustomMapper;

--
Gitblit v1.9.1