From a64515dbd13b9e0d2f0b03eae4e4dea52bdb4d88 Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Fri, 28 Jun 2024 12:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/yunxi/controller/DeviceController.java | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
index f601c46..0e75371 100644
--- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
+++ b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
@@ -306,45 +306,41 @@ public class DeviceController {
         if (device == null) {
             throw new BizIllegalException("登录失败：未查询到对应设备信息！");
         }
+        int role = 0;
+        LoginRespVO respVO = new LoginRespVO();
         Recycler recycler = recyclerService.getRecyclerByPhoneNumber(loginReqVO.getPhone());
+        Client client = clientService.getLastestClientByPhone(loginReqVO.getPhone());
+        if (client == null) {
+            throw new BizIllegalException("登录失败：您还未注册，请先扫码注册！");
+        } else {
+            role = 1;
+        }
         if (null != recycler) {
             RecycleStaffDevice staffDevice = staffDeviceService.getByDeviceCode(loginReqVO.getDeviceCode(), loginReqVO.getPhone());
-            if (null == staffDevice) {
-                throw new BizIllegalException("登录失败：你不是当前设备的管理人员！");
+            if (null != staffDevice) {
+                if (role == 1) role = 3;
             }
         }
-        //如果不是回收员 则走 投递员登录
-        else {
-            Client client = clientService.getLastestClientByPhone(loginReqVO.getPhone());
-            if (client == null) {
-                throw new BizIllegalException("登录失败：您还未注册，请先扫码注册！");
-            }
-            UserDTO userInfo = commonService.loginDeviceByClient(client);
-            LoginRespVO respVO = new LoginRespVO();
+        UserDTO userInfo = null;
+        if (role == 1) {
+            userInfo = commonService.loginDeviceByClient(client);
             respVO.setUserId(client.getId());
             respVO.setOpenId(client.getWxOpenid());
             respVO.setUserName(client.getNickName());
             respVO.setStatus(client.getEnabledMark());
-            respVO.setToken(userInfo.getToken());
-            respVO.setBalance(client.getBanlance());
             respVO.setPhone(client.getMobilePhone());
-            respVO.setTimeExpire(userInfo.getTimeExpire());
-            respVO.setRole(1);
-
-            return CommonResult.success(respVO, "success");
-        }
-        //登录成功
-        UserDTO userDTO = commonService.loginDeviceByRecycler(recycler);
-        LoginRespVO respVO = new LoginRespVO();
-        respVO.setUserId(recycler.getId());
-        respVO.setOpenId(recycler.getOpenid());
-        respVO.setUserName(recycler.getStaffsName());
-        respVO.setStatus(recycler.getStatus());
-        respVO.setToken(userDTO.getToken());
-        respVO.setPhone(recycler.getMobilePhone());
-        respVO.setBalance(BigDecimal.ZERO);
-        respVO.setTimeExpire(userDTO.getTimeExpire());
-        respVO.setRole(2);
+        } else if (role == 3) {
+            userInfo = commonService.loginDeviceByRecycler(recycler);
+            respVO.setUserId(recycler.getId());
+            respVO.setOpenId(recycler.getOpenid());
+            respVO.setUserName(recycler.getStaffsName());
+            respVO.setStatus(recycler.getStatus());
+            respVO.setPhone(recycler.getMobilePhone());
+        }
+        respVO.setBalance(client.getBanlance());
+        respVO.setToken(userInfo.getToken());
+        respVO.setTimeExpire(userInfo.getTimeExpire());
+        respVO.setRole(role);
         return CommonResult.success(respVO, "success");
     }