From 5ff8fb8bd9d298def47437b24e77c8879cdc37d2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:36:39 +0800
Subject: [PATCH] 1.定时任务-待付款-15分钟 2.领券中心:根据领取次数判断是否已领取 3.付款:优惠券自动领取最大优惠券

---
 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