Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiS...

xuhy

2025-04-22 4b2c48677c2b5de7f89ff0d018a55b7916467b27

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

@@ -36,12 +36,7 @@
import javax.servlet.http.HttpServletRequest;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -120,6 +115,42 @@
        boolean matches = passwordEncoder.matches(password, worker.getPassword());
        if (!matches) {
            return R.passwordError("登录密码错误！");
        }
        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));
    }
@@ -598,4 +629,17 @@
//        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();
    }

}