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 | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 0d9d2d6..8cf080b 100644
--- a/src/main/java/com/mzl/flower/web/payment/OrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
import java.util.List;
@RestController
@@ -45,6 +46,12 @@
@ApiOperation(value = "获取订单状态数量")
public ResponseEntity<ReturnDataDTO<List<OrderStatusCountDTO>>> getOrderStatusCount(OrderQueryDTO dto){
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")
@@ -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);
}
@@ -193,4 +207,18 @@
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