From b9da8289051937fbbbd47bbda97414ad6c769a90 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 18 七月 2024 14:37:00 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
index 7b425ce..4bd8194 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
@@ -79,6 +79,19 @@
if (!Constants.ONE.equals(worker.getIsEnable())) {
return R.notEnabled("当前手机号已禁用！");
}
+ // 校验师傅是否已提交入驻申请
+ WorkerProcess process = workerProcessService.lambdaQuery()
+ .eq(WorkerProcess::getPhone, phone)
+ .eq(WorkerProcess::getIsDelete, 0)
+ .orderByDesc(WorkerProcess::getCreateTime)
+ .last("limit 1").one();
+ if (null != process) {
+ if (Constants.TWO.equals(process.getState())) {
+ return R.fail("入驻申请暂未审核通过，请耐心等待！");
+ }
+ } else {
+ return R.registered("当前账号未提交入驻申请，无法登录！");
+ }
// MD5加密登录密码(新)
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
// 校验用户输入密码与加密后的密码是否匹配
@@ -143,7 +156,9 @@
// 校验师傅是否已提交入驻申请
WorkerProcess process = workerProcessService.lambdaQuery()
.eq(WorkerProcess::getPhone, phone)
- .eq(WorkerProcess::getIsDelete, 0).one();
+ .eq(WorkerProcess::getIsDelete, 0)
+ .orderByDesc(WorkerProcess::getCreateTime)
+ .last("limit 1").one();
if (null != process) {
if (Constants.ZERO.equals(process.getState())) {
return R.fail("入驻申请暂未审核通过，请耐心等待！");
@@ -193,8 +208,6 @@
if (null != dbProcess) {
if (Constants.ZERO.equals(dbProcess.getState())) {
return R.fail("入驻申请已提交，审核未通过，请耐心等待！");
- } else if (Constants.ONE.equals(dbProcess.getState())) {
- return R.fail("该手机号入驻申请已通过，请通过手机号登录！");
}
}
// 默认状态待审核
@@ -328,9 +341,9 @@
}
/**
- * 师傅端-订单代办列表
+ * 师傅端-订单列表-地图模式
*/
- @ApiOperation(value = "订单代办列表", tags = {"师傅端-首页"})
+ @ApiOperation(value = "订单列表-地图模式", tags = {"师傅端-首页"})
@GetMapping(value = "/orderMapMode")
@ApiImplicitParams({
@ApiImplicitParam(value = "师傅所在经度", name = "longitude", dataType = "String", required = true),
--
Gitblit v1.7.1