From 53b823e2b1444e33f359fba79f8ff1e078253891 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 14 十一月 2024 09:26:10 +0800
Subject: [PATCH] add:-商户列表需要增加下单次数统计(已退款、已取消、待付款的不统计在内）
---
src/main/java/com/mzl/flower/web/payment/OrderController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 915eb23..e87f9b3 100644
--- a/src/main/java/com/mzl/flower/web/payment/OrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java
@@ -5,9 +5,9 @@
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.constant.Constants;
+import com.mzl.flower.dto.request.payment.OrderAddressUpdateDTO;
import com.mzl.flower.dto.request.payment.OrderDeliveryNoDTO;
import com.mzl.flower.dto.request.payment.OrderQueryDTO;
-import com.mzl.flower.dto.request.payment.OrderReduceDTO;
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.service.payment.DeliveryOrderService;
import com.mzl.flower.service.payment.OrderService;
@@ -22,6 +22,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -51,7 +52,6 @@
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({
@@ -88,7 +88,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);
}
@@ -181,4 +181,16 @@
return returnData(R.SUCCESS.getCode(), null);
}
+ @PostMapping("/page/update")
+ @ApiOperation(value = "订单修改", notes = "订单修改")
+ public ResponseEntity<ReturnDataDTO> operationUpdate(@Validated @RequestBody OrderAddressUpdateDTO dto) {
+ orderService.operationUpdate(dto);
+ return returnData(R.SUCCESS.getCode(),null);
+ }
+
+ @GetMapping("/list/export")
+ @ApiOperation(value = "订单导出")
+ public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO queryOrderDTO) {
+ orderService.exportOrderDetail(response, queryOrderDTO);
+ }
}
--
Gitblit v1.9.3