From 6ccd0f9e28c083e5f62d7d5074a85584a77af6bb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 17:09:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index a62c6df..d9dce7f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -131,9 +131,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{id}/{shopId}")
- public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId){
- orderService.writeOff(id, shopId);
+ @GetMapping("/writeOff/{id}/{shopId}/{technicianId}")
+ public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, @PathVariable("technicianId") Integer technicianId){
+ orderService.writeOff(id, shopId, technicianId);
return R.ok();
}
@@ -250,7 +250,7 @@
@PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
- return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
+ return orderService.confirmDelivery(confirmDelivery);
}
--
Gitblit v1.7.1