From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 27 五月 2025 18:23:34 +0800 Subject: [PATCH] bug修改 --- ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SendSmsController.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SendSmsController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SendSmsController.java index 887b88f..ba3601d 100644 --- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SendSmsController.java +++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SendSmsController.java @@ -50,6 +50,7 @@ }) public R<Object> dispatchSms(@RequestParam String orderId) { com.ruoyi.order.api.entity.Order order = orderClient.detail(orderId).getData(); + orderClient.msgCount(orderId); if (null == order) { return R.fail("订单不存在或已删除!"); } @@ -91,7 +92,7 @@ } /** - * 师傅端-找回密码/验证手机号/验证码登录 + * 师傅端-修改手机号时校验新手机号是否已注册 * * @param phone 订单记录id */ @@ -108,6 +109,26 @@ return R.fail("新手机号已注册!"); } return R.ok(sendSmsService.workerLoginSms(phone)); + } + + /** + * 师傅端-忘记密码 + * + * @param phone 订单记录id + */ + @ApiOperation(value = "师傅端-忘记密码", tags = {"发送短信"}) + @GetMapping(value = "/passwordCheckPhone") + @ApiImplicitParams({ + @ApiImplicitParam(value = "手机号", name = "phone", dataType = "String", required = true) + }) + public R<String> passwordCheckPhone(@RequestParam String phone) { + MasterWorker masterWorker = masterWorkerService.lambdaQuery() + .eq(MasterWorker::getPhone, phone) + .eq(MasterWorker::getIsDelete, 0).one(); + if (null == masterWorker) { + return R.fail("手机号未注册!"); + } + return R.ok(); } /** @@ -129,6 +150,9 @@ .eq(WorkerProcess::getPhone, phone) .eq(WorkerProcess::getIsDelete, 0) .orderByDesc(WorkerProcess::getCreateTime).last("limit 1").one(); + if (masterWorker != null){ + return R.fail("该手机号入驻申请已通过,请前往登录!"); + } if (null != workerProcess) { Integer state = workerProcess.getState(); if (Constants.ZERO.equals(state)) { -- Gitblit v1.7.1