From 1fe9a1c594c40324b64f2822b2381e741fa231fc Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 09 一月 2025 09:00:45 +0800
Subject: [PATCH] 1.花材报表-把下架和强制下架状态分开
---
src/main/java/com/mzl/flower/web/payment/OrderController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 5b60475..8cf080b 100644
--- a/src/main/java/com/mzl/flower/web/payment/OrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java
@@ -11,7 +11,7 @@
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.service.payment.DeliveryOrderService;
import com.mzl.flower.service.payment.OrderService;
-import com.mzl.flower.service.payment.UserPaymentSybService;
+import com.mzl.flower.service.payment.UserPaymentV3Service;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
import java.util.List;
@RestController
@@ -36,7 +37,7 @@
private OrderService orderService;
@Autowired
- private UserPaymentSybService paymentSybService;
+ private UserPaymentV3Service paymentV3Service;
@Autowired
private DeliveryOrderService deliveryOrderService;
@@ -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({
@@ -175,9 +189,9 @@
@ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"),
})
@ApiOperation(value = "退款")
- public ResponseEntity<ReturnDataDTO> refundOrder(String id) throws Exception {
+ public ResponseEntity<ReturnDataDTO> refundOrder(String id) {
orderService.refundCheckAdmin(id);
- paymentSybService.refundOrder(id);
+ paymentV3Service.refundOrder(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