From d7536094a9e0a1160a97c7a44cb9343feff53d2a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 16:41:45 +0800
Subject: [PATCH] bug 修改
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 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 2383059..280bbd8 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
@@ -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>
@@ -615,23 +610,36 @@
/**
* 师傅端-修改性别
*/
- @ApiOperation(value = "修改师傅实时位置", tags = {"师傅端-个人中心[2.0]"})
- @GetMapping(value = "/updateLonLat")
+// @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 = "经度", name = "workerLon", dataType = "String", required = true),
- @ApiImplicitParam(value = "纬度", name = "workerLat", dataType = "String", required = true),
+ @ApiImplicitParam(value = "订单id", name = "orderId", 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("修改失败！");
+ public R<String> workerCall(@RequestParam String orderId) {
+ orderClient.call(orderId);
+ return R.ok();
}
}
--
Gitblit v1.7.1