Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-11 f18a802137a7642473891f6886d44cf0c229efed

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

@@ -124,7 +124,7 @@
        if (vipSetting == null) {
            return R.fail("VIP 设置未找到");
        }
        if (vipSetting.getId() == 0 && vipSetting.getVipGiftRole() == 0) {
        if (vipSetting.getVipGiftRole() == 0) {
            return R.fail("转赠积分权限未开启");
        }

@@ -132,27 +132,29 @@
        if (appUser == null) {
            return R.fail("用户未找到");
        }

        PointSetting pointSetting = pointSettingService.getPointSettingByAppUserId(userid);
        if (pointSetting == null) {
            return R.fail("积分设置未找到");
        }
        // 可转赠积分总数
        Integer transferablePoint = appUser.getTransferablePoint();
        if (point > transferablePoint) {
            return R.fail("转赠积分不足");
            return R.fail("可转赠积分不足");
        }

        AppUser appUserForPhoe = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
                .eq(AppUser::getPhone, phone));
                .eq(AppUser::getPhone, phone).eq(AppUser::getDelFlag, 0).ne(AppUser::getStatus, 3));
        if (appUserForPhoe == null) {
            return R.fail("目标用户未找到");
            return R.fail("目标用户不存在");
        }
        if(appUserForPhoe.getStatus() == 2){
            return R.fail("目标用户已被冻结");
        }
        if(appUserForPhoe.getId().equals(userid)){
            return R.fail("不能转增给自己");
        }
        Integer lavePoint1 = appUserForPhoe.getLavePoint();
        appUserForPhoe.setLavePoint(appUserForPhoe.getLavePoint() + point);
        appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point);
        appUserForPhoe.setTransferablePoint(transferablePoint + point);
        appUserForPhoe.setAvailablePoint(appUserForPhoe.getAvailablePoint() + point);
        appUserForPhoe.setTotalAvailablePoint(appUserForPhoe.getTotalAvailablePoint() + point);
        appUserService.updateById(appUserForPhoe);
        //构建积分流水记录
        UserPoint userPoint = new UserPoint();
@@ -165,9 +167,7 @@
        userPointService.save(userPoint);

        Integer lavePoint = appUser.getLavePoint();
        appUser.setLavePoint(lavePoint - point);
        Integer totalPoint = appUser.getTotalPoint();
        appUser.setTotalPoint(totalPoint - point);
        appUser.setLavePoint(appUser.getLavePoint() - point);
        appUser.setTransferablePoint(appUser.getTransferablePoint() - point);
        appUser.setAvailablePoint(appUser.getAvailablePoint() - point);
        appUserService.updateById(appUser);