fix: 同步原生账号启停与商务审核状态

internal/biz/system/user.go

@@ -52,7 +52,9 @@ type UserRepo interface {
 	ListUsers(context.Context, int, int, *UserListFilter) ([]*User, int64, error)
 	CreateUserWithAuthorities(context.Context, *User, []uint) (*User, error)
 	UpdateUser(context.Context, *User) error
+	UpdateUserWithStatus(context.Context, *User, func(int) (int, error)) error
 	UpdateSelfUser(context.Context, *User) error
+	UpdateSelfUserWithStatus(context.Context, *User, func(int) (int, error)) error
 	DeleteUser(context.Context, uint) error
 	UpdatePassword(context.Context, uint, string, bool) error
 	SetUserAuthorities(context.Context, uint, []uint) error
@@ -108,6 +110,10 @@ func (uc *UserUsecase) ListUsers(ctx context.Context, page, pageSize int, filter
 	return uc.repo.ListUsers(ctx, page, pageSize, filter)
 }
 func (uc *UserUsecase) CreateUser(ctx context.Context, user *User, authorityIDs []uint) (*User, error) {
+	if user.Enable == 0 {
+		user.Enable = 1
+	}
+	user.BusinessStatus = businessStatusForEnable(0, user.Enable)
 	hash, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
 	if err != nil {
 		return nil, err
@@ -125,10 +131,32 @@ func (uc *UserUsecase) UpdateUser(ctx context.Context, user *User, authorityIDs
 			return err
 		}
 	}
-	return uc.repo.UpdateUser(ctx, user)
+	return uc.repo.UpdateUserWithStatus(ctx, user, func(current int) (int, error) {
+		return businessStatusForEnable(current, user.Enable), nil
+	})
+}
+
+// 启用代表恢复正常；未启用时保留待审核/驳回，避免编辑资料丢失业务审核状态。
+func businessStatusForEnable(current, enable int) int {
+	if enable == 1 {
+		return 0
+	}
+	if current == 2 || current == 3 {
+		return current
+	}
+	return 1
 }
 
 func (uc *UserUsecase) UpdateSelfUser(ctx context.Context, user *User) error {
+	if user.Enable != 0 {
+		return uc.repo.UpdateSelfUserWithStatus(ctx, user, func(current int) (int, error) {
+			// 个人资料请求不能越过管理员刚写入的停用或审核状态。
+			if current != 0 {
+				return current, ErrUserDisabled
+			}
+			return businessStatusForEnable(current, user.Enable), nil
+		})
+	}
 	return uc.repo.UpdateSelfUser(ctx, user)
 }
 

internal/biz/system/user_test.go

@@ -59,3 +59,54 @@ func TestSetUserAuthoritiesRejectsEmptyListAsBadRequest(t *testing.T) {
 		t.Fatalf("SetUserAuthorities() error = %v, want ErrAuthoritiesRequired", err)
 	}
 }
+
+type statusUpdateRepo struct {
+	UserRepo
+	current, next int
+	created       *User
+}
+
+func (r *statusUpdateRepo) UpdateUserWithStatus(_ context.Context, _ *User, policy func(int) (int, error)) error {
+	var err error
+	r.next, err = policy(r.current)
+	return err
+}
+func (r *statusUpdateRepo) UpdateSelfUserWithStatus(ctx context.Context, user *User, policy func(int) (int, error)) error {
+	return r.UpdateUserWithStatus(ctx, user, policy)
+}
+func (r *statusUpdateRepo) CreateUserWithAuthorities(_ context.Context, user *User, _ []uint) (*User, error) {
+	r.created = user
+	return user, nil
+}
+
+func TestNativeEnablePreservesBusinessReviewStates(t *testing.T) {
+	for _, tc := range []struct{ current, enable, want int }{{0, 2, 1}, {1, 1, 0}, {2, 0, 2}, {3, 2, 3}, {2, 1, 0}, {3, 1, 0}} {
+		repo := &statusUpdateRepo{current: tc.current}
+		if err := NewUserUsecase(repo).UpdateUser(context.Background(), &User{ID: 1, Enable: tc.enable}, nil); err != nil || repo.next != tc.want {
+			t.Fatalf("商务状态与启停不同步: %+v next=%d err=%v", tc, repo.next, err)
+		}
+	}
+}
+
+func TestNativeCreationStatusMatchesDefaultAndDisabledEnable(t *testing.T) {
+	for _, tc := range []struct{ enable, wantEnable, wantStatus int }{{0, 1, 0}, {1, 1, 0}, {2, 2, 1}} {
+		repo := &statusUpdateRepo{}
+		_, err := NewUserUsecase(repo).CreateUser(context.Background(), &User{Username: "test", Password: "test-password", Enable: tc.enable}, nil)
+		if err != nil || repo.created.Enable != tc.wantEnable || repo.created.BusinessStatus != tc.wantStatus {
+			t.Fatalf("新账号状态错误: %+v %v", repo.created, err)
+		}
+	}
+}
+
+func TestSelfProfileCannotApproveOrReenableBusinessState(t *testing.T) {
+	for _, status := range []int{1, 2, 3} {
+		repo := &statusUpdateRepo{current: status}
+		if err := NewUserUsecase(repo).UpdateSelfUser(context.Background(), &User{ID: 1, Enable: 1}); err != ErrUserDisabled || repo.next != status {
+			t.Fatal("个人资料修改越过了停用/审核状态")
+		}
+	}
+	repo := &statusUpdateRepo{current: 0}
+	if err := NewUserUsecase(repo).UpdateSelfUser(context.Background(), &User{ID: 1, Enable: 2}); err != nil || repo.next != 1 {
+		t.Fatal("个人资料停用字段没有同步商务状态")
+	}
+}