From 76f04927058e3b144ff0e5dd8cde01b7fe069d74 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 22 四月 2025 17:28:07 +0800
Subject: [PATCH] 2.0bug修改

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 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 80529b7..0941c3a 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
@@ -244,7 +244,7 @@
      * @return 交易额
      */
     @GetMapping(value = "/order/orderListWorker")
-    R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,
+    R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues,
                                    @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);
 
@@ -427,5 +427,31 @@
                       @RequestParam("pageNum") Integer pageNum,
                       @RequestParam("pageSize") Integer pageSize);
     @GetMapping(value = "/order/updateArrivalTime")
-    R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")Date arriveTime);
+    R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime);
+
+    /**
+     * 批量修改上门时间
+     * @param ids
+     * @param time
+     * @return
+     */
+    @GetMapping(value = "/order/batchUpdateTime")
+    R<Boolean> batchUpdateTime(@RequestParam("ids")String ids,@RequestParam("time")String time);
+    /**
+     * 打电话
+     * @param orderId
+     * @return
+     */
+    @GetMapping(value = "/order/call")
+    R<String> call(@RequestParam("orderId")String orderId);
+
+    /**
+     * 领取补贴金
+     * @param orderId
+     * @param recycleSubsidy
+     * @return
+     */
+    @GetMapping(value = "/order/receiving")
+    R<String> receiving(@RequestParam("orderId")String orderId, @RequestParam("recycleSubsidy")BigDecimal recycleSubsidy);
+
 }

--
Gitblit v1.7.1