From 85d5dea7408e1ae74e4c7f460bf84caae3754753 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 08 二月 2025 16:53:44 +0800
Subject: [PATCH] fix:用户列表查询
---
src/main/java/com/mzl/flower/web/payment/OrderController.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 16ed168..8cf080b 100644
--- a/src/main/java/com/mzl/flower/web/payment/OrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java
@@ -22,6 +22,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
import java.util.List;
@RestController
@@ -46,12 +48,17 @@
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){
return returnData(R.SUCCESS.getCode(), orderService.selectOrderPlatformList(page, dto));
}
-
@GetMapping("/list/view")
@ApiOperation(value = "订单详情")
@ApiImplicitParams({
@@ -77,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({
@@ -88,7 +102,7 @@
@GetMapping("/list/abnormal/process")
@ApiOperation(value = "异常订单处理（不管有没有退款金额，建议都要处理）")
- public ResponseEntity<ReturnDataDTO> processLevelDown(String id) {
+ public ResponseEntity<ReturnDataDTO> processLevelDown(String id) throws Exception {
orderService.processAbnormalOrder(id);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -188,4 +202,23 @@
return returnData(R.SUCCESS.getCode(),null);
}
+ @GetMapping("/list/export")
+ @ApiOperation(value = "订单导出")
+ public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO queryOrderDTO) {
+ orderService.exportOrderDetail(response, queryOrderDTO);
+ }
+
+ @GetMapping("/time/now")
+ @ApiOperation(value = "订单导出")
+ public ResponseEntity<Long> getNowTime() {
+ return returnData(R.SUCCESS.getCode(),System.currentTimeMillis());
+ }
+
+ @GetMapping("/elk/date")
+ @ApiOperation(value = "订单日期刷新")
+ public ResponseEntity<Long> getElkDate() {
+ orderService.refreshDate();
+ return returnData(R.SUCCESS.getCode(),System.currentTimeMillis());
+ }
+
}
--
Gitblit v1.9.3