From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
index e73edc1..fb3d775 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
@@ -19,6 +19,9 @@
@FeignClient(contextId = "studyClient", value = ServiceNameConstants.STUDY_SERVICE, fallbackFactory = StudyFallbackFactory.class)
public interface StudyClient {
+
+ @PostMapping("/base/user/getUserById/{id}")
+ R<TUser> getUserById(@PathVariable("id") Integer id);
@PostMapping("/base/user/vipBack/{id}")
R vipBack(@PathVariable("id") Integer id);
@@ -186,8 +189,41 @@
*
* @param integral 积分变动信息
* @param method 变动源
+ * @return 操作结果
*/
@GetMapping("/base/study/addIntegralDetail")
R<Boolean> addIntegralDetail(@RequestParam("integral") String integral, @RequestParam("method") String method);
+ /**
+ * 用户积分变动(增加或减少)-用于远程调用
+ *
+ * @param integral 积分变动信息
+ * @param method 变动源
+ * @return 操作结果
+ */
+ @GetMapping("/base/study/exchangeIntegral")
+ @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ R<Boolean> exchangeIntegral(@RequestParam("integral") Integer integral, @RequestParam("method") String method);
+
+ /**
+ * 生成积分明细-用于远程调用
+ *
+ * @param integral 积分变动信息
+ * @param method 变动源
+ * @return 操作结果
+ */
+ @GetMapping("/base/study/addIntegralDetail1")
+ R<Boolean> addIntegralDetail1(@RequestParam("integral") String integral, @RequestParam("method") String method);
+
+ /**
+ * 用户积分变动(增加或减少)-用于远程调用
+ *
+ * @param integral 积分变动信息
+ * @param method 变动源
+ * @return 操作结果
+ */
+ @GetMapping("/base/study/exchangeIntegral1")
+ @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ R<Boolean> exchangeIntegral1(@RequestParam("integral") Integer integral, @RequestParam("method") String method);
+
}
--
Gitblit v1.7.1