From e739a69ee991bac72c50bd8c7a00468bcd8039a0 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 27 八月 2025 16:12:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java index b2510e3..55945f2 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java @@ -8,6 +8,7 @@ import com.ruoyi.other.api.factory.StoreFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -19,9 +20,12 @@ public interface OtherClient { @GetMapping(value = "/integral/getSetBySiteId") - R<TIntegralRule> getSetBySiteId(@RequestParam("id") Integer id); + R<TIntegralRule> getSetBySiteId(@RequestParam("siteId") Integer siteId); @GetMapping(value = "/integral/saveIntegralRecord") R saveIntegralRecord(@RequestBody IntegralRecord record); + @GetMapping(value = "/integralRule/getServiceStatus/{userId}") + R<String> getServiceStatus(@PathVariable("userId") Integer userId); + } -- Gitblit v1.7.1