Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-09 6b12805b53f7a6d131b5cffcf45e3b3c68336568

 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();
    }
}