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

@@ -437,4 +437,21 @@
     */
    @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);

}