From 8476ed9710956ebb47a35370fb45184c46017a35 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 九月 2024 16:36:13 +0800
Subject: [PATCH] add:合伙人订单列表导出
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 8 +++++++-
src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java | 7 +++++++
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index e4c422f..e1aebd0 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -1719,7 +1719,7 @@
public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO dto) {
List<OrderListExportDTO> ls = getOrderExportListBase( dto);
- String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收获地址", "订单金额"
+ String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收货地址", "订单金额"
, "底价", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
@@ -1755,4 +1755,10 @@
}
+ public void exportPartnerOrderList(HttpServletResponse response, OrderQueryDTO dto) {
+ Partner p = getCurrentPartner();
+ dto.setPartnerId(p.getId());
+ exportOrderDetail(response, dto);
+ }
+
}
diff --git a/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java b/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
index d5906c5..c13eb7d 100644
--- a/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
+++ b/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
@@ -19,6 +19,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -85,4 +86,10 @@
dto.setPartnerId(partner.getId());
return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckLocationList(dto));
}
+
+ @GetMapping("/list/export")
+ @ApiOperation(value = "合伙人订单导出")
+ public void exportPartnerOrderList(HttpServletResponse response, OrderQueryDTO queryOrderDTO) {
+ orderService.exportPartnerOrderList(response, queryOrderDTO);
+ }
}
--
Gitblit v1.9.3