From 00406b304226f6d56e07e9a23e87246fb047212d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 12 May 2025 17:07:53 +0800
Subject: [PATCH] refactor(mall): 优化积分查询逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   17 ++++++++++++++++-
 1 files changed, 16 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 3a4c4ab..f37ac73 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
@@ -89,6 +89,7 @@
     private final MallStoreItemMapper mallStoreItemMapper;
     private final MallStoreMemberMapper mallStoreMemberMapper;
     private final MallDoctorMapper mallDoctorMapper;
+    private final HappyMemberLevelMapper happyMemberLevelMapper;
 
 
     @Value("${spring.profiles.active}")
@@ -264,7 +265,18 @@
         Long id = LoginUserUtil.getLoginUser().getId();
         MallMember mallMember = this.baseMapper.selectById(id);
 
+
+
         MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+
+        HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
+                new LambdaQueryWrapper<HappyMemberLevel>()
+                        .select(HappyMemberLevel::getName)
+                        .eq(HappyMemberLevel::getCode, mallMember.getDirector())
+        );
+        if(happyMemberLevel != null){
+            mallMemberVo.setLevelName(happyMemberLevel.getName());
+        }
         if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
             MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
             if (referMember != null) {
@@ -302,7 +314,7 @@
 
         mallMemberVo.setVipInfo(mallVipConfig);
         mallMemberVo.setBalance(wallet.getBalance());
-//        mallMemberVo.setScore(wallet.getScore());
+        mallMemberVo.setScore(wallet.getScore());
         mallMemberVo.setPrizeScore(wallet.getPrizeScore());
 //        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
         return new FebsResponse().success().data(mallMemberVo);
@@ -678,6 +690,9 @@
                     wallet.setMemberId(mallMember.getId());
                     mallMemberWalletMapper.insert(wallet);
                 } else {
+                    if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
+                        throw new FebsException("账号已停用");
+                    }
                     mallMember.setSessionKey(sessionKey);
                     this.baseMapper.updateById(mallMember);
                 }

--
Gitblit v1.9.1