ziin/keyboard_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(invite): 重命名字段并补充AGENT类型支持

Browse Source
This commit is contained in:
ziin
2025-12-29 18:43:09 +08:00
parent c38f62c3c1
commit a510a4afcb
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/yolo/keyborad/model/entity/KeyboardUserInviteCodes.java
View File

@@ -1,9 +1,6 @@
package com.yolo.keyborad.model.entity; package com.yolo.keyborad.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
@@ -18,6 +15,7 @@ import lombok.Data;
*/ */
@Schema(description="用户生成的邀请码表，用于邀请新用户注册/安装并建立邀请关系") @Schema(description="用户生成的邀请码表，用于邀请新用户注册/安装并建立邀请关系")
@Data @Data
@KeySequence("invite_codes_id_seq")
@TableName(value = "keyboard_user_invite_codes") @TableName(value = "keyboard_user_invite_codes")
public class KeyboardUserInviteCodes { public class KeyboardUserInviteCodes {
/** /**
@@ -80,13 +78,20 @@ public class KeyboardUserInviteCodes {
* 邀请码类型：USER=普通用户邀请码，TENANT=租户邀请码 * 邀请码类型：USER=普通用户邀请码，TENANT=租户邀请码
*/ */
@TableField(value = "invite_type") @TableField(value = "invite_type")
@Schema(description="邀请码类型：USER=普通用户邀请码，TENANT=租户邀请码") @Schema(description="邀请码类型：USER=普通用户邀请码，AGENT=租户邀请码")
private String inviteType; private String inviteType;
/** /**
* 邀请码所属租户ID（当inviteType=TENANT时使用） * 邀请码所属租户ID（当inviteType=AGENT时使用）
*/ */
@TableField(value = "tenant_id") @TableField(value = "owner_tenant_id")
@Schema(description="邀请码所属租户ID（当inviteType=TENANT时使用）") @Schema(description="邀请码所属租户ID（当inviteType=AGENT时使用）")
private Long tenantId; private Long ownerTenantId;
/**
* 邀请码所属租户用户ID（当inviteType=AGENT时使用）
*/
@TableField(value = "owner_system_user_id")
@Schema(description="邀请码所属租户用户ID（当inviteType=AGENT时使用）")
private Long ownerSystemUserId;
} }

14
src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java
View File

@@ -274,9 +274,10 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
userInvite.setInviteType(inviteCode.getInviteType()); userInvite.setInviteType(inviteCode.getInviteType());
userInvite.setInviteCode(inviteCode.getCode()); userInvite.setInviteCode(inviteCode.getCode());
// 如果是租户邀请码，记录租户ID // 如果是租户邀请码，记录租户ID
if ("TENANT".equals(inviteCode.getInviteType()) && inviteCode.getTenantId() != null) { if ("AGENT".equals(inviteCode.getInviteType()) && inviteCode.getOwnerTenantId() != null) {
userInvite.setProfitTenantId(inviteCode.getTenantId()); userInvite.setProfitTenantId(inviteCode.getOwnerTenantId());
userInvite.setInviterTenantId(inviteCode.getTenantId()); userInvite.setInviterTenantId(inviteCode.getOwnerTenantId());
userInvite.setProfitEmployeeId(inviteCode.getOwnerSystemUserId());
} }
userInvitesService.save(userInvite); userInvitesService.save(userInvite);
@@ -391,9 +392,10 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
userInvite.setInviteType(inviteCode.getInviteType()); userInvite.setInviteType(inviteCode.getInviteType());
userInvite.setInviteCode(inviteCode.getCode()); userInvite.setInviteCode(inviteCode.getCode());
// 如果是租户邀请码，记录租户ID // 如果是租户邀请码，记录租户ID
if ("TENANT".equals(inviteCode.getInviteType()) && inviteCode.getTenantId() != null) { if ("AGENT".equals(inviteCode.getInviteType()) && inviteCode.getOwnerTenantId() != null) {
userInvite.setProfitTenantId(inviteCode.getTenantId()); userInvite.setProfitTenantId(inviteCode.getOwnerTenantId());
userInvite.setInviterTenantId(inviteCode.getTenantId()); userInvite.setInviterTenantId(inviteCode.getOwnerTenantId());
userInvite.setProfitEmployeeId(inviteCode.getOwnerSystemUserId());
} }
userInvitesService.save(userInvite); userInvitesService.save(userInvite);