From 123fb7d4647a203d2b33ef51de56890f38491f9c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 01 Jul 2024 16:54:17 +0800
Subject: [PATCH] 后台

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 2e94d45..4ed53bf 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
@@ -179,8 +179,8 @@
         if (mallMember == null) {
             throw new FebsException("账号或密码错误");
         }
-        if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
-            throw new FebsException("账号限制登录");
+        if (ProductEnum.MEMBER_FROZEN.getValue() == mallMember.getIsFrozen()) {
+            throw new FebsException("账号已冻结");
         }
 
         String redisKey = AppContants.APP_LOGIN_PREFIX + mallMember.getId();
@@ -242,6 +242,12 @@
         MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
         MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMember.getId());
         mallMemberVo.setBalance(mallMemberWallet.getBalance());
+
+        DataDictionaryCustom chargeAddressDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.CHARGE_ADDRESS.getType(),
+                DataDictionaryEnum.CHARGE_ADDRESS.getCode()
+        );
+        mallMemberVo.setSysAddress(chargeAddressDic.getValue());
         return new FebsResponse().success().data(mallMemberVo);
     }
 

--
Gitblit v1.9.1