From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/PointSettingServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/PointSettingServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/PointSettingServiceImpl.java
index e8a14f5..42de2ab 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/PointSettingServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/PointSettingServiceImpl.java
@@ -20,7 +20,19 @@
@Override
public PointSetting getPointSettingByAppUserId(Long appUserId) {
AppUser appUser = appUserService.getById(appUserId);
- R<PointSetting> pointSetting = pointSettingClient.getPointSetting(appUser.getVipId());
- return null;
+ R<PointSetting> r = pointSettingClient.getPointSetting(appUser.getVipId());
+ if (!R.isSuccess(r)){
+ throw new RuntimeException("获取积分设置失败");
+ }
+ return r.getData();
+ }
+
+ @Override
+ public PointSetting getPointSettingById(Integer id) {
+ R<PointSetting> r = pointSettingClient.getPointSetting(id);
+ if (!R.isSuccess(r)){
+ throw new RuntimeException("获取积分设置失败");
+ }
+ return r.getData();
}
}
--
Gitblit v1.7.1