From 5ca512048bcb9fa1e29fa924a468ba1302c6c243 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 13 三月 2024 10:07:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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 7126c1f..5dc7b7e 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,8 +3,11 @@
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.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.OrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -14,6 +17,7 @@
@RestController
@RequestMapping("/order")
+@Api(value="璁㈠崟controller",tags={"璁㈠崟鎿嶄綔鎺ュ彛"})
public class OrderController {
private final OrderService orderService;
@@ -22,6 +26,7 @@
}
+ @ApiOperation("璁㈠崟淇濆瓨")
@PostMapping("/saveOrder")
public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
if(orderService.saveOrder(orderMap)) {
@@ -30,9 +35,41 @@
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
}
-
+ @ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�")
@PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Order order) {
return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
}
+ @ApiOperation("鍒犻櫎璁㈠崟")
+ @PostMapping("/deleteOrder/{id}")
+ public Result deleteOrder(@PathVariable String id) {
+ return Result.seccess(orderService.deleteOrder(id));
+ }
+ @ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
+ @PostMapping("/getOrderById/{id}")
+ public Result getOrderById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderById(id));
+ }
+ @ApiOperation("鏌ヨ璁㈠崟宸ヨ壓")
+ @PostMapping("/getOrderCraftById/{id}")
+ public Result getOrderCraftById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderCraftById(id));
+ }
+ @ApiOperation("瀹℃牳璁㈠崟")
+ @PostMapping("/reviewOrderById/{id}/{status}")
+ public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) {
+ return Result.seccess(orderService.reviewOrderById(id,status));
+ }
+
+ @ApiOperation("瀹℃牳宸ヨ壓")
+ @PostMapping("/reviewProcessById/{id}/{status}")
+ public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails) {
+ return Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails));
+ }
+
+ @ApiOperation("鏇存柊璁㈠崟閲戦鍗曚环")
+ @PostMapping("/updateOrderMoney")
+ public Result updateOrderMoney(@RequestBody Map<String,Object> map) {
+ return Result.seccess(orderService.updateOrderMoney(map));
+ }
}
--
Gitblit v1.8.0