From ad7b64d59cfdcd95c5da328d0e0b349df401eaf4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:53:46 +0800
Subject: [PATCH] 提交拉取
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index 5dc7b7e..23f9db5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -3,6 +3,7 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.OrderService;
@@ -45,6 +46,13 @@
public Result deleteOrder(@PathVariable String id) {
return Result.seccess(orderService.deleteOrder(id));
}
+
+ @ApiOperation("璁㈠崟浣滃簾")
+ @PostMapping("/cancelOrder/{id}")
+ public Result cancelOrder(@PathVariable String id) {
+ return Result.seccess(orderService.cancelOrder(id));
+ }
+
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
@PostMapping("/getOrderById/{id}")
public Result getOrderById(@PathVariable String id) {
@@ -72,4 +80,14 @@
public Result updateOrderMoney(@RequestBody Map<String,Object> map) {
return Result.seccess(orderService.updateOrderMoney(map));
}
+
+ @ApiOperation("鏌ヨ璁㈠崟鎶ヨ〃")
+ @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderReport(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody OrderDetail orderDetail) {
+ return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
+
+ }
}
--
Gitblit v1.8.0