Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

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

@@ -428,4 +428,30 @@
                      @RequestParam("pageSize") Integer pageSize);
    @GetMapping(value = "/order/updateArrivalTime")
    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);

}