From 5feb2085f70f764d2a44dff707a3f57fa5fb306f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 六月 2024 15:27:00 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 9 +++++++++
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java | 10 +++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
index d707363..f978336 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
@@ -18,6 +18,7 @@
import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.feignClient.StudyClient;
import com.ruoyi.study.api.vo.UserPersonalCenterVO;
+import com.ruoyi.system.api.model.LoginUserParent;
import org.redisson.api.RSemaphore;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -163,12 +164,15 @@
if (null == good) {
return R.exchangeError("商品不存在，请稍后重试！");
}
+ LoginUserParent loginUser1 = tokenService.getLoginUser1();
+ if (null == loginUser1){
+ return R.tokenError("登录失效");
+ }
// 校验用户积分是否足够兑换
- UserPersonalCenterVO userPersonalCenter = studyClient.userInfo().getData();
- if (null == userPersonalCenter) {
+ TUser user = studyClient.userInfoParent().getData();
+ if (null == user) {
throw new GlobalException("用户信息获取失败！");
}
- TUser user = userPersonalCenter.getUser();
int needIntegral = good.getIntegral() * number;
if (user.getIntegral() < needIntegral) {
return R.exchangeError("兑换失败，当前剩余积分不足！");
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index c32cf5e..4c69795 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -722,6 +722,15 @@
Integer totalStudy = userStudy.getTotalStudy();
userStudy.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
return R.ok(new UserPersonalCenterVO(user, userStudy));
+ }@GetMapping("/userInfoParent")
+ @ApiOperation(value = "用户详情", tags = {"家长端-用户详情"})
+ public R<TUser> userInfoParent() {
+ LoginUserParent loginUserStudy = tokenService.getLoginUser1();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ TUser byId = userService.getById(loginUserStudy.getUserid());
+ return R.ok(byId);
}
@PostMapping("/deleteUser")
--
Gitblit v1.7.1