From c9d5426b2055fdd576c750098bea530d588f0ea9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 19:32:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 5c9cab3..92505e4 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
@@ -92,6 +92,7 @@
})
@GetMapping("/writeOff/{code}")
public R<Void> writeOff(@PathVariable("code") String code){
+ // TODO 待完善
return R.ok();
}
@@ -104,9 +105,26 @@
})
@GetMapping("/cancel/{orderId}")
public R<Void> cancel(@PathVariable("orderId") Long orderId){
+ // TODO 待完善
return R.ok();
}
+ /**
+ * 确认收货
+ */
+ @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单-确认收货"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ })
+ @GetMapping("/confirm/{orderId}")
+ public R<Void> confirm(@PathVariable("orderId") Long orderId){
+ // TODO 待完善
+ return R.ok();
+ }
+
+
+
+
}
--
Gitblit v1.7.1