From d3e9f57c91ffc08e090bf8d4b8fcbf60f0d3a86f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:45:15 +0800
Subject: [PATCH] feat(mall): 添加会员等级当前进度相关数据

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 b645f61..7761620 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,12 +275,18 @@
         );
         if(happyMemberLevel != null){
             mallMemberVo.setLevelName(happyMemberLevel.getName());
+            mallMemberVo.setLevelNamePng(happyMemberLevel.getIconPng());
         }
         if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
             MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
             if (referMember != null) {
                 mallMemberVo.setReferrerName(referMember.getName());
             }
+        }
+        if(mallMember.getStoreMaster() == 0){
+            mallMemberVo.setIsTeamLeader(2);
+        }else{
+            mallMemberVo.setIsTeamLeader(1);
         }
 
         if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -694,6 +700,13 @@
                     wallet.setBalance(BigDecimal.ZERO);
                     wallet.setMemberId(mallMember.getId());
                     mallMemberWalletMapper.insert(wallet);
+
+                    //分销员的邀请码赠送优惠卷
+                    if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
+                        GetCouponDto getCouponDto = new GetCouponDto();
+                        getCouponDto.setInviteId(apiXcxLoginDto.getInviteId());
+                        scanCoupon(getCouponDto);
+                    }
                 } else {
                     if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
                         throw new FebsException("账号已停用");
@@ -763,7 +776,7 @@
         this.baseMapper.updateById(mallMember);
 
         //完善信息赠送新人礼
-        if (StrUtil.isBlank(mallMember.getLevel())) {
+        if (StrUtil.isNotBlank(mallMember.getPhone())) {
             DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                     CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
                     CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()

--
Gitblit v1.9.1