From 4b2c48677c2b5de7f89ff0d018a55b7916467b27 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 22 四月 2025 17:29:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 4d10072..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>
@@ -634,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();
+ }
+
}
--
Gitblit v1.7.1