From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
index b49fc4f..66ff91a 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
@@ -57,7 +57,16 @@
             }
         }
         if(Objects.nonNull(appUser.getStatus())){
-            throwInfo(appUser.getStatus());
+            switch (appUser.getStatus()){
+                case 1:
+                    break;
+                case 2:
+                    throw new ServiceException("账号被冻结,请联系管理员");
+                case 3:
+                    appUser = new TAppUser();
+                    appUser.setPhone(appletUserDecodeData.getPhoneNumber());
+                    break;
+            }
         }
         appUser.setInviteUserId(inviteUserId);
         appUser.setAvatar(appletUserDecodeData.getAvatarUrl());
@@ -89,7 +98,16 @@
             }
         }
         if(Objects.nonNull(appUser.getStatus())){
-            throwInfo(appUser.getStatus());
+            switch (appUser.getStatus()){
+                case 1:
+                    break;
+                case 2:
+                    throw new ServiceException("账号被冻结,请联系管理员");
+                case 3:
+                    appUser = new TAppUser();
+                    appUser.setPhone(phone);
+                    break;
+            }
         }
         appUser.setInviteUserId(inviteUserId);
         appUser.setAliOpenid(response.getOpenId());
@@ -149,7 +167,7 @@
             case 2:
                 throw new ServiceException("账号被冻结,请联系管理员");
             case 3:
-                throw new ServiceException("账号已注销,请重新注册使用");
+//                throw new ServiceException("账号已注销,请重新注册使用");
             default:
                 break;
         }

--
Gitblit v1.7.1