feat(家长用户注册): 新增新用户7天会员赠送并重构重复代码

zjk

2026-09-28 ebcd11a809ec313ec3698aa38c64b5c6304ccf18

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -79,6 +79,10 @@

    @Autowired
    private ITIntegralRecordService integralRecordService;

    /** 家长端新用户注册赠送的会员天数 */
    private static final int GIFT_VIP_DAYS = 7;

    @PostMapping("/getUserById/{id}")
    @ApiOperation(value = "根据用户id 获取用户信息", tags = {"管理后台-用户管理"})
    public R<TUser> getUserById(@PathVariable("id") Integer id) {
@@ -859,21 +863,13 @@
                    if (!rCode.equalsIgnoreCase(phoneCode)) {
                        return R.errorCode("登录失败，手机验证码无效!");
                    } else {
                        tUser1 = getUser(phone);
                        tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                        String upperCase = UUIDUtil.getRandomCode(6).toUpperCase();
                        tUser1.setAccount("用户"+upperCase);
                        tUser1.setName("用户"+upperCase);
                        userService.save(tUser1);
                        // 新用户：创建账号并赠送 7 天会员
                        tUser1 = registerParentUserWithGift(phone);
                    }
                }
            } else {
                String upperCase = UUIDUtil.getRandomCode(6).toUpperCase();
                tUser1 = getUser(phone);
                tUser1.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
                tUser1.setAccount("用户"+upperCase);
                tUser1.setName("用户"+upperCase);
                userService.save(tUser1);
                // 新用户：创建账号并赠送 7 天会员
                tUser1 = registerParentUserWithGift(phone);
            }
        }
        LoginUserParent loginUserParent = new LoginUserParent();
@@ -998,6 +994,33 @@
    }

    /**
     * 家长端新用户注册：创建账号并赠送 7 天会员
     *
     * @param phone 手机号
     * @return 新建的用户
     */
    private TUser registerParentUserWithGift(String phone) throws Exception {
        TUser user = getUser(phone);
        user.setHeadImg("https://haitunyingyu.obs.cn-southwest-2.myhuaweicloud.com/admin/1c6ee218aa18434db2e86df903990de8.jpg");
        String upperCase = UUIDUtil.getRandomCode(6).toUpperCase();
        user.setAccount("用户" + upperCase);
        user.setName("用户" + upperCase);
        // 新用户福利：赠送 7 天会员，到期时间为 7 天后的 23:59:59
        Date now = new Date();
        user.setVipPayTime(now);
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(now);
        calendar.add(Calendar.DATE, GIFT_VIP_DAYS);
        Date vipEndTime = calendar.getTime();
        vipEndTime.setHours(23);
        vipEndTime.setMinutes(59);
        vipEndTime.setSeconds(59);
        user.setVipEndTime(vipEndTime);
        userService.save(user);
        return user;
    }

    /**
     * 家长端 学习端都可用
     *
     * @param phone 手机号