From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/web/payment/OrderController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/payment/OrderController.java b/src/main/java/com/mzl/flower/web/payment/OrderController.java
index 476248d..8cf080b 100644
--- a/src/main/java/com/mzl/flower/web/payment/OrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java
@@ -48,6 +48,12 @@
return returnData(R.SUCCESS.getCode(), orderService.getOrderStatusCount(dto));
}
+ @GetMapping("/abnormal/status/count")
+ @ApiOperation(value = "获取异常订单状态数量")
+ public ResponseEntity<ReturnDataDTO<List<OrderStatusCountDTO>>> getAbnormalOrderStatusCount(OrderQueryDTO dto){
+ return returnData(R.SUCCESS.getCode(), orderService.getAbnormalOrderStatusCount(dto));
+ }
+
@GetMapping("/list")
@ApiOperation(value = "查询订单列表")
public ResponseEntity<ReturnDataDTO<Page<OrderPlatformListDTO>>> selectOrderList(Page page, OrderQueryDTO dto){
@@ -78,6 +84,13 @@
return returnData(R.SUCCESS.getCode(), null);
}
+
+ @PostMapping("/list/saveDeliveryNo")
+ @ApiOperation(value = "没有合伙人的花店上传快递号保存但是不发货")
+ public ResponseEntity<ReturnDataDTO> saveDeliveryNoInfo(@RequestBody OrderDeliveryNoDTO dto) {
+ orderService.saveDeliveryNoInfo(dto);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
@GetMapping("/list/abnormal/details")
@ApiOperation(value = "异常订单明细")
@ApiImplicitParams({
--
Gitblit v1.9.3