From 0846753b50b65e8974b3860e6064c38be9c114a9 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 22 四月 2025 18:40:58 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 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 48519fd..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 @@ -443,5 +443,15 @@ * @return */ @GetMapping(value = "/order/call") - R<String> call(@RequestParam("orderId")Integer orderId); + 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