Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java

@@ -123,6 +123,42 @@
        }
        return R.ok(generateLoginToken(worker));
    }
    /**
     * 师傅端-密码登录
     *
     * @param loginPasswordRequest 手机号及密码信息
     */
    @ApiOperation(value = "2.0新增登录师傅切换", tags = {"2.0新增登录师傅切换"})
    @PostMapping(value = "/loginApp")
    public R<Object> loginApp(@RequestBody  LoginPasswordRequest loginPasswordRequest) {
        String phone = loginPasswordRequest.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("登录失败，当前账号未启用!");
            }
        } else {
            // 校验师傅是否已提交入驻申请
            WorkerProcess process = workerProcessService.lambdaQuery()
                    .eq(WorkerProcess::getPhone, phone)
                    .eq(WorkerProcess::getIsDelete, 0)
                    .orderByDesc(WorkerProcess::getCreateTime)
                    .last("limit 1").one();
            if (null != process) {
                if (Constants.ZERO.equals(process.getState())) {
                    return R.fail("入驻申请暂未审核通过，请耐心等待！");
                } else if (Constants.TWO.equals(process.getState())) {
                    return R.fail("当前手机号未注册！");
                } else {
                    return R.registered("当前账号未提交入驻申请，无法登录！");
                }
            } else {
                return R.registered("当前账号未提交入驻申请，无法登录！");
            }
        }
        return R.ok(generateLoginToken(worker));
    }

    /**
     * 生成登录信息及token加密
@@ -576,4 +612,39 @@
        return update ? R.ok("修改成功！") : R.fail("修改失败！");
    }

    /**
     * 师傅端-修改性别
     */
//    @ApiOperation(value = "修改师傅实时位置", tags = {"师傅端-个人中心[2.0]"})
//    @GetMapping(value = "/updateLonLat")
//    @ApiImplicitParams({
//            @ApiImplicitParam(value = "经度", name = "workerLon", dataType = "String", required = true),
//            @ApiImplicitParam(value = "纬度", name = "workerLat", dataType = "String", required = true),
//    })
//    public R<String> updateLonLat(@RequestParam("workerLon") String workerLon, @RequestParam("workerLat") String workerLat) {
//        LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
//        if (null == loginWorker) {
//            return R.loginExpire("登录已失效！");
//        }
//        boolean update = masterWorkerService.lambdaUpdate()
//                .set(MasterWorker::getWorkerLon, workerLon)
//                .set(MasterWorker::getWorkerLat, workerLat)
//                .eq(MasterWorker::getId, loginWorker.getUserid())
//                .eq(MasterWorker::getIsDelete, 0).update();
//        return update ? R.ok("修改成功！") : R.fail("修改失败！");
//    }

    /**
     * 师傅端-打电话
     */
    @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
    @GetMapping(value = "/workerCall")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
    })
    public R<String> workerCall(@RequestParam String orderId) {
        orderClient.call(orderId);
        return R.ok();
    }

}