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/partner/OrderPartnerController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
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 7cbfdff..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
@@ -81,6 +82,14 @@
@ApiOperation(value = "查询订单清单列表-按库位分商品")
public ResponseEntity<ReturnDataDTO<List<OrderCheckLocationListDTO>>> selectOrderCheckLocationList(
@RequestBody OrderQueryDTO dto){
+ Partner partner = orderService.getCurrentPartner();
+ 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