登录修改

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());
-        if (null != recycler) {
-            RecycleStaffDevice staffDevice = staffDeviceService.getByDeviceCode(loginReqVO.getDeviceCode(), loginReqVO.getPhone());
-            if (null == staffDevice) {
-                throw new BizIllegalException("登录失败：你不是当前设备的管理人员！");
-            }
-        }
-        //如果不是回收员 则走 投递员登录
-        else {
         Client client = clientService.getLastestClientByPhone(loginReqVO.getPhone());
         if (client == null) {
             throw new BizIllegalException("登录失败：您还未注册，请先扫码注册！");
+        } else {
+            role = 1;
         }
-            UserDTO userInfo = commonService.loginDeviceByClient(client);
+        if (null != recycler) {
-            LoginRespVO respVO = new LoginRespVO();
+            RecycleStaffDevice staffDevice = staffDeviceService.getByDeviceCode(loginReqVO.getDeviceCode(), loginReqVO.getPhone());
+            if (null != staffDevice) {
+                if (role == 1) role = 3;
+            }
+        }
+        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());
+        } else if (role == 3) {
-            respVO.setRole(1);
+            userInfo = commonService.loginDeviceByRecycler(recycler);
-
-            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.setBalance(client.getBanlance());
-        respVO.setRole(2);
+        respVO.setToken(userInfo.getToken());
+        respVO.setTimeExpire(userInfo.getTimeExpire());
+        respVO.setRole(role);
         return CommonResult.success(respVO, "success");
     }