diff --git a/src/main/java/com/yolo/keyborad/model/entity/KeyboardUserInviteCodes.java b/src/main/java/com/yolo/keyborad/model/entity/KeyboardUserInviteCodes.java index 53fbb7e..eef5078 100644 --- a/src/main/java/com/yolo/keyborad/model/entity/KeyboardUserInviteCodes.java +++ b/src/main/java/com/yolo/keyborad/model/entity/KeyboardUserInviteCodes.java @@ -1,9 +1,6 @@ package com.yolo.keyborad.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Date; import lombok.Data; @@ -18,6 +15,7 @@ import lombok.Data; */ @Schema(description="用户生成的邀请码表,用于邀请新用户注册/安装并建立邀请关系") @Data +@KeySequence("invite_codes_id_seq") @TableName(value = "keyboard_user_invite_codes") public class KeyboardUserInviteCodes { /** @@ -80,13 +78,20 @@ public class KeyboardUserInviteCodes { * 邀请码类型:USER=普通用户邀请码,TENANT=租户邀请码 */ @TableField(value = "invite_type") - @Schema(description="邀请码类型:USER=普通用户邀请码,TENANT=租户邀请码") + @Schema(description="邀请码类型:USER=普通用户邀请码,AGENT=租户邀请码") private String inviteType; /** - * 邀请码所属租户ID(当inviteType=TENANT时使用) + * 邀请码所属租户ID(当inviteType=AGENT时使用) */ - @TableField(value = "tenant_id") - @Schema(description="邀请码所属租户ID(当inviteType=TENANT时使用)") - private Long tenantId; + @TableField(value = "owner_tenant_id") + @Schema(description="邀请码所属租户ID(当inviteType=AGENT时使用)") + private Long ownerTenantId; + + /** + * 邀请码所属租户用户ID(当inviteType=AGENT时使用) + */ + @TableField(value = "owner_system_user_id") + @Schema(description="邀请码所属租户用户ID(当inviteType=AGENT时使用)") + private Long ownerSystemUserId; } \ No newline at end of file diff --git a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java index aaa8228..f2e27fe 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java @@ -274,9 +274,10 @@ public class UserServiceImpl extends ServiceImpl