From a510a4afcbac95dbc94e1a3345d854e5d118c3de Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Mon, 29 Dec 2025 18:43:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(invite):=20=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B6=E8=A1=A5=E5=85=85AGENT=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/entity/KeyboardUserInviteCodes.java | 23 +++++++++++--------
 .../service/impl/UserServiceImpl.java         | 14 ++++++-----
 2 files changed, 22 insertions(+), 15 deletions(-)

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