From 3701dcb2483643ac40d4b81c021b3d8cdab62402 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 06 九月 2024 21:50:18 +0800
Subject: [PATCH] 8.9

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 5acac8c..79d6e53 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -58,6 +58,8 @@
      */
     @GetMapping(value = "/order/detail")
     R<Order> detail(@RequestParam("id") String id);
+    @PostMapping(value = "/order/msgCount")
+    R msgCount(@RequestParam("orderId") String orderId);
 
     /**
      * 更改订单信息
@@ -119,6 +121,9 @@
     @PostMapping(value = "/order/queryPage")
     R<Page<Order>> queryPage(@RequestBody OrderQueryRequest orderQueryRequest);
 
+    @PostMapping(value = "/order/queryPage1")
+    R<List<String>> queryPage1(@RequestBody OrderQueryRequest orderQueryRequest);
+
     /**
      * 订单列表
      *
@@ -146,6 +151,9 @@
 
     @PostMapping(value = "/order/queryIdsBycode")
     R<List<Integer>> queryIdsBycode(@RequestBody List<String> cityList);
+
+    @PostMapping(value = "/order/queryIdsBycodeAndSite")
+    R<List<Integer>> queryIdsBycodeAndSite(@RequestParam("cityList") List<String> cityList,@RequestParam("siteIds")List<String> siteIds);
 
     /**
      * 更改订单状态且清空到达时间
@@ -196,11 +204,13 @@
     @GetMapping(value = "/order/orderList1")
     R<Page<Order>> orderList1(@RequestParam("userId") Integer userId, @RequestParam("cityList") List<String> cityList,
                              @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
-                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);
+                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                              @RequestParam("siteIds") List<String> siteIds);
     @GetMapping(value = "/order/workOrderList")
     R<Page<Order>> workOrderList(@RequestParam("workId") Integer workId,
                              @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
-                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);
+                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                 @RequestParam("siteIds") String [] siteIds);
 
     /**
      * 更改订单提现状态

--
Gitblit v1.7.1