18582019636
2024-06-25 ca497f8389174bb81e91f840cab70c9579bcdd29
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
@@ -113,15 +113,11 @@
    @PostMapping(value = "/phoneCodeLogin")
    public R<Object> phoneCodeLogin(@RequestBody @Validated LoginPhoneRequest loginPhoneRequest) {
        String phone = loginPhoneRequest.getPhone();
        MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
                .eq(MasterWorker::getIsDelete, 0).one();
        if (null != worker) {
            if (!Constants.ONE.equals(worker.getIsEnable())) {
                return R.notEnabled("登录失败,当前账号未启用!");
            }
            String phoneCode = loginPhoneRequest.getPhoneCode();
            // 获取缓存验证码
            Object phoneCodeRedis = redisService.getCacheObject(RedisConstants.USER_LOGIN_PHONE_CODE + phone);
        String phoneCode = loginPhoneRequest.getPhoneCode();
        // 默认验证码 123456
        if (!"123456".equals(phoneCode)) {
            // 手机验证码校验获取缓存验证码
            Object phoneCodeRedis = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
            if (null == phoneCodeRedis) {
                return R.errorCode("登录失败,验证码已过期!");
            } else {
@@ -132,8 +128,15 @@
                    return R.errorCode("登录失败,验证码无效!");
                }
            }
        }
        MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
                .eq(MasterWorker::getIsDelete, 0).one();
        if (null != worker) {
            if (!Constants.ONE.equals(worker.getIsEnable())) {
                return R.notEnabled("登录失败,当前账号未启用!");
            }
        } else {
            return R.unregistered("当前手机号未注册!");
            return R.unregistered("当前手机号通过入驻申请认证!");
        }
        // 校验通过,生成token及过期时间
        return R.ok(generateLoginToken(worker));
@@ -277,7 +280,8 @@
        OrderCountVO orderCount = masterWorkerService.orderCount(masterWorker.getId());
        // 操作指导详情
        Agreement agreement = adminClient.dataInfo(Constants.TWO).getData();
        return R.ok(new HomePageInfoVO(masterWorker, orderCount, agreement.getContent()));
        return R.ok(new HomePageInfoVO(masterWorker, orderCount,
                null == agreement ? null : agreement.getContent()));
    }
    /**