From 13151b65f5ce292e4566a223288c4cb49dfe9df2 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 7 Jan 2026 15:24:38 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E9=99=90=E5=88=B6=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=B8=8D=E5=90=8C=E7=BB=84=E7=BB=87=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../primary/entity/SubscriptionPlan.java      |  2 +-
 .../model/dto/UpdateSubscriptionPlanDTO.java  |  3 +++
 .../impl/SubscriptionPlanServiceImpl.java     | 21 +++++++++++++++++++
 src/main/resources/messages_en.properties     |  1 +
 src/main/resources/messages_zh.properties     |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionPlan.java b/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionPlan.java
index c7fdb86b..23cd0eb6 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionPlan.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/SubscriptionPlan.java
@@ -70,7 +70,7 @@ public class SubscriptionPlan extends BaseEntity{
     /**
      * 国家或地区
      */
-    private String CountryOrRegion;
+    private String countryOrRegion;
 
     // 在类内部定义的枚举
     @Getter
diff --git a/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java b/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java
index 2f64ecd9..e4ad16e6 100644
--- a/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java
+++ b/src/main/java/com/ai/da/model/dto/UpdateSubscriptionPlanDTO.java
@@ -32,4 +32,7 @@ public class UpdateSubscriptionPlanDTO {
     @Schema(description = "订阅重命名")
     private String name;
 
+    @Schema(description = "国家或地区")
+    private String countryOrRegion;
+
 }
diff --git a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
index fec8dbd5..4ddd7470 100644
--- a/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/SubscriptionPlanServiceImpl.java
@@ -104,6 +104,20 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
         if (account.getSystemUser().equals(8) || account.getSystemUser().equals(6)) {
             throw new BusinessException("Sub-accounts.cannot.be.admins");
         }
+
+        // 保证订阅计划绑定的管理员所属组织的唯一性
+        checkAdminCrossOrg(subscriptionPlanDTO.getAdminAccId(), subscriptionPlanDTO.getOrganizationId());
+    }
+
+    // 判断指定的管理员是否已绑定其他组织的订阅计划
+    private void checkAdminCrossOrg(Long adminAccId, Long organizationId) {
+        QueryWrapper<SubscriptionPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SubscriptionPlan::getAdminAccId, adminAccId)
+                .ne(SubscriptionPlan::getOrganizationId, organizationId);
+        Long count = baseMapper.selectCount(queryWrapper);
+        if (count > 0) {
+            throw new BusinessException("administrator.user.is.already.bound.to.different.organization");
+        }
     }
 
     // 更新 到期时间、积分总量、已使用积分量
@@ -217,6 +231,8 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
     private void handleBasicInfo(UpdateSubscriptionPlanDTO dto, SubscriptionPlan plan) {
         if (dto.getAdminAccId() != null
                 && !dto.getAdminAccId().equals(plan.getAdminAccId())) {
+            // 保证订阅计划绑定的管理员所属组织的唯一性
+            checkAdminCrossOrg(dto.getAdminAccId(), plan.getOrganizationId());
             plan.setAdminAccId(dto.getAdminAccId());
         }
 
@@ -224,6 +240,11 @@ public class SubscriptionPlanServiceImpl extends ServiceImpl<SubscriptionPlanMap
                 && !dto.getName().equals(plan.getName())) {
             plan.setName(dto.getName());
         }
+
+        if (StringUtils.isNotBlank(dto.getCountryOrRegion())
+                && !dto.getCountryOrRegion().equals(plan.getCountryOrRegion())) {
+            plan.setCountryOrRegion(dto.getCountryOrRegion());
+        }
     }
 
     // ===================== 更新后处理 =====================
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 7b1c0603..3cb43202 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -213,6 +213,7 @@ only.subscription.plans.with.a.PENDING.status.can.have.their.start.time.modified
 the.subscription.end.date.can.be.extended.only.not.reduced=The subscription end date can be extended only, not reduced.
 total.sub-account.quota.cannot.be.lower.than.existing.sub-accounts=Total sub-account quota cannot be lower than existing sub-accounts.
 the.credit.limit.set.cannot.be.lower.than.the.amount.of.credits.already.used=The credit limit set cannot be lower than the amount of credits already used.
+administrator.user.is.already.bound.to.different.organization=This administrator user is already bound to a subscription plan of a different organization.
 
 # 可能会报异常
 # Informative:
diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties
index 66a2ba01..164c1163 100644
--- a/src/main/resources/messages_zh.properties
+++ b/src/main/resources/messages_zh.properties
@@ -209,6 +209,7 @@ only.subscription.plans.with.a.PENDING.status.can.have.their.start.time.modified
 the.subscription.end.date.can.be.extended.only.not.reduced=订阅的到期时间不能缩短，只能延长
 total.sub-account.quota.cannot.be.lower.than.existing.sub-accounts=设置的子账号总数量不能低于现存已添加的子账号数量
 the.credit.limit.set.cannot.be.lower.than.the.amount.of.credits.already.used=设置的积分上限不能低于已使用的积分量
+administrator.user.is.already.bound.to.different.organization=该管理员用户已与其他组织的订阅计划绑定
 
 # 可能会报异常
 # Informative: