From f58050b2e5ba95be6dca3e617dfacb7a717d6096 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 17:37:41 +0800
Subject: [PATCH] feat(mall): 添加会员等级图标并更新销售信息

---
 src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java                       |    3 +++
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java       |    3 ++-
 src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleInfoVo.java                 |    6 ------
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

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 90e9e0f..636d63c 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
@@ -275,6 +275,7 @@
         );
         if(happyMemberLevel != null){
             mallMemberVo.setLevelName(happyMemberLevel.getName());
+            mallMemberVo.setLevelNamePng(happyMemberLevel.getIconPng());
         }
         if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
             MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java
index e031858..277e185 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiSaleServiceImpl.java
@@ -73,7 +73,8 @@
         List<MallMember> mallMembers = this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId());
         apiSaleInfoVo.setTotalCnt(CollUtil.isNotEmpty(mallMembers) ? mallMembers.size() : 0);
 
-        // todo 提现部分暂无
+        MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(id);
+        apiSaleInfoVo.setAvaAmount(mallMemberWallet.getCommission());
 
         return new FebsResponse().success().data(apiSaleInfoVo);
     }
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 8f452e1..41fa56a 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -41,6 +41,9 @@
     @ApiModelProperty(value = "会员等级")
     private String levelName;
 
+    @ApiModelProperty(value = "会员等级图标")
+    private String levelNamePng;
+
     @ApiModelProperty(value = "推荐人昵称")
     private String referrerName;
 
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleInfoVo.java
index 4110703..0114eb1 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/sale/ApiSaleInfoVo.java
@@ -43,10 +43,4 @@
     @ApiModelProperty(value = "可提现")
     private BigDecimal avaAmount;
 
-    @ApiModelProperty(value = "提现中")
-    private BigDecimal avaAmountIng;
-
-    @ApiModelProperty(value = "已提现")
-    private BigDecimal avaAmountDone;
-
 }

--
Gitblit v1.9.1