From 2533f3ef450722cf43f7fece37f2d19100e0454a Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 19 六月 2024 10:53:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 c3fb930..530660e 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
@@ -175,14 +175,9 @@
@PostMapping("/base/tStory/updateState/{id}/{state}")
R updateState1(@PathVariable("id") Integer id, @PathVariable("state") Integer state);
- /**
- * 获取用户信息
- *
- * @return 用户信息
- */
@GetMapping("/base/user/userInfo")
- @ApiOperation(value = "用户详情", tags = {"用户详情"})
- R<TUser> userInfo();
+ @ApiOperation(value = "用户详情", tags = {"学习端-用户详情"})
+ R<UserPersonalCenterVO> userInfo();
/**
* 生成积分明细-用于远程调用
@@ -205,4 +200,25 @@
@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