Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-19 ef8ec1ea5e2948309d5ee20817d1b28785957923

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/PointSettingServiceImpl.java

@@ -20,7 +20,10 @@
    @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();
    }
}