From bb843532217cdf2df68f0d719612e70c599ed7d5 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 10:13:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/flowerbackend-v2

---
 src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 396fa80..7cbfdff 100644
--- a/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
+++ b/src/main/java/com/mzl/flower/web/partner/OrderPartnerController.java
@@ -6,10 +6,7 @@
 import com.mzl.flower.base.ReturnDataDTO;
 import com.mzl.flower.dto.request.payment.OrderQueryDTO;
 import com.mzl.flower.dto.response.partner.PartnerOrderDTO;
-import com.mzl.flower.dto.response.payment.OrderCheckListDTO;
-import com.mzl.flower.dto.response.payment.OrderDTO;
-import com.mzl.flower.dto.response.payment.OrderItemListDTO;
-import com.mzl.flower.dto.response.payment.OrderListDTO;
+import com.mzl.flower.dto.response.payment.*;
 import com.mzl.flower.entity.partner.Partner;
 import com.mzl.flower.service.payment.OrderService;
 import io.swagger.annotations.Api;
@@ -79,4 +76,11 @@
         dto.setPartnerId(partner.getId());
         return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckList(dto));
     }
+
+    @PostMapping("/check/location/list")
+    @ApiOperation(value = "查询订单清单列表-按库位分商品")
+    public ResponseEntity<ReturnDataDTO<List<OrderCheckLocationListDTO>>> selectOrderCheckLocationList(
+            @RequestBody OrderQueryDTO dto){
+        return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckLocationList(dto));
+    }
 }

--
Gitblit v1.9.3