合并

杨鑫
2 parents ef6b3255 10fd1324
Showing 64 changed files with 1990 additions and 351 deletions
.codex/project/project-context.md
美国版/Food Labeling Management Code/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Mvc/YiConventionalRouteBuilder.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/AuthSession/CurrentUserMenuPermissionsOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Label/LabelCreateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Label/LabelGetListInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Label/LabelGetOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Label/LabelUpdateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelCategory/LabelCategoryCreateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelCategory/LabelCategoryGetListInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelCategory/LabelCategoryGetListOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/LabelCategory/LabelCategoryGetOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Location/LocationCreateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Location/LocationGetListOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Location/LocationUpdateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Partner/PartnerCreateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Partner/PartnerGetListOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Partner/PartnerGetOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Partner/PartnerUpdateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Product/ProductCreateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Product/ProductGetListInputVo.cs
@@ -66,3 +66,15 @@
 - `打印机SDK/`、`nativeplugins/`、`scripts/`、`unpackage/` 等目录
 后续修改时应避免误覆盖这些现有变更。
+
+## 7. 美国版业务字段命名（固定映射）
+
+开发与文档中统一使用下列对应关系，**不要**在 `location` 表再新增名为 `Region` 的列：
+
+| 界面 / 接口英文 | 中文 | 主数据表 | 门店表 `location` 字段 |
+|-----------------|------|----------|------------------------|
+| Company / Partner | 公司 | `fl_partner` | `Partner`（公司名称字符串） |
+| **Region / Group** | **区域 / 组织** | **`fl_group`**（`GroupName`） | **`GroupName`** |
+| Location | 门店 | `location` | `LocationCode` / `LocationName` |
+
+**硬性规则**：**Region 对应 `location.GroupName`**（与 `fl_group.GroupName` 通过 `Partner` + 名称匹配）。列表/API 出参字段名可用 `region`，落库与查询一律用 `GroupName`。
@@ -78,6 +78,13 @@ namespace Yi.Framework.AspNetCore.Mvc
                 return baseUrl;
             }
+            // Guid 必须带路由约束，否则与 export-xxx、download-xxx 等字面路径冲突
+            var idClrType = Nullable.GetUnderlyingType(idParameter.ParameterType) ?? idParameter.ParameterType;
+            if (idClrType == typeof(Guid))
+            {
+                return $"{baseUrl}/{{id:guid}}";
+            }
+
             // 处理原始类型ID
             if (TypeHelper.IsPrimitiveExtended(idParameter.ParameterType, includeEnums: true))
             {
@@ -12,4 +12,19 @@ public class CurrentUserMenuPermissionsOutputDto
     public List<string> PermissionCodes { get; set; } = new();
     public List<CurrentUserMenuNodeDto> Menus { get; set; } = new();
+
+    /// <summary>
+    /// 用户资料最后更新时间（User.LastModificationTime，无则前端可忽略或展示「无」）
+    /// </summary>
+    public DateTime? LastUpdated { get; set; }
+
+    /// <summary>
+    /// 角色展示名（多角色英文逗号拼接；与 <see cref="RoleCodes"/> 对应的库中 RoleName）
+    /// </summary>
+    public string Role { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 全名：优先姓名（User.Name），其次昵称（Nick），最后用户名
+    /// </summary>
+    public string FullName { get; set; } = string.Empty;
 }
@@ -8,7 +8,35 @@ public class LabelCreateInputVo
     public string TemplateCode { get; set; } = string.Empty;
-    public string LocationId { get; set; } = string.Empty;
+    /// <summary>
+    /// 适用 Company（<c>fl_partner.Id</c>）；与 <see cref="PartnerIds"/> 合并，用于解析所属门店
+    /// </summary>
+    public string? PartnerId { get; set; }
+
+    /// <summary>
+    /// 适用 Company 多选（<c>fl_partner.Id</c>）
+    /// </summary>
+    public List<string>? PartnerIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region 多选（<c>fl_group.Id</c>）；与 <see cref="GroupIds"/> 合并
+    /// </summary>
+    public List<string>? RegionIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region 多选（与 <see cref="RegionIds"/> 相同）
+    /// </summary>
+    public List<string>? GroupIds { get; set; }
+
+    /// <summary>
+    /// 所属门店（<c>location.Id</c>）；可与 Company/Region 一并传入以校验范围；单独传则直接落库
+    /// </summary>
+    public string? LocationId { get; set; }
+
+    /// <summary>
+    /// 门店候选（多选）；标签仅绑定单门店：未传 <see cref="LocationId"/> 且合并结果唯一时自动取该项
+    /// </summary>
+    public List<string>? LocationIds { get; set; }
     public string LabelCategoryId { get; set; } = string.Empty;
@@ -10,7 +10,12 @@ public class LabelGetListInputVo : PagedAndSortedResultRequestDto
     public string? Keyword { get; set; }
     /// <summary>
-    /// 门店Id（可选）
+    /// 组织/Region Id（<c>fl_group.Id</c>）；筛选标签所属门店落在该 Region 下的记录
+    /// </summary>
+    public string? GroupId { get; set; }
+
+    /// <summary>
+    /// 门店 Id（<c>location.Id</c>，Guid 字符串）；最精确筛选，传则忽略 <see cref="GroupId"/>
     /// </summary>
     public string? LocationId { get; set; }
@@ -10,6 +10,17 @@ public class LabelGetOutputDto
     public string LocationName { get; set; } = string.Empty;
+    /// <summary>适用 Company Id（由所属门店反推）</summary>
+    public string? PartnerId { get; set; }
+
+    public List<string> PartnerIds { get; set; } = new();
+
+    /// <summary>适用 Region Id（<c>fl_group.Id</c>）</summary>
+    public List<string> RegionIds { get; set; } = new();
+
+    /// <summary>与 <see cref="RegionIds"/> 相同</summary>
+    public List<string> GroupIds { get; set; } = new();
+
     public string LabelCategoryId { get; set; } = string.Empty;
     public string LabelCategoryName { get; set; } = string.Empty;
@@ -6,7 +6,17 @@ public class LabelUpdateInputVo
     public string TemplateCode { get; set; } = string.Empty;
-    public string LocationId { get; set; } = string.Empty;
+    public string? PartnerId { get; set; }
+
+    public List<string>? PartnerIds { get; set; }
+
+    public List<string>? RegionIds { get; set; }
+
+    public List<string>? GroupIds { get; set; }
+
+    public string? LocationId { get; set; }
+
+    public List<string>? LocationIds { get; set; }
     public string LabelCategoryId { get; set; } = string.Empty;
@@ -29,7 +29,17 @@ public class LabelCategoryCreateInputVo
     public string AvailabilityType { get; set; } = "ALL";
     /// <summary>
-    /// 指定门店 Id 列表（当 AvailabilityType=SPECIFIED 时必填）
+    /// 适用 Region（多选），<c>fl_group.Id</c>；与 <see cref="GroupIds"/> 合并去重
+    /// </summary>
+    public List<string>? RegionIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region（多选），与 <see cref="RegionIds"/> 相同
+    /// </summary>
+    public List<string>? GroupIds { get; set; }
+
+    /// <summary>
+    /// 适用门店（多选），<c>location.Id</c>；与 Region 合并后写入 <c>fl_label_category_location</c>
     /// </summary>
     public List<string>? LocationIds { get; set; }
@@ -7,5 +7,15 @@ public class LabelCategoryGetListInputVo : PagedAndSortedResultRequestDto
     public string? Keyword { get; set; }
     public bool? State { get; set; }
+
+    /// <summary>
+    /// Region 筛选（<c>fl_group.Id</c>）；含 <c>availabilityType=ALL</c> 的分类
+    /// </summary>
+    public string? GroupId { get; set; }
+
+    /// <summary>
+    /// 门店筛选（<c>location.Id</c>）；优先于 <see cref="GroupId"/>
+    /// </summary>
+    public string? LocationId { get; set; }
 }
@@ -18,15 +18,33 @@ public class LabelCategoryGetListOutputDto
     public string AvailabilityType { get; set; } = "ALL";
-    /// <summary>
-    /// 当 <see cref="AvailabilityType"/> 为 SPECIFIED 时返回绑定的门店 Id；否则为空列表。
-    /// </summary>
+    /// <summary>适用 Region 展示（ALL 时为 All Regions）</summary>
+    public string Region { get; set; } = string.Empty;
+
+    /// <summary>适用门店展示（ALL 时为 All Locations）</summary>
+    public string Location { get; set; } = string.Empty;
+
+    /// <summary>适用 Region Id 列表（多选）</summary>
+    public List<string> RegionIds { get; set; } = new();
+
+    /// <summary>适用门店 Id 列表（多选）</summary>
     public List<string> LocationIds { get; set; } = new();
     public int OrderNum { get; set; }
+    /// <summary>
+    /// 该分类下已创建标签数量（<c>fl_label</c> 未删除且 <c>LabelCategoryId</c> 匹配）
+    /// </summary>
     public long NoOfLabels { get; set; }
+    /// <summary>
+    /// 分类创建时间（兼容旧前端字段 <c>creationTime</c>）
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    /// <summary>
+    /// 最后编辑时间：分类自身与下属标签的 <c>LastModificationTime</c>/<c>CreationTime</c> 取最大值
+    /// </summary>
     public DateTime LastEdited { get; set; }
 }
@@ -18,6 +18,12 @@ public class LabelCategoryGetOutputDto
     public string AvailabilityType { get; set; } = "ALL";
+    /// <summary>适用 Region Id 列表（多选；<c>ALL</c> 时为空）</summary>
+    public List<string> RegionIds { get; set; } = new();
+
+    /// <summary>与 <see cref="RegionIds"/> 相同</summary>
+    public List<string> GroupIds { get; set; } = new();
+
     public List<string> LocationIds { get; set; } = new();
     public int OrderNum { get; set; }
@@ -34,6 +34,11 @@ public class LocationCreateInputVo
     public decimal? Longitude { get; set; }
+    /// <summary>
+    /// 经营时间（自由文本）
+    /// </summary>
+    public string? OperatingHours { get; set; }
+
     public bool State { get; set; } = true;
 }
@@ -33,6 +33,11 @@ public class LocationGetListOutputDto
     public decimal? Longitude { get; set; }
+    /// <summary>
+    /// 经营时间
+    /// </summary>
+    public string? OperatingHours { get; set; }
+
     public bool State { get; set; }
 }
@@ -33,6 +33,11 @@ public class LocationUpdateInputVo
     public decimal? Longitude { get; set; }
     /// <summary>
+    /// 经营时间（自由文本）
+    /// </summary>
+    public string? OperatingHours { get; set; }
+
+    /// <summary>
     /// 启用状态
     /// </summary>
     public bool State { get; set; } = true;
@@ -3,7 +3,7 @@ namespace FoodLabeling.Application.Contracts.Dtos.Partner;
 /// <summary>
 /// 新建合作伙伴入参
 /// </summary>
-public class PartnerCreateInputVo
+public class PartnerCreateInputVo : PartnerAddressFieldsDto
 {
     public string PartnerName { get; set; } = string.Empty;
@@ -11,5 +11,8 @@ public class PartnerCreateInputVo
     public string? PhoneNumber { get; set; }
+    /// <summary>
+    /// 是否启用（Active / Inactive）
+    /// </summary>
     public bool State { get; set; } = true;
 }
@@ -3,7 +3,7 @@ namespace FoodLabeling.Application.Contracts.Dtos.Partner;
 /// <summary>
 /// 合作伙伴列表项
 /// </summary>
-public class PartnerGetListOutputDto
+public class PartnerGetListOutputDto : PartnerAddressFieldsDto
 {
     public string Id { get; set; } = string.Empty;
@@ -13,6 +13,9 @@ public class PartnerGetListOutputDto
     public string? PhoneNumber { get; set; }
+    /// <summary>
+    /// 是否启用
+    /// </summary>
     public bool State { get; set; }
     public DateTime CreationTime { get; set; }
@@ -3,19 +3,7 @@ namespace FoodLabeling.Application.Contracts.Dtos.Partner;
 /// <summary>
 /// 合作伙伴详情
 /// </summary>
-public class PartnerGetOutputDto
+public class PartnerGetOutputDto : PartnerGetListOutputDto
 {
-    public string Id { get; set; } = string.Empty;
-
-    public string PartnerName { get; set; } = string.Empty;
-
-    public string? ContactEmail { get; set; }
-
-    public string? PhoneNumber { get; set; }
-
-    public bool State { get; set; }
-
-    public DateTime CreationTime { get; set; }
-
     public DateTime? LastModificationTime { get; set; }
 }
@@ -3,13 +3,6 @@ namespace FoodLabeling.Application.Contracts.Dtos.Partner;
 /// <summary>
 /// 编辑合作伙伴入参
 /// </summary>
-public class PartnerUpdateInputVo
+public class PartnerUpdateInputVo : PartnerCreateInputVo
 {
-    public string PartnerName { get; set; } = string.Empty;
-
-    public string? ContactEmail { get; set; }
-
-    public string? PhoneNumber { get; set; }
-
-    public bool State { get; set; } = true;
 }
@@ -18,8 +18,18 @@ public class ProductCreateInputVo
     public bool State { get; set; } = true;
     /// <summary>
-    /// 可选。门店 Id 列表；每个 Id 在 fl_location_product 落一行（同一 fl_product 可对应多门店）。
-    /// 不传或空列表则不在本接口写入门店关联（仍可用 product-location 接口维护）。
+    /// 适用 Company（<c>fl_partner.Id</c>，UI 称 Company）；展开该公司下全部门店后与 Region/门店合并写入 <c>fl_location_product</c>
+    /// </summary>
+    public string? PartnerId { get; set; }
+
+    /// <summary>
+    /// 适用 Region（<c>fl_group.Id</c>，UI 称 Region；库字段为 <c>location.GroupName</c>）
+    /// </summary>
+    public List<string>? GroupIds { get; set; }
+
+    /// <summary>
+    /// 适用门店 Id 列表；与 <see cref="GroupIds"/> 合并后写入 <c>fl_location_product</c>。
+    /// 不传则不在本接口写入门店关联。
     /// </summary>
     public List<string>? LocationIds { get; set; }
 }
@@ -17,5 +17,20 @@ public class ProductGetListInputVo : PagedAndSortedResultRequestDto
     /// 启用状态
     /// </summary>
     public bool? State { get; set; }
+
+    /// <summary>
+    /// 公司（合作伙伴）Id，对应 <c>fl_partner.Id</c>；筛选绑定在该公司下门店的产品
+    /// </summary>
+    public string? PartnerId { get; set; }
+
+    /// <summary>
+    /// 组织/Region Id，对应 <c>fl_group.Id</c>；筛选绑定在该 Region 对应门店下的产品（优先于 <see cref="PartnerId"/>）
+    /// </summary>
+    public string? GroupId { get; set; }
+
+    /// <summary>
+    /// 门店 Id（<c>location.Id</c>，Guid 字符串）；最精确筛选，传则忽略 <see cref="PartnerId"/> / <see cref="GroupId"/>
+    /// </summary>
+    public string? LocationId { get; set; }
 }
@@ -18,8 +18,17 @@ public class ProductGetOutputDto
     public bool State { get; set; }
+    /// <summary>适用 Company Id（<c>fl_partner.Id</c>，由关联门店反推；多公司时取第一个）</summary>
+    public string? PartnerId { get; set; }
+
+    /// <summary>适用 Company Id 列表（去重）</summary>
+    public List<string> PartnerIds { get; set; } = new();
+
+    /// <summary>适用 Region Id（<c>fl_group.Id</c>，由关联门店反推）</summary>
+    public List<string> GroupIds { get; set; } = new();
+
     /// <summary>
-    /// 该产品关联的门店Id列表（来自 fl_location_product）
+    /// 适用门店 Id 列表（来自 fl_location_product）
     /// </summary>
     public List<string> LocationIds { get; set; } = new();
 }
@@ -32,7 +32,17 @@ public class ProductCategoryCreateInputVo
     public string AvailabilityType { get; set; } = "ALL";
     /// <summary>
-    /// 指定门店 Id 列表（当 AvailabilityType=SPECIFIED 时必填）
+    /// 适用 Region（**多选**），<c>fl_group.Id</c> 数组；与 <see cref="GroupIds"/> 等价，推荐本字段。
+    /// </summary>
+    public List<string>? RegionIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region（多选），与 <see cref="RegionIds"/> 相同；传任一会合并去重。
+    /// </summary>
+    public List<string>? GroupIds { get; set; }
+
+    /// <summary>
+    /// 适用门店（**多选**），<c>location.Id</c> 数组；与 Region 合并后写入 <c>fl_product_category_location</c>。
     /// </summary>
     public List<string>? LocationIds { get; set; }
@@ -16,5 +16,15 @@ public class ProductCategoryGetListInputVo : PagedAndSortedResultRequestDto
     /// 启用状态过滤
     /// </summary>
     public bool? State { get; set; }
+
+    /// <summary>
+    /// 按 Region 筛选（<c>fl_group.Id</c>）：返回适用于该 Region 下任一门门店的分类，以及 <c>availabilityType=ALL</c> 的分类
+    /// </summary>
+    public string? GroupId { get; set; }
+
+    /// <summary>
+    /// 按门店筛选（<c>location.Id</c>，Guid 字符串）；优先于 <see cref="GroupId"/>
+    /// </summary>
+    public string? LocationId { get; set; }
 }
@@ -24,5 +24,21 @@ public class ProductCategoryGetListOutputDto
     public int OrderNum { get; set; }
     public DateTime LastEdited { get; set; }
+
+    /// <summary>
+    /// 适用 Region 展示（<c>availabilityType=ALL</c> 时为 <c>All Regions</c>；<c>SPECIFIED</c> 时为绑定门店去重后的 <c>location.GroupName</c>，英文逗号拼接）
+    /// </summary>
+    public string Region { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 适用门店展示（<c>availabilityType=ALL</c> 时为 <c>All Locations</c>；<c>SPECIFIED</c> 时为绑定门店名称，英文逗号拼接）
+    /// </summary>
+    public string Location { get; set; } = string.Empty;
+
+    /// <summary>适用 Region Id 列表（多选；<c>ALL</c> 时为空数组）</summary>
+    public List<string> RegionIds { get; set; } = new();
+
+    /// <summary>适用门店 Id 列表（多选；<c>ALL</c> 时为空数组）</summary>
+    public List<string> LocationIds { get; set; } = new();
 }
@@ -22,6 +22,13 @@ public class ProductCategoryGetOutputDto
     public string AvailabilityType { get; set; } = "ALL";
+    /// <summary>适用 Region Id 列表（多选，<c>fl_group.Id</c>；由绑定门店反推）</summary>
+    public List<string> RegionIds { get; set; } = new();
+
+    /// <summary>与 <see cref="RegionIds"/> 相同（兼容字段）</summary>
+    public List<string> GroupIds { get; set; } = new();
+
+    /// <summary>适用门店 Id 列表（多选，<c>location.Id</c>）</summary>
     public List<string> LocationIds { get; set; } = new();
     public int OrderNum { get; set; }
@@ -19,18 +19,18 @@ public class RbacRoleCreateInputVo
     public bool State { get; set; } = true;
     /// <summary>
-    /// 排序；未传时服务端按 0 处理
+    /// 排序号；不传或传 null 时新增默认为 0，编辑时保留原值
     /// </summary>
     public int? OrderNum { get; set; }
     /// <summary>
-    /// 访问权限编码 JSON 数组字符串（如 ["manage_labels","manage_people"]）
+    /// 绑定菜单 Id；与 accessPermissions 同时传时以本字段为准
     /// </summary>
-    public string? AccessPermissions { get; set; }
+    public List<Guid>? MenuIds { get; set; }
     /// <summary>
-    /// 兼容旧字段名 <c>accessPermissionCodes</c>
+    /// 按 PermissionCode 绑定菜单（英文逗号分隔）；传空字符串表示清空绑定；不传则不修改已有绑定（仅编辑时）
     /// </summary>
-    public List<string>? AccessPermissionCodes { get; set; }
+    public string? AccessPermissions { get; set; }
 }
@@ -20,8 +20,8 @@ public class RbacRoleGetListOutputDto
     public int OrderNum { get; set; }
     /// <summary>
-    /// 访问权限编码列表
+    /// 已绑定菜单的 PermissionCode 汇总（英文逗号+空格拼接，与 /api/app/role 一致）
     /// </summary>
-    public List<string> AccessPermissionCodes { get; set; } = new();
+    public string AccessPermissions { get; set; } = string.Empty;
 }
@@ -18,9 +18,29 @@ public class TeamMemberCreateInputVo
     public Guid? RoleId { get; set; }
     /// <summary>
-    /// 关联门店（至少1个）
+    /// 适用 Company（<c>fl_partner.Id</c>，UI 称 Company）；与 <see cref="PartnerIds"/> 合并
     /// </summary>
-    public List<string> LocationIds { get; set; } = new();
+    public string? PartnerId { get; set; }
+
+    /// <summary>
+    /// 适用 Company 多选（<c>fl_partner.Id</c>）
+    /// </summary>
+    public List<string>? PartnerIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region 多选（<c>fl_group.Id</c>）；与 <see cref="GroupIds"/> 合并
+    /// </summary>
+    public List<string>? RegionIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region 多选（与 <see cref="RegionIds"/> 相同）
+    /// </summary>
+    public List<string>? GroupIds { get; set; }
+
+    /// <summary>
+    /// 适用门店多选（<c>location.Id</c>）；与 Company/Region 合并后写入 <c>userlocation</c>
+    /// </summary>
+    public List<string>? LocationIds { get; set; }
     public bool State { get; set; } = true;
 }
@@ -21,6 +21,12 @@ public class TeamMemberGetListOutputDto
     public string? RoleName { get; set; }
+    /// <summary>适用 Company Id 列表（多选）</summary>
+    public List<string> PartnerIds { get; set; } = new();
+
+    /// <summary>适用 Region Id 列表（多选）</summary>
+    public List<string> RegionIds { get; set; } = new();
+
     public List<TeamMemberAssignedLocationDto> AssignedLocations { get; set; } = new();
 }
@@ -16,6 +16,15 @@ public class TeamMemberGetOutputDto
     public Guid? RoleId { get; set; }
+    /// <summary>适用 Company Id（多选，由绑定门店反推）</summary>
+    public List<string> PartnerIds { get; set; } = new();
+
+    /// <summary>适用 Region Id（多选，<c>fl_group.Id</c>）</summary>
+    public List<string> RegionIds { get; set; } = new();
+
+    /// <summary>与 <see cref="RegionIds"/> 相同</summary>
+    public List<string> GroupIds { get; set; } = new();
+
     public List<string> LocationIds { get; set; } = new();
     public List<TeamMemberAssignedLocationDto> AssignedLocations { get; set; } = new();
@@ -17,7 +17,30 @@ public class TeamMemberUpdateInputVo
     public Guid? RoleId { get; set; }
-    public List<string> LocationIds { get; set; } = new();
+    /// <summary>
+    /// 适用 Company（<c>fl_partner.Id</c>）；与 <see cref="PartnerIds"/> 合并
+    /// </summary>
+    public string? PartnerId { get; set; }
+
+    /// <summary>
+    /// 适用 Company 多选（<c>fl_partner.Id</c>）
+    /// </summary>
+    public List<string>? PartnerIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region 多选（<c>fl_group.Id</c>）；与 <see cref="GroupIds"/> 合并
+    /// </summary>
+    public List<string>? RegionIds { get; set; }
+
+    /// <summary>
+    /// 适用 Region 多选（与 <see cref="RegionIds"/> 相同）
+    /// </summary>
+    public List<string>? GroupIds { get; set; }
+
+    /// <summary>
+    /// 适用门店多选（<c>location.Id</c>）；与 Company/Region 合并后写入 <c>userlocation</c>
+    /// </summary>
+    public List<string>? LocationIds { get; set; }
     public bool State { get; set; } = true;
 }
@@ -3,6 +3,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\framework\Yi.Framework.Ddd.Application.Contracts\Yi.Framework.Ddd.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\rbac\Yi.Framework.Rbac.Application.Contracts\Yi.Framework.Rbac.Application.Contracts.csproj" />
     <ProjectReference Include="..\FoodLabeling.Domain.Shared\FoodLabeling.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\rbac\Yi.Framework.Rbac.Domain.Shared\Yi.Framework.Rbac.Domain.Shared.csproj" />
   </ItemGroup>
@@ -13,6 +13,8 @@ public interface IAuthSessionAppService : IApplicationService
     /// </summary>
     /// <remarks>
     /// 与框架 <c>UserManager.GetInfoAsync</c> 一致；用户名为 <c>admin</c> 时返回全部未删除菜单（与 <c>AccountService.GetVue3Router</c> 行为对齐）。
+    /// 返回体额外包含：<c>lastUpdated</c>（用户 LastModificationTime）、<c>role</c>（角色展示名，多角色英文逗号拼接）、<c>fullName</c>（姓名优先，其次昵称、用户名）。
+    /// 角色名通过 <c>Role</c> 表直查（<c>RoleDbEntity</c>），避免走仓储 IDataPermission。
     /// </remarks>
     /// <returns>用户简要信息、权限码与菜单树</returns>
     /// <response code="200">成功</response>
@@ -14,13 +14,18 @@ public interface IGroupAppService : IApplicationService
     /// <summary>
     /// 组织分页列表（与导出使用相同筛选条件）
     /// </summary>
+    /// <remarks>
+    /// 数据范围（按登录 Token）：
+    /// 管理员可见全部 Region；其它角色仅可见其 <c>userlocation</c> 绑定门店对应的组织（<c>location.Partner</c> + <c>location.GroupName</c> 与 <c>fl_group</c> 匹配）。
+    /// </remarks>
     /// <param name="input">分页与筛选；SkipCount 为页码（从 1 起）</param>
     Task<PagedResultWithPageDto<GroupGetListOutputDto>> GetListAsync(GroupGetListInputVo input);
     /// <summary>
     /// 组织详情
     /// </summary>
-    Task<GroupGetOutputDto> GetAsync(string id);
+    /// <param name="id">主键（Guid，与 <c>fl_group.Id</c> 一致；约定路由 <c>{id:guid}</c>，避免与 <c>export-pdf</c> 等路径冲突）</param>
+    Task<GroupGetOutputDto> GetAsync(Guid id);
     /// <summary>
     /// 新增组织
@@ -30,16 +35,19 @@ public interface IGroupAppService : IApplicationService
     /// <summary>
     /// 编辑组织
     /// </summary>
-    Task<GroupGetOutputDto> UpdateAsync(string id, GroupUpdateInputVo input);
+    Task<GroupGetOutputDto> UpdateAsync(Guid id, GroupUpdateInputVo input);
     /// <summary>
     /// 删除组织（逻辑删除）
     /// </summary>
-    Task DeleteAsync(string id);
+    Task DeleteAsync(Guid id);
     /// <summary>
-    /// 按列表相同筛选条件全量导出组织（Region）为 PDF（不分页；与 <see cref="GetListAsync"/> 相同筛选；单次最多 5000 条）
+    /// 按列表相同筛选条件全量导出组织（Region）为 PDF（不分页；与 <see cref="GetListAsync"/> 相同筛选与 Token 数据范围；单次最多 5000 条）
     /// </summary>
+    /// <remarks>
+    /// 与 <see cref="GetListAsync"/> 使用同一套 <c>BuildGroupJoinedQueryAsync</c>（含 <c>ResolveGroupScopeAsync</c>），导出行集与列表一致。
+    /// </remarks>
     /// <param name="input">Keyword、PartnerId、State、Sorting；分页字段忽略</param>
     /// <returns>application/pdf</returns>
     Task<IActionResult> ExportPdfAsync(GroupGetListInputVo input);
@@ -14,6 +14,13 @@ public interface IPartnerAppService : IApplicationService
     /// <summary>
     /// 合作伙伴分页列表（与导出使用相同筛选条件）
     /// </summary>
+    /// <remarks>
+    /// 数据范围（按登录 Token）：
+    /// <list type="bullet">
+    /// <item>管理员（角色码 <c>admin</c>、用户名为 <c>admin</c> 或权限 <c>*:*:*</c>）：可查看全部公司；</item>
+    /// <item>其它角色：仅可查看当前用户在 <c>userlocation</c> 中绑定门店所属的合作伙伴（<c>location.Partner</c> 与 <c>fl_partner</c> 按名称或 Id 匹配）。</item>
+    /// </list>
+    /// </remarks>
     /// <param name="input">分页与筛选；SkipCount 为页码（从 1 起）</param>
     /// <returns>分页数据</returns>
     /// <response code="200">成功</response>
@@ -24,17 +31,17 @@ public interface IPartnerAppService : IApplicationService
     /// <summary>
     /// 合作伙伴详情
     /// </summary>
-    /// <param name="id">主键 Id</param>
+    /// <param name="id">主键（Guid，与 <c>fl_partner.Id</c> 一致；约定路由 <c>{id:guid}</c>，避免与 <c>export-pdf</c> 等路径冲突）</param>
     /// <returns>详情</returns>
     /// <response code="200">成功</response>
     /// <response code="400">Id 无效</response>
     /// <response code="500">服务器错误</response>
-    Task<PartnerGetOutputDto> GetAsync(string id);
+    Task<PartnerGetOutputDto> GetAsync(Guid id);
     /// <summary>
     /// 新增合作伙伴
     /// </summary>
-    /// <param name="input">名称、邮箱、电话、启用状态</param>
+    /// <param name="input">名称、联系信息、地址、启用状态</param>
     /// <returns>新建后的详情</returns>
     /// <remarks>
     /// 示例请求：
@@ -43,9 +50,15 @@ public interface IPartnerAppService : IApplicationService
     ///   "partnerName": "Global Foods Inc.",
     ///   "contactEmail": "admin@globalfoods.com",
     ///   "phoneNumber": "+1 (555) 100-2000",
+    ///   "street": "123 Main St",
+    ///   "city": "New York",
+    ///   "stateCode": "NY",
+    ///   "country": "USA",
+    ///   "zipCode": "10001",
     ///   "state": true
     /// }
     /// ```
+    /// 地址中的州/省请传 <c>stateCode</c>（如 NY）；<c>state</c>（boolean）表示是否启用。
     /// </remarks>
     /// <response code="200">成功</response>
     /// <response code="400">校验失败</response>
@@ -56,12 +69,12 @@ public interface IPartnerAppService : IApplicationService
     /// 编辑合作伙伴
     /// </summary>
     /// <param name="id">主键 Id</param>
-    /// <param name="input">名称、邮箱、电话、启用状态</param>
+    /// <param name="input">名称、联系信息、地址、启用状态（字段同新增）</param>
     /// <returns>更新后的详情</returns>
     /// <response code="200">成功</response>
     /// <response code="400">校验失败或记录不存在</response>
     /// <response code="500">服务器错误</response>
-    Task<PartnerGetOutputDto> UpdateAsync(string id, PartnerUpdateInputVo input);
+    Task<PartnerGetOutputDto> UpdateAsync(Guid id, PartnerUpdateInputVo input);
     /// <summary>
     /// 删除合作伙伴（逻辑删除）
@@ -70,7 +83,7 @@ public interface IPartnerAppService : IApplicationService
     /// <response code="200">成功</response>
     /// <response code="400">Id 无效或记录不存在</response>
     /// <response code="500">服务器错误</response>
-    Task DeleteAsync(string id);
+    Task DeleteAsync(Guid id);
     /// <summary>
     /// 按当前列表筛选条件批量导出合作伙伴为 PDF（Account Management「Company」页签；不分页，上限 5000 条）
@@ -78,7 +91,7 @@ public interface IPartnerAppService : IApplicationService
     /// <param name="input">与列表相同的 Keyword、State；分页字段忽略</param>
     /// <returns>PDF 文件流</returns>
     /// <remarks>
-    /// 筛选条件需与 <see cref="GetListAsync"/> 一致，便于统计与导出数据对齐。
+    /// 筛选条件与数据范围需与 <see cref="GetListAsync"/> 完全一致（含 Token 权限：管理员全部公司，其它角色仅绑定门店所属公司；见 PartnerScopeHelper）。
     /// </remarks>
     /// <response code="200">成功返回 application/pdf</response>
     /// <response code="400">参数错误</response>
@@ -14,19 +14,26 @@ public interface IProductAppService : IApplicationService
     /// <summary>
     /// 产品分页列表
     /// </summary>
+    /// <remarks>
+    /// 支持按公司 <c>partnerId</c>、组织 <c>groupId</c>、门店 <c>locationId</c> 筛选：
+    /// 仅返回在 <c>fl_location_product</c> 中关联到匹配门店的产品；三者均未传时不按门店收窄。
+    /// <c>locationId</c> 最优先；传 <c>groupId</c> 时按 Region 对应门店的 Partner+GroupName 匹配。
+    /// </remarks>
     Task<PagedResultWithPageDto<ProductGetListOutputDto>> GetListAsync(ProductGetListInputVo input);
     /// <summary>
     /// 产品详情
     /// </summary>
-    Task<ProductGetOutputDto> GetAsync(string id);
+    /// <param name="id">产品主键（Guid，与 <c>fl_product.Id</c> 一致；使用 Guid 路由约束，避免与 <c>export-*</c> 等字面路径冲突）</param>
+    Task<ProductGetOutputDto> GetAsync(Guid id);
     /// <summary>
     /// 新增产品
     /// </summary>
     /// <remarks>
     /// <see cref="ProductCreateInputVo.ProductCode"/> 可选；为空时后端生成唯一编码（如 PRD_ + Guid）。
-    /// 若 <see cref="ProductCreateInputVo.LocationIds"/> 有值，将在同一事务内批量写入 fl_location_product（一门店一条）。
+    /// 若传 <see cref="ProductCreateInputVo.PartnerId"/>（Company）、<see cref="ProductCreateInputVo.GroupIds"/>（Region）
+    /// 和/或 <see cref="ProductCreateInputVo.LocationIds"/>，合并后写入 fl_location_product。
     /// </remarks>
     Task<ProductGetOutputDto> CreateAsync(ProductCreateInputVo input);
@@ -34,15 +41,15 @@ public interface IProductAppService : IApplicationService
     /// 编辑产品
     /// </summary>
     /// <remarks>
-    /// 当请求体包含 <see cref="ProductCreateInputVo.LocationIds"/> 属性时，按该列表整表替换本产品在各门店的关联；
-    /// 不传该属性则不改门店关联（兼容仅改名称/分类等调用）。
+    /// 当请求体包含 <see cref="ProductCreateInputVo.PartnerId"/>、<see cref="ProductCreateInputVo.GroupIds"/>
+    /// 和/或 <see cref="ProductCreateInputVo.LocationIds"/> 时，合并后整表替换门店关联；均不传则不改。
     /// </remarks>
-    Task<ProductGetOutputDto> UpdateAsync(string id, ProductUpdateInputVo input);
+    Task<ProductGetOutputDto> UpdateAsync(Guid id, ProductUpdateInputVo input);
     /// <summary>
     /// 删除产品（逻辑删除）
     /// </summary>
-    Task DeleteAsync(string id);
+    Task DeleteAsync(Guid id);
     /// <summary>
     /// 下载 Product 批量导入模板（服务器 <c>TemplateDirectory</c> 下 xlsx）
@@ -9,12 +9,21 @@ namespace FoodLabeling.Application.Contracts.IServices;
 /// </summary>
 public interface IProductCategoryAppService : IApplicationService
 {
+    /// <summary>
+    /// 类别分页列表；支持 <c>groupId</c>/<c>locationId</c> 筛选；出参含 <c>region</c>、<c>location</c> 展示字段。
+    /// </summary>
     Task<PagedResultWithPageDto<ProductCategoryGetListOutputDto>> GetListAsync(ProductCategoryGetListInputVo input);
     Task<ProductCategoryGetOutputDto> GetAsync(string id);
+    /// <summary>
+    /// 新增类别；body 传 <c>regionIds</c>（Region 多选）与 <c>locationIds</c>（门店多选）绑定适用范围。
+    /// </summary>
     Task<ProductCategoryGetOutputDto> CreateAsync(ProductCategoryCreateInputVo input);
+    /// <summary>
+    /// 编辑类别；<c>regionIds</c>/<c>locationIds</c> 多选数组规则同新增；传空数组 <c>[]</c> 可清空对应范围。
+    /// </summary>
     Task<ProductCategoryGetOutputDto> UpdateAsync(string id, ProductCategoryUpdateInputVo input);
     Task DeleteAsync(string id);
 using FoodLabeling.Application.Contracts.Dtos.UsAppAuth;
 using Volo.Abp.Application.Services;
+using Yi.Framework.Rbac.Application.Contracts.Dtos.Account;
 namespace FoodLabeling.Application.Contracts.IServices;
@@ -48,4 +49,26 @@ public interface IUsAppAuthAppService : IApplicationService
     /// <response code="400">参数非法、未绑定或无权限</response>
     /// <response code="500">服务器错误</response>
     Task<UsAppLocationDetailOutputDto> GetLocationDetailAsync(string locationId);
+
+    /// <summary>
+    /// App forgot password: send email verification code (same user store and rules as platform).
+    /// </summary>
+    /// <remarks>
+    /// When <c>RbacOptions.EnableCaptcha</c> is true, pass <c>Uuid</c> and <c>Code</c> from platform captcha API.
+    /// </remarks>
+    /// <param name="input">Email and optional image captcha.</param>
+    /// <response code="200">Accepted.</response>
+    /// <response code="400">Validation or rate limit.</response>
+    /// <response code="500">Server error</response>
+    Task PostSendForgotPasswordCodeByEmailAsync(EmailCaptchaImageDto input);
+
+    /// <summary>
+    /// App forgot password: reset password with email OTP.
+    /// </summary>
+    /// <param name="input">Email, OTP, new password.</param>
+    /// <returns>Account user name.</returns>
+    /// <response code="200">Password updated.</response>
+    /// <response code="400">Invalid code or password policy.</response>
+    /// <response code="500">Server error</response>
+    Task<string> PostResetPasswordByEmailAsync(RetrievePasswordByEmailDto input);
 }
@@ -9,6 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\framework\Yi.Framework.Ddd.Application\Yi.Framework.Ddd.Application.csproj" />
+    <ProjectReference Include="..\..\rbac\Yi.Framework.Rbac.Application.Contracts\Yi.Framework.Rbac.Application.Contracts.csproj" />
     <ProjectReference Include="..\FoodLabeling.Application.Contracts\FoodLabeling.Application.Contracts.csproj" />
     <ProjectReference Include="..\FoodLabeling.Domain\FoodLabeling.Domain.csproj" />
     <ProjectReference Include="..\..\rbac\Yi.Framework.Rbac.Domain\Yi.Framework.Rbac.Domain.csproj" />
@@ -50,6 +50,12 @@ public class AuthSessionAppService : ApplicationService, IAuthSessionAppService
             throw new UserFriendlyException("用户不存在");
         }
+        var userRoleIds = await _dbContext.SqlSugarClient.Queryable<UserRoleEntity>()
+            .Where(x => x.UserId == userId)
+            .Select(x => x.RoleId)
+            .ToListAsync();
+        var distinctUserRoleIds = userRoleIds.Distinct().ToList();
+
         List<MenuDbEntity> menus;
         if (UserConst.Admin.Equals(user.UserName))
         {
@@ -60,12 +66,7 @@ public class AuthSessionAppService : ApplicationService, IAuthSessionAppService
         }
         else
         {
-            var roleIds = await _dbContext.SqlSugarClient.Queryable<UserRoleEntity>()
-                .Where(x => x.UserId == userId)
-                .Select(x => x.RoleId)
-                .ToListAsync();
-
-            var roleIdStrs = roleIds.Select(x => x.ToString()).Distinct().ToList();
+            var roleIdStrs = distinctUserRoleIds.Select(x => x.ToString()).Distinct().ToList();
             if (roleIdStrs.Count == 0)
             {
                 menus = new List<MenuDbEntity>();
@@ -92,10 +93,11 @@ public class AuthSessionAppService : ApplicationService, IAuthSessionAppService
             .ThenBy(x => x.MenuName)
             .ToList();
-        // 注意：查询 RoleAggregateRoot 会触发 YiRbacDbContext 的 IDataPermission 过滤，
+        // 注意：经仓储查询 RoleAggregateRoot 会触发 YiRbacDbContext 的 IDataPermission 过滤，
         // 其表达式包含 roleInfo.Select(...).Contains(...)，在当前 SqlSugar 版本下会报“不支持 Select”。
-        // 这里直接使用 JWT 中的角色码（CurrentUser.Roles）返回，避免触发过滤器。
+        // 角色展示名使用 RoleDbEntity 直查 Role 表；角色编码列表仍用 JWT（CurrentUser.Roles），与原先 RoleCodes 行为一致。
         var roleCodes = CurrentUser.Roles?.ToList() ?? new List<string>();
+        var roleDisplay = await BuildRoleDisplayAsync(distinctUserRoleIds, roleCodes);
         var permissionCodes = menuNodes
             .Where(x => !string.IsNullOrWhiteSpace(x.PermissionCode))
@@ -116,7 +118,10 @@ public class AuthSessionAppService : ApplicationService, IAuthSessionAppService
             },
             RoleCodes = roleCodes.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).Distinct().OrderBy(x => x).ToList(),
             PermissionCodes = permissionCodes,
-            Menus = BuildMenuTree(menuNodes)
+            Menus = BuildMenuTree(menuNodes),
+            LastUpdated = user.LastModificationTime,
+            Role = roleDisplay,
+            FullName = BuildFullName(user)
         };
     }
@@ -133,6 +138,67 @@ public class AuthSessionAppService : ApplicationService, IAuthSessionAppService
         return true;
     }
+    private static string BuildFullName(UserAggregateRoot user)
+    {
+        if (!string.IsNullOrWhiteSpace(user.Name))
+        {
+            return user.Name.Trim();
+        }
+
+        if (!string.IsNullOrWhiteSpace(user.Nick))
+        {
+            return user.Nick.Trim();
+        }
+
+        return user.UserName ?? string.Empty;
+    }
+
+    private async Task<string> BuildRoleDisplayAsync(
+        IReadOnlyList<Guid> userRoleIds,
+        IReadOnlyList<string> jwtRoleCodes)
+    {
+        var names = new List<string>();
+        if (userRoleIds.Count > 0)
+        {
+            names = await _dbContext.SqlSugarClient.Queryable<RoleDbEntity>()
+                .Where(r => !r.IsDeleted && userRoleIds.Contains(r.Id))
+                .OrderBy(r => r.RoleName)
+                .Select(r => r.RoleName)
+                .ToListAsync();
+        }
+
+        if (names.Count == 0 && jwtRoleCodes.Count > 0)
+        {
+            var codes = jwtRoleCodes
+                .Where(x => !string.IsNullOrWhiteSpace(x))
+                .Select(x => x.Trim())
+                .Distinct()
+                .ToList();
+            names = await _dbContext.SqlSugarClient.Queryable<RoleDbEntity>()
+                .Where(r => !r.IsDeleted && codes.Contains(r.RoleCode))
+                .OrderBy(r => r.RoleName)
+                .Select(r => r.RoleName)
+                .ToListAsync();
+        }
+
+        var distinctNames = names
+            .Where(n => !string.IsNullOrWhiteSpace(n))
+            .Select(n => n.Trim())
+            .Distinct()
+            .ToList();
+        if (distinctNames.Count > 0)
+        {
+            return string.Join(", ", distinctNames);
+        }
+
+        var fallbackCodes = jwtRoleCodes
+            .Where(x => !string.IsNullOrWhiteSpace(x))
+            .Select(x => x.Trim())
+            .Distinct()
+            .ToList();
+        return fallbackCodes.Count > 0 ? string.Join(", ", fallbackCodes) : string.Empty;
+    }
+
     private static List<CurrentUserMenuNodeDto> BuildMenuTree(List<CurrentUserMenuNodeDto> flat)
     {
         var nodes = flat
@@ -36,6 +36,21 @@ public class FlPartnerDbEntity
     /// </summary>
     public string? PhoneNumber { get; set; }
+    public string? Street { get; set; }
+
+    public string? City { get; set; }
+
+    /// <summary>
+    /// 州/省代码（如 NY）；勿与启用状态字段 <see cref="State"/> 混淆
+    /// </summary>
+    [SugarColumn(ColumnName = "StateCode")]
+    public string? StateCode { get; set; }
+
+    public string? Country { get; set; }
+
+    [SugarColumn(ColumnName = "ZipCode")]
+    public string? ZipCode { get; set; }
+
     /// <summary>
     /// 是否启用（对应 UI Active）
     /// </summary>
@@ -36,13 +36,13 @@ public class GroupAppService : ApplicationService, IGroupAppService
     public async Task<PagedResultWithPageDto<GroupGetListOutputDto>> GetListAsync(GroupGetListInputVo input)
     {
         RefAsync<int> total = 0;
-        var query = BuildGroupJoinedQuery(input);
+        var query = await BuildGroupJoinedQueryAsync(input);
         var projected = query.Select((g, p) => new GroupGetListOutputDto
         {
             Id = g.Id,
             GroupName = g.GroupName,
             PartnerId = g.PartnerId,
-            PartnerName = string.IsNullOrWhiteSpace(p.PartnerName) ? "无" : p.PartnerName.Trim(),
+            PartnerName = string.IsNullOrWhiteSpace(p.PartnerName) ? "None" : p.PartnerName.Trim(),
             State = g.State,
             CreationTime = g.CreationTime
         });
@@ -52,19 +52,19 @@ public class GroupAppService : ApplicationService, IGroupAppService
     }
     /// <inheritdoc />
-    public async Task<GroupGetOutputDto> GetAsync(string id)
+    public async Task<GroupGetOutputDto> GetAsync(Guid id)
     {
-        var groupId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(groupId))
+        if (id == Guid.Empty)
         {
-            throw new UserFriendlyException("组织Id不能为空");
+            throw new UserFriendlyException("Group id is required.");
         }
+        var groupId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlGroupDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == groupId);
         if (entity is null)
         {
-            throw new UserFriendlyException("组织不存在");
+            throw new UserFriendlyException("Group not found.");
         }
         var partnerName = await ResolvePartnerNameAsync(entity.PartnerId);
@@ -78,13 +78,13 @@ public class GroupAppService : ApplicationService, IGroupAppService
         var name = input.GroupName?.Trim();
         if (string.IsNullOrWhiteSpace(name))
         {
-            throw new UserFriendlyException("组织名称不能为空");
+            throw new UserFriendlyException("Region name is required.");
         }
         var partnerId = input.PartnerId?.Trim();
         if (string.IsNullOrWhiteSpace(partnerId))
         {
-            throw new UserFriendlyException("请选择所属合作伙伴");
+            throw new UserFriendlyException("Parent company is required.");
         }
         await EnsurePartnerExistsAsync(partnerId);
@@ -104,36 +104,36 @@ public class GroupAppService : ApplicationService, IGroupAppService
         };
         await _dbContext.SqlSugarClient.Insertable(entity).ExecuteCommandAsync();
-        return await GetAsync(entity.Id);
+        return await GetAsync(Guid.Parse(entity.Id));
     }
     /// <inheritdoc />
     [UnitOfWork]
-    public async Task<GroupGetOutputDto> UpdateAsync(string id, GroupUpdateInputVo input)
+    public async Task<GroupGetOutputDto> UpdateAsync(Guid id, GroupUpdateInputVo input)
     {
-        var groupId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(groupId))
+        if (id == Guid.Empty)
         {
-            throw new UserFriendlyException("组织Id不能为空");
+            throw new UserFriendlyException("Group id is required.");
         }
+        var groupId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlGroupDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == groupId);
         if (entity is null)
         {
-            throw new UserFriendlyException("组织不存在");
+            throw new UserFriendlyException("Group not found.");
         }
         var name = input.GroupName?.Trim();
         if (string.IsNullOrWhiteSpace(name))
         {
-            throw new UserFriendlyException("组织名称不能为空");
+            throw new UserFriendlyException("Region name is required.");
         }
         var partnerId = input.PartnerId?.Trim();
         if (string.IsNullOrWhiteSpace(partnerId))
         {
-            throw new UserFriendlyException("请选择所属合作伙伴");
+            throw new UserFriendlyException("Parent company is required.");
         }
         await EnsurePartnerExistsAsync(partnerId);
@@ -145,24 +145,24 @@ public class GroupAppService : ApplicationService, IGroupAppService
         entity.LastModifierId = CurrentUser?.Id?.ToString();
         await _dbContext.SqlSugarClient.Updateable(entity).ExecuteCommandAsync();
-        return await GetAsync(groupId);
+        return await GetAsync(id);
     }
     /// <inheritdoc />
     [UnitOfWork]
-    public async Task DeleteAsync(string id)
+    public async Task DeleteAsync(Guid id)
     {
-        var groupId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(groupId))
+        if (id == Guid.Empty)
         {
-            throw new UserFriendlyException("组织Id不能为空");
+            throw new UserFriendlyException("Group id is required.");
         }
+        var groupId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlGroupDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == groupId);
         if (entity is null)
         {
-            throw new UserFriendlyException("组织不存在");
+            throw new UserFriendlyException("Group not found.");
         }
         entity.IsDeleted = true;
@@ -172,24 +172,26 @@ public class GroupAppService : ApplicationService, IGroupAppService
     }
     /// <inheritdoc />
-    public async Task<IActionResult> ExportPdfAsync(GroupGetListInputVo input)
+    [HttpGet]
+    public async Task<IActionResult> ExportPdfAsync([FromQuery] GroupGetListInputVo input)
     {
         QuestPDF.Settings.License = LicenseType.Community;
-        var exportBase = BuildGroupJoinedQuery(input);
+        var exportBase = await BuildGroupJoinedQueryAsync(input);
         var count = await exportBase.CountAsync();
         if (count > ExportPdfMaxRows)
         {
-            throw new UserFriendlyException($"导出数据超过上限 {ExportPdfMaxRows} 条，请缩小筛选范围");
+            throw new UserFriendlyException(
+                $"Export exceeds the maximum of {ExportPdfMaxRows} rows. Narrow your filters and try again.");
         }
-        var rows = await BuildGroupJoinedQuery(input)
+        var rows = await (await BuildGroupJoinedQueryAsync(input))
             .Select((g, p) => new GroupGetListOutputDto
             {
                 Id = g.Id,
                 GroupName = g.GroupName,
                 PartnerId = g.PartnerId,
-                PartnerName = string.IsNullOrWhiteSpace(p.PartnerName) ? "无" : p.PartnerName.Trim(),
+                PartnerName = string.IsNullOrWhiteSpace(p.PartnerName) ? "None" : p.PartnerName.Trim(),
                 State = g.State,
                 CreationTime = g.CreationTime
             })
@@ -228,7 +230,7 @@ public class GroupAppService : ApplicationService, IGroupAppService
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5)
                             .Text(e.GroupName ?? string.Empty);
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5)
-                            .Text(string.IsNullOrWhiteSpace(e.PartnerName) ? "无" : e.PartnerName);
+                            .Text(string.IsNullOrWhiteSpace(e.PartnerName) ? "None" : e.PartnerName);
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5).Text(status);
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5)
                             .Text(e.CreationTime.ToString("yyyy-MM-dd HH:mm"));
@@ -243,14 +245,21 @@ public class GroupAppService : ApplicationService, IGroupAppService
         return new FileStreamResult(stream, "application/pdf") { FileDownloadName = fileName };
     }
-    private ISugarQueryable<FlGroupDbEntity, FlPartnerDbEntity> BuildGroupJoinedQuery(GroupGetListInputVo input)
+    private async Task<ISugarQueryable<FlGroupDbEntity, FlPartnerDbEntity>> BuildGroupJoinedQueryAsync(
+        GroupGetListInputVo input)
     {
+        var scope = await PartnerScopeHelper.ResolveGroupScopeAsync(CurrentUser, _dbContext);
+
         var keyword = input.Keyword?.Trim();
         var partnerId = input.PartnerId?.Trim();
         var query = _dbContext.SqlSugarClient.Queryable<FlGroupDbEntity>()
             .LeftJoin<FlPartnerDbEntity>((g, p) => g.PartnerId == p.Id && !p.IsDeleted)
-            .Where((g, p) => !g.IsDeleted)
+            .Where((g, p) => !g.IsDeleted);
+
+        query = PartnerScopeHelper.ApplyGroupScope(query, scope);
+
+        query = query
             .WhereIF(input.State != null, (g, p) => g.State == input.State)
             .WhereIF(!string.IsNullOrWhiteSpace(partnerId), (g, p) => g.PartnerId == partnerId)
             .WhereIF(!string.IsNullOrWhiteSpace(keyword),
@@ -311,7 +320,7 @@ public class GroupAppService : ApplicationService, IGroupAppService
             .AnyAsync(x => !x.IsDeleted && x.Id == partnerId);
         if (!ok)
         {
-            throw new UserFriendlyException("所选合作伙伴不存在或已删除");
+            throw new UserFriendlyException("The selected company does not exist or has been removed.");
         }
     }
@@ -321,7 +330,7 @@ public class GroupAppService : ApplicationService, IGroupAppService
             .FirstAsync(x => !x.IsDeleted && x.Id == partnerId);
         if (p is null || string.IsNullOrWhiteSpace(p.PartnerName))
         {
-            return "无";
+            return "None";
         }
         return p.PartnerName.Trim();
@@ -34,6 +34,7 @@ public class LabelAppService : ApplicationService, ILabelAppService
         RefAsync<int> total = 0;
         var productId = input.ProductId?.Trim();
+        var groupId = input.GroupId?.Trim();
         var locationId = input.LocationId?.Trim();
         var keyword = input.Keyword?.Trim();
         var labelCategoryId = input.LabelCategoryId?.Trim();
@@ -45,7 +46,6 @@ public class LabelAppService : ApplicationService, ILabelAppService
         var labelIdsQuery = _dbContext.SqlSugarClient.Queryable<FlLabelDbEntity>()
             .Where(l => !l.IsDeleted)
-            .WhereIF(!string.IsNullOrWhiteSpace(locationId), l => l.LocationId == locationId)
             .WhereIF(!string.IsNullOrWhiteSpace(labelCategoryId), l => l.LabelCategoryId == labelCategoryId)
             .WhereIF(!string.IsNullOrWhiteSpace(labelTypeId), l => l.LabelTypeId == labelTypeId)
             .WhereIF(input.State != null, l => l.State == input.State);
@@ -58,6 +58,15 @@ public class LabelAppService : ApplicationService, ILabelAppService
                 .Select((l, tpl) => l);
         }
+        var scopedLocationIds = await LocationScopeBindingHelper.ResolveScopedLocationIdsAsync(
+            _dbContext.SqlSugarClient, groupId, locationId);
+        if (scopedLocationIds is not null)
+        {
+            labelIdsQuery = scopedLocationIds.Count == 0
+                ? labelIdsQuery.Where(_ => false)
+                : labelIdsQuery.Where(l => scopedLocationIds.Contains(l.LocationId));
+        }
+
         // 按产品筛选：存在 label-product 关联即可
         if (!string.IsNullOrWhiteSpace(productId))
         {
@@ -259,12 +268,25 @@ public class LabelAppService : ApplicationService, ILabelAppService
             labelInfo = JsonSerializer.Deserialize<object>(label.LabelInfoJson);
         }
+        var locationId = label.LocationId ?? string.Empty;
+        var locationIdList = string.IsNullOrWhiteSpace(locationId)
+            ? new List<string>()
+            : new List<string> { locationId.Trim() };
+        var partnerIds = await LocationScopeBindingHelper.ResolvePartnerIdsFromLocationIdsAsync(
+            _dbContext.SqlSugarClient, locationIdList);
+        var regionIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+            _dbContext.SqlSugarClient, locationIdList);
+
         return new LabelGetOutputDto
         {
             Id = label.LabelCode ?? string.Empty,
             LabelName = label.LabelName,
-            LocationId = label.LocationId ?? string.Empty,
+            LocationId = locationId,
             LocationName = location?.LocationName ?? location?.LocationCode ?? "无",
+            PartnerId = partnerIds.Count > 0 ? partnerIds[0] : null,
+            PartnerIds = partnerIds,
+            RegionIds = regionIds,
+            GroupIds = regionIds,
             LabelCategoryId = label.LabelCategoryId ?? string.Empty,
             LabelCategoryName = category?.CategoryName ?? "无",
             LabelTypeId = label.LabelTypeId ?? string.Empty,
@@ -301,10 +323,6 @@ public class LabelAppService : ApplicationService, ILabelAppService
         {
             throw new UserFriendlyException("模板编码不能为空");
         }
-        if (string.IsNullOrWhiteSpace(input.LocationId))
-        {
-            throw new UserFriendlyException("门店Id不能为空");
-        }
         if (string.IsNullOrWhiteSpace(input.LabelCategoryId))
         {
             throw new UserFriendlyException("标签分类Id不能为空");
@@ -314,6 +332,8 @@ public class LabelAppService : ApplicationService, ILabelAppService
             throw new UserFriendlyException("标签类型Id不能为空");
         }
+        var resolvedLocationId = await ResolveLabelLocationIdForSaveAsync(input);
+
         var template = await _dbContext.SqlSugarClient.Queryable<FlLabelTemplateDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.TemplateCode == input.TemplateCode.Trim());
         if (template is null)
@@ -344,7 +364,7 @@ public class LabelAppService : ApplicationService, ILabelAppService
             LabelCode = labelCode,
             LabelName = labelName,
             TemplateId = template.Id,
-            LocationId = input.LocationId?.Trim(),
+            LocationId = resolvedLocationId,
             LabelCategoryId = input.LabelCategoryId?.Trim(),
             LabelTypeId = input.LabelTypeId?.Trim(),
             State = input.State,
@@ -363,6 +383,9 @@ public class LabelAppService : ApplicationService, ILabelAppService
         }).ToList();
         await _dbContext.SqlSugarClient.Insertable(rows).ExecuteCommandAsync();
+        await LabelCategoryAppService.TouchLabelCategoryLastEditedAsync(
+            _dbContext, labelEntity.LabelCategoryId, CurrentUser?.Id?.ToString());
+
         return await GetAsync(labelCode);
     }
@@ -391,10 +414,6 @@ public class LabelAppService : ApplicationService, ILabelAppService
         {
             throw new UserFriendlyException("模板编码不能为空");
         }
-        if (string.IsNullOrWhiteSpace(input.LocationId))
-        {
-            throw new UserFriendlyException("门店Id不能为空");
-        }
         if (string.IsNullOrWhiteSpace(input.LabelCategoryId))
         {
             throw new UserFriendlyException("标签分类Id不能为空");
@@ -404,6 +423,8 @@ public class LabelAppService : ApplicationService, ILabelAppService
             throw new UserFriendlyException("标签类型Id不能为空");
         }
+        var resolvedLocationId = await ResolveLabelLocationIdForSaveAsync(input);
+
         var template = await _dbContext.SqlSugarClient.Queryable<FlLabelTemplateDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.TemplateCode == input.TemplateCode.Trim());
         if (template is null)
@@ -411,10 +432,11 @@ public class LabelAppService : ApplicationService, ILabelAppService
             throw new UserFriendlyException("模板不存在");
         }
+        var oldCategoryId = label.LabelCategoryId;
         var now = DateTime.Now;
         label.LabelName = input.LabelName?.Trim() ?? label.LabelName;
         label.TemplateId = template.Id;
-        label.LocationId = input.LocationId?.Trim();
+        label.LocationId = resolvedLocationId;
         label.LabelCategoryId = input.LabelCategoryId?.Trim();
         label.LabelTypeId = input.LabelTypeId?.Trim();
         label.State = input.State;
@@ -438,6 +460,15 @@ public class LabelAppService : ApplicationService, ILabelAppService
         }).ToList();
         await _dbContext.SqlSugarClient.Insertable(rows).ExecuteCommandAsync();
+        var newCategoryId = label.LabelCategoryId;
+        await LabelCategoryAppService.TouchLabelCategoryLastEditedAsync(
+            _dbContext, newCategoryId, CurrentUser?.Id?.ToString());
+        if (!string.Equals(oldCategoryId, newCategoryId, StringComparison.Ordinal))
+        {
+            await LabelCategoryAppService.TouchLabelCategoryLastEditedAsync(
+                _dbContext, oldCategoryId, CurrentUser?.Id?.ToString());
+        }
+
         return await GetAsync(labelCode);
     }
@@ -465,6 +496,9 @@ public class LabelAppService : ApplicationService, ILabelAppService
         await _dbContext.SqlSugarClient.Deleteable<FlLabelProductDbEntity>()
             .Where(x => x.LabelId == label.Id)
             .ExecuteCommandAsync();
+
+        await LabelCategoryAppService.TouchLabelCategoryLastEditedAsync(
+            _dbContext, label.LabelCategoryId, CurrentUser?.Id?.ToString());
     }
     /// <summary>
@@ -730,5 +764,86 @@ public class LabelAppService : ApplicationService, ILabelAppService
             Elements = resolvedElements
         };
     }
+
+    private Task<string> ResolveLabelLocationIdForSaveAsync(LabelUpdateInputVo input) =>
+        ResolveLabelLocationIdForSaveAsync(new LabelCreateInputVo
+        {
+            PartnerId = input.PartnerId,
+            PartnerIds = input.PartnerIds,
+            RegionIds = input.RegionIds,
+            GroupIds = input.GroupIds,
+            LocationId = input.LocationId,
+            LocationIds = input.LocationIds
+        });
+
+    /// <summary>
+    /// 标签仅绑定单门店：解析 Company/Region/门店入参为唯一 <c>location.Id</c>。
+    /// </summary>
+    private async Task<string> ResolveLabelLocationIdForSaveAsync(LabelCreateInputVo input)
+    {
+        var partnerIds = NormalizePartnerIds(input);
+        var regionIds = NormalizeRegionIds(input);
+        var explicitLocationId = input.LocationId?.Trim();
+        var explicitLocationIds = LocationScopeBindingHelper.NormalizeIds(input.LocationIds);
+
+        var merged = await LocationScopeBindingHelper.MergeToLocationIdsAsync(
+            _dbContext.SqlSugarClient, partnerIds, regionIds, explicitLocationIds);
+
+        if (!string.IsNullOrWhiteSpace(explicitLocationId))
+        {
+            if (merged.Count > 0 && !merged.Contains(explicitLocationId, StringComparer.Ordinal))
+            {
+                throw new UserFriendlyException("所选门店不在指定公司/区域范围内");
+            }
+
+            await LocationScopeBindingHelper.ValidateLocationIdsExistAsync(
+                _dbContext.SqlSugarClient, new List<string> { explicitLocationId });
+            return explicitLocationId;
+        }
+
+        if (merged.Count == 0)
+        {
+            throw new UserFriendlyException("须指定门店 locationId，或选择公司/区域以解析出门店");
+        }
+
+        if (merged.Count > 1)
+        {
+            throw new UserFriendlyException("所选公司/区域对应多个门店，请显式指定 locationId");
+        }
+
+        return merged[0];
+    }
+
+    private static List<string> NormalizePartnerIds(LabelCreateInputVo input)
+    {
+        var merged = new HashSet<string>(StringComparer.Ordinal);
+        if (!string.IsNullOrWhiteSpace(input.PartnerId))
+        {
+            merged.Add(input.PartnerId.Trim());
+        }
+
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.PartnerIds))
+        {
+            merged.Add(id);
+        }
+
+        return merged.OrderBy(x => x, StringComparer.Ordinal).ToList();
+    }
+
+    private static List<string> NormalizeRegionIds(LabelCreateInputVo input)
+    {
+        var merged = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.RegionIds))
+        {
+            merged.Add(id);
+        }
+
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.GroupIds))
+        {
+            merged.Add(id);
+        }
+
+        return merged.OrderBy(x => x, StringComparer.Ordinal).ToList();
+    }
 }
@@ -3,6 +3,7 @@ using FoodLabeling.Application.Contracts.Dtos.Common;
 using FoodLabeling.Application.Contracts.Dtos.LabelCategory;
 using FoodLabeling.Application.Contracts.IServices;
 using FoodLabeling.Application.Services.DbModels;
+using FoodLabeling.Domain.Entities;
 using SqlSugar;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
@@ -34,6 +35,8 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
                      (x.DisplayText != null && x.DisplayText.Contains(keyword!)))
             .WhereIF(input.State != null, x => x.State == input.State);
+        query = await ApplyCategoryScopeFilterAsync(query, input.GroupId, input.LocationId);
+
         // Sorting 仅允许白名单字段，避免 Unknown column/注入风险
         if (!string.IsNullOrWhiteSpace(input.Sorting))
         {
@@ -67,57 +70,33 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
         var entities = await query.ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
         var ids = entities.Select(x => x.Id).ToList();
-        Dictionary<string, List<string>> locationIdsMap = new();
-        if (ids.Count > 0)
-        {
-            var locRows = await _dbContext.SqlSugarClient.Queryable<FlLabelCategoryLocationDbEntity>()
-                .Where(x => ids.Contains(x.CategoryId))
-                .Select(x => new { x.CategoryId, x.LocationId })
-                .ToListAsync();
-            foreach (var row in locRows)
-            {
-                var cid = row.CategoryId?.Trim();
-                var lid = row.LocationId?.Trim();
-                if (string.IsNullOrWhiteSpace(cid) || string.IsNullOrWhiteSpace(lid))
-                {
-                    continue;
-                }
-
-                if (!locationIdsMap.TryGetValue(cid, out var list))
-                {
-                    list = new List<string>();
-                    locationIdsMap[cid] = list;
-                }
+        var labelStatsMap = await BuildCategoryLabelStatsMapAsync(ids);
+        var scopeMap = await BuildCategoryScopeMapAsync(entities);
-                if (!list.Contains(lid))
-                {
-                    list.Add(lid);
-                }
-            }
-        }
-
-        var countRows = await _dbContext.SqlSugarClient.Queryable<FlLabelDbEntity>()
-            .Where(x => !x.IsDeleted)
-            .Where(x => x.LabelCategoryId != null && ids.Contains(x.LabelCategoryId))
-            .GroupBy(x => x.LabelCategoryId)
-            .Select(x => new { CategoryId = x.LabelCategoryId, Count = SqlFunc.AggregateCount(x.Id) })
-            .ToListAsync();
-        var countMap = countRows.ToDictionary(x => x.CategoryId!, x => (long)x.Count);
-
-        var items = entities.Select(x => new LabelCategoryGetListOutputDto
+        var items = entities.Select(x =>
         {
-            Id = x.Id,
-            CategoryCode = x.CategoryCode,
-            CategoryName = x.CategoryName,
-            DisplayText = x.DisplayText,
-            CategoryPhotoUrl = x.CategoryPhotoUrl,
-            State = x.State,
-            ButtonAppearance = x.ButtonAppearance,
-            AvailabilityType = x.AvailabilityType,
-            LocationIds = locationIdsMap.TryGetValue(x.Id, out var lids) ? lids : new List<string>(),
-            OrderNum = x.OrderNum,
-            NoOfLabels = countMap.TryGetValue(x.Id, out var count) ? count : 0,
-            LastEdited = x.LastModificationTime ?? x.CreationTime
+            scopeMap.TryGetValue(x.Id, out var scope);
+            labelStatsMap.TryGetValue(x.Id, out var labelStats);
+            var creationTime = ResolveCategoryCreationTime(x);
+            return new LabelCategoryGetListOutputDto
+            {
+                Id = x.Id,
+                CategoryCode = x.CategoryCode,
+                CategoryName = x.CategoryName,
+                DisplayText = x.DisplayText,
+                CategoryPhotoUrl = x.CategoryPhotoUrl,
+                State = x.State,
+                ButtonAppearance = x.ButtonAppearance,
+                AvailabilityType = x.AvailabilityType,
+                OrderNum = x.OrderNum,
+                NoOfLabels = labelStats?.Count ?? 0,
+                CreationTime = creationTime,
+                LastEdited = ResolveLastEdited(x, creationTime, labelStats),
+                Region = scope?.Region ?? string.Empty,
+                Location = scope?.Location ?? string.Empty,
+                RegionIds = scope?.RegionIds ?? new List<string>(),
+                LocationIds = scope?.LocationIds ?? new List<string>()
+            };
         }).ToList();
         return BuildPagedResult(input.SkipCount, input.MaxResultCount, total, items);
@@ -139,7 +118,11 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
                 .Where(x => x.CategoryId == entity.Id)
                 .Select(x => x.LocationId)
                 .ToListAsync();
-            dto.LocationIds = locationIds?.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).Distinct().ToList() ?? new();
+            dto.LocationIds = LocationScopeBindingHelper.NormalizeIds(locationIds);
+            var regionIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+                _dbContext.SqlSugarClient, dto.LocationIds);
+            dto.RegionIds = regionIds;
+            dto.GroupIds = regionIds;
         }
         return dto;
@@ -156,9 +139,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
         var displayText = input.DisplayText?.Trim();
         var appearance = CategoryAppearanceStorageHelper.NormalizeButtonAppearanceForStorage(input.ButtonAppearance);
-        var availabilityType = (input.AvailabilityType ?? "ALL").Trim().ToUpperInvariant();
-        var locationIds = NormalizeLocationIds(input.LocationIds);
-        ValidateAvailabilityTypeAndLocations(availabilityType, locationIds);
+        var (availabilityType, mergedLocationIds) = await ResolveCategoryScopeForSaveAsync(input);
         var duplicated = await _dbContext.SqlSugarClient.Queryable<FlLabelCategoryDbEntity>()
             .AnyAsync(x => !x.IsDeleted && (x.CategoryCode == code || x.CategoryName == name));
@@ -172,6 +153,12 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
         var entity = new FlLabelCategoryDbEntity
         {
             Id = _guidGenerator.Create().ToString(),
+            IsDeleted = false,
+            CreationTime = now,
+            CreatorId = currentUserId,
+            LastModificationTime = now,
+            LastModifierId = currentUserId,
+            ConcurrencyStamp = _guidGenerator.Create().ToString("N"),
             CategoryCode = code,
             CategoryName = name,
             DisplayText = string.IsNullOrWhiteSpace(displayText) ? null : displayText,
@@ -183,7 +170,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
         };
         await _dbContext.SqlSugarClient.Insertable(entity).ExecuteCommandAsync();
-        await SaveCategoryLocationsAsync(entity.Id, availabilityType, locationIds, currentUserId, now);
+        await SaveCategoryLocationsAsync(entity.Id, availabilityType, mergedLocationIds, currentUserId, now);
         return await GetAsync(entity.Id);
     }
@@ -205,9 +192,7 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
         var displayText = input.DisplayText?.Trim();
         var appearance = CategoryAppearanceStorageHelper.NormalizeButtonAppearanceForStorage(input.ButtonAppearance);
-        var availabilityType = (input.AvailabilityType ?? "ALL").Trim().ToUpperInvariant();
-        var locationIds = NormalizeLocationIds(input.LocationIds);
-        ValidateAvailabilityTypeAndLocations(availabilityType, locationIds);
+        var (availabilityType, mergedLocationIds) = await ResolveCategoryScopeForSaveAsync(input);
         var duplicated = await _dbContext.SqlSugarClient.Queryable<FlLabelCategoryDbEntity>()
             .AnyAsync(x => !x.IsDeleted && x.Id != id && (x.CategoryCode == code || x.CategoryName == name));
@@ -228,7 +213,8 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
         entity.LastModifierId = CurrentUser?.Id?.ToString();
         await _dbContext.SqlSugarClient.Updateable(entity).ExecuteCommandAsync();
-        await SaveCategoryLocationsAsync(entity.Id, availabilityType, locationIds, entity.LastModifierId, entity.LastModificationTime ?? DateTime.Now);
+        await SaveCategoryLocationsAsync(entity.Id, availabilityType, mergedLocationIds, entity.LastModifierId,
+            entity.LastModificationTime ?? DateTime.Now);
         return await GetAsync(id);
     }
@@ -270,26 +256,299 @@ public class LabelCategoryAppService : ApplicationService, ILabelCategoryAppServ
         };
     }
-    private static void ValidateAvailabilityTypeAndLocations(string availabilityType, List<string> locationIds)
+    private async Task<(string AvailabilityType, List<string> LocationIds)> ResolveCategoryScopeForSaveAsync(
+        LabelCategoryCreateInputVo input)
     {
+        var regionIds = NormalizeRegionIds(input);
+        var explicitLocationIds = LocationScopeBindingHelper.NormalizeIds(input.LocationIds);
+        var availabilityType = (input.AvailabilityType ?? "ALL").Trim().ToUpperInvariant();
+
+        var hasScopeArrays = input.RegionIds is not null || input.GroupIds is not null || input.LocationIds is not null;
+        if (regionIds.Count > 0 || explicitLocationIds.Count > 0)
+        {
+            availabilityType = "SPECIFIED";
+        }
+        else if (hasScopeArrays && string.Equals(availabilityType, "ALL", StringComparison.OrdinalIgnoreCase))
+        {
+            availabilityType = "ALL";
+        }
+
         if (availabilityType != "ALL" && availabilityType != "SPECIFIED")
         {
             throw new UserFriendlyException("门店可用范围不合法（ALL/SPECIFIED）");
         }
-        if (availabilityType == "SPECIFIED" && locationIds.Count == 0)
+        if (availabilityType == "ALL")
         {
-            throw new UserFriendlyException("指定门店范围时必须至少选择一个门店");
+            return ("ALL", new List<string>());
         }
+
+        var merged = await LocationScopeBindingHelper.MergeToLocationIdsAsync(
+            _dbContext.SqlSugarClient, (IReadOnlyList<string>?)null, regionIds, explicitLocationIds);
+        if (merged.Count == 0)
+        {
+            throw new UserFriendlyException("指定适用区域或门店时，至少需要匹配到一个有效门店");
+        }
+
+        await LocationScopeBindingHelper.ValidateLocationIdsExistAsync(_dbContext.SqlSugarClient, merged);
+        return ("SPECIFIED", merged);
+    }
+
+    private static List<string> NormalizeRegionIds(LabelCategoryCreateInputVo input)
+    {
+        var merged = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.RegionIds))
+        {
+            merged.Add(id);
+        }
+
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.GroupIds))
+        {
+            merged.Add(id);
+        }
+
+        return merged.OrderBy(x => x, StringComparer.Ordinal).ToList();
+    }
+
+    private async Task<ISugarQueryable<FlLabelCategoryDbEntity>> ApplyCategoryScopeFilterAsync(
+        ISugarQueryable<FlLabelCategoryDbEntity> query,
+        string? groupId,
+        string? locationId)
+    {
+        var scopeLocIds = await LocationScopeBindingHelper.ResolveScopedLocationIdsAsync(
+            _dbContext.SqlSugarClient, groupId, locationId);
+        if (scopeLocIds is null)
+        {
+            return query;
+        }
+
+        if (scopeLocIds.Count == 0)
+        {
+            return query.Where(c => c.AvailabilityType == "ALL");
+        }
+
+        return query.Where(c =>
+            c.AvailabilityType == "ALL" ||
+            SqlFunc.Subqueryable<FlLabelCategoryLocationDbEntity>()
+                .Where(cl => cl.CategoryId == c.Id && scopeLocIds.Contains(cl.LocationId))
+                .Any());
     }
-    private static List<string> NormalizeLocationIds(List<string>? locationIds)
+    private const string AllRegionsDisplay = "All Regions";
+    private const string AllLocationsDisplay = "All Locations";
+    private const string EmptyDisplay = "无";
+
+    private async Task<Dictionary<string, CategoryScopeData>> BuildCategoryScopeMapAsync(
+        List<FlLabelCategoryDbEntity> entities)
     {
-        return locationIds?
+        var result = new Dictionary<string, CategoryScopeData>(StringComparer.Ordinal);
+        if (entities.Count == 0)
+        {
+            return result;
+        }
+
+        foreach (var e in entities.Where(x =>
+                     !string.Equals(x.AvailabilityType, "SPECIFIED", StringComparison.OrdinalIgnoreCase)))
+        {
+            result[e.Id] = new CategoryScopeData
+            {
+                Region = AllRegionsDisplay,
+                Location = AllLocationsDisplay,
+                RegionIds = new List<string>(),
+                LocationIds = new List<string>()
+            };
+        }
+
+        var specifiedIds = entities
+            .Where(x => string.Equals(x.AvailabilityType, "SPECIFIED", StringComparison.OrdinalIgnoreCase))
+            .Select(x => x.Id)
+            .ToList();
+        if (specifiedIds.Count == 0)
+        {
+            return result;
+        }
+
+        var links = await _dbContext.SqlSugarClient.Queryable<FlLabelCategoryLocationDbEntity>()
+            .Where(x => specifiedIds.Contains(x.CategoryId))
+            .ToListAsync();
+
+        var locIdSet = links
+            .Select(x => x.LocationId)
             .Where(x => !string.IsNullOrWhiteSpace(x))
             .Select(x => x.Trim())
-            .Distinct()
-            .ToList() ?? new();
+            .Distinct(StringComparer.Ordinal)
+            .ToList();
+
+        var locById = new Dictionary<string, LocationAggregateRoot>(StringComparer.Ordinal);
+        if (locIdSet.Count > 0)
+        {
+            var guidList = locIdSet.Where(x => Guid.TryParse(x, out _)).Select(Guid.Parse).ToList();
+            if (guidList.Count > 0)
+            {
+                var locs = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
+                    .Where(x => !x.IsDeleted && guidList.Contains(x.Id))
+                    .ToListAsync();
+                foreach (var loc in locs)
+                {
+                    locById[loc.Id.ToString()] = loc;
+                }
+            }
+        }
+
+        foreach (var catId in specifiedIds)
+        {
+            var catLinks = links.Where(x => x.CategoryId == catId).ToList();
+            var locationIds = LocationScopeBindingHelper.NormalizeIds(
+                catLinks.Select(x => x.LocationId).ToList());
+
+            if (catLinks.Count == 0)
+            {
+                result[catId] = new CategoryScopeData
+                {
+                    Region = EmptyDisplay,
+                    Location = EmptyDisplay,
+                    RegionIds = new List<string>(),
+                    LocationIds = new List<string>()
+                };
+                continue;
+            }
+
+            var regions = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            var locationNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var link in catLinks)
+            {
+                var lid = link.LocationId?.Trim() ?? string.Empty;
+                if (string.IsNullOrEmpty(lid) || !locById.TryGetValue(lid, out var loc))
+                {
+                    continue;
+                }
+
+                var groupName = loc.GroupName?.Trim();
+                if (!string.IsNullOrEmpty(groupName))
+                {
+                    regions.Add(groupName);
+                }
+
+                var locName = loc.LocationName?.Trim();
+                if (string.IsNullOrEmpty(locName))
+                {
+                    locName = loc.LocationCode?.Trim();
+                }
+
+                if (!string.IsNullOrEmpty(locName))
+                {
+                    locationNames.Add(locName);
+                }
+            }
+
+            var regionIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+                _dbContext.SqlSugarClient, locationIds);
+
+            result[catId] = new CategoryScopeData
+            {
+                Region = regions.Count > 0
+                    ? string.Join(", ", regions.OrderBy(x => x, StringComparer.OrdinalIgnoreCase))
+                    : EmptyDisplay,
+                Location = locationNames.Count > 0
+                    ? string.Join(", ", locationNames.OrderBy(x => x, StringComparer.OrdinalIgnoreCase))
+                    : EmptyDisplay,
+                RegionIds = regionIds,
+                LocationIds = locationIds
+            };
+        }
+
+        return result;
+    }
+
+    private sealed class CategoryScopeData
+    {
+        public string Region { get; init; } = string.Empty;
+        public string Location { get; init; } = string.Empty;
+        public List<string> RegionIds { get; init; } = new();
+        public List<string> LocationIds { get; init; } = new();
+    }
+
+    private sealed class CategoryLabelStats
+    {
+        public long Count { get; init; }
+        public DateTime MaxEdited { get; init; }
+    }
+
+    /// <summary>
+    /// 统计各分类下标签数量及下属标签最近编辑时间（用于列表 LastEdited 同步）。
+    /// </summary>
+    private async Task<Dictionary<string, CategoryLabelStats>> BuildCategoryLabelStatsMapAsync(List<string> categoryIds)
+    {
+        var result = new Dictionary<string, CategoryLabelStats>(StringComparer.Ordinal);
+        if (categoryIds.Count == 0)
+        {
+            return result;
+        }
+
+        var rows = await _dbContext.SqlSugarClient.Queryable<FlLabelDbEntity>()
+            .Where(x => !x.IsDeleted)
+            .Where(x => x.LabelCategoryId != null && categoryIds.Contains(x.LabelCategoryId))
+            .Select(x => new { x.LabelCategoryId, x.CreationTime, x.LastModificationTime })
+            .ToListAsync();
+
+        foreach (var g in rows.GroupBy(x => x.LabelCategoryId!))
+        {
+            result[g.Key] = new CategoryLabelStats
+            {
+                Count = g.Count(),
+                MaxEdited = g.Max(l => l.LastModificationTime ?? l.CreationTime)
+            };
+        }
+
+        return result;
+    }
+
+    private static DateTime ResolveCategoryCreationTime(FlLabelCategoryDbEntity entity)
+    {
+        if (entity.CreationTime > DateTime.MinValue.AddYears(1))
+        {
+            return entity.CreationTime;
+        }
+
+        return entity.LastModificationTime ?? DateTime.Now;
+    }
+
+    private static DateTime ResolveLastEdited(
+        FlLabelCategoryDbEntity entity,
+        DateTime creationTime,
+        CategoryLabelStats? labelStats)
+    {
+        var categoryEdited = entity.LastModificationTime ?? creationTime;
+        if (labelStats is null)
+        {
+            return categoryEdited;
+        }
+
+        return labelStats.MaxEdited > categoryEdited ? labelStats.MaxEdited : categoryEdited;
+    }
+
+    /// <summary>
+    /// 下属标签变更时回写分类最后编辑时间（与列表 <see cref="LabelCategoryGetListOutputDto.LastEdited"/> 一致）。
+    /// </summary>
+    internal static async Task TouchLabelCategoryLastEditedAsync(
+        ISqlSugarDbContext dbContext,
+        string? categoryId,
+        string? modifierId)
+    {
+        var cid = categoryId?.Trim();
+        if (string.IsNullOrWhiteSpace(cid))
+        {
+            return;
+        }
+
+        await dbContext.SqlSugarClient.Updateable<FlLabelCategoryDbEntity>()
+            .SetColumns(x => new FlLabelCategoryDbEntity
+            {
+                LastModificationTime = DateTime.Now,
+                LastModifierId = modifierId
+            })
+            .Where(x => x.Id == cid && !x.IsDeleted)
+            .ExecuteCommandAsync();
     }
     private async Task SaveCategoryLocationsAsync(
@@ -101,6 +101,7 @@ public class LocationAppService : ApplicationService, ILocationAppService
             Email = input.Email?.Trim(),
             Latitude = input.Latitude,
             Longitude = input.Longitude,
+            OperatingHours = input.OperatingHours?.Trim(),
             State = input.State
         };
@@ -136,6 +137,7 @@ public class LocationAppService : ApplicationService, ILocationAppService
         entity.Email = input.Email?.Trim();
         entity.Latitude = input.Latitude;
         entity.Longitude = input.Longitude;
+        entity.OperatingHours = input.OperatingHours?.Trim();
         entity.State = input.State;
         await _locationRepository.UpdateAsync(entity);
@@ -347,7 +349,8 @@ public class LocationAppService : ApplicationService, ILocationAppService
                     (x.Country != null && x.Country.Contains(keyword!)) ||
                     (x.ZipCode != null && x.ZipCode.Contains(keyword!)) ||
                     (x.Phone != null && x.Phone.Contains(keyword!)) ||
-                    (x.Email != null && x.Email.Contains(keyword!))
+                    (x.Email != null && x.Email.Contains(keyword!)) ||
+                    (x.OperatingHours != null && x.OperatingHours.Contains(keyword!))
             );
     }
@@ -368,6 +371,7 @@ public class LocationAppService : ApplicationService, ILocationAppService
             Email = x.Email,
             Latitude = x.Latitude,
             Longitude = x.Longitude,
+            OperatingHours = x.OperatingHours,
             State = x.State
         };
 }
@@ -36,7 +36,7 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
     public async Task<PagedResultWithPageDto<PartnerGetListOutputDto>> GetListAsync(PartnerGetListInputVo input)
     {
         RefAsync<int> total = 0;
-        var query = BuildPartnerListQuery(input);
+        var query = await BuildPartnerListQueryAsync(input);
         var entities = await query.ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
         var items = entities.Select(MapListItem).ToList();
@@ -44,19 +44,19 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
     }
     /// <inheritdoc />
-    public async Task<PartnerGetOutputDto> GetAsync(string id)
+    public async Task<PartnerGetOutputDto> GetAsync(Guid id)
     {
-        var partnerId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(partnerId))
+        if (id == Guid.Empty)
         {
-            throw new UserFriendlyException("合作伙伴Id不能为空");
+            throw new UserFriendlyException("Partner id is required.");
         }
+        var partnerId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlPartnerDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == partnerId);
         if (entity is null)
         {
-            throw new UserFriendlyException("合作伙伴不存在");
+            throw new UserFriendlyException("Partner not found.");
         }
         return MapDetail(entity);
@@ -69,13 +69,13 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
         var name = input.PartnerName?.Trim();
         if (string.IsNullOrWhiteSpace(name))
         {
-            throw new UserFriendlyException("合作伙伴名称不能为空");
+            throw new UserFriendlyException("Partner name is required.");
         }
         var email = input.ContactEmail?.Trim();
         if (!string.IsNullOrWhiteSpace(email) && !IsPlausibleEmail(email))
         {
-            throw new UserFriendlyException("联系邮箱格式不正确");
+            throw new UserFriendlyException("Invalid contact email format.");
         }
         var now = Clock.Now;
@@ -85,73 +85,75 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
             IsDeleted = false,
             PartnerName = name,
             ContactEmail = string.IsNullOrWhiteSpace(email) ? null : email,
-            PhoneNumber = string.IsNullOrWhiteSpace(input.PhoneNumber) ? null : input.PhoneNumber.Trim(),
+            PhoneNumber = TrimToNull(input.PhoneNumber),
             State = input.State,
             CreationTime = now,
             CreatorId = CurrentUser?.Id?.ToString(),
             LastModificationTime = now,
             LastModifierId = CurrentUser?.Id?.ToString()
         };
+        ApplyAddressFields(entity, input);
         await _dbContext.SqlSugarClient.Insertable(entity).ExecuteCommandAsync();
-        return await GetAsync(entity.Id);
+        return await GetAsync(Guid.Parse(entity.Id));
     }
     /// <inheritdoc />
     [UnitOfWork]
-    public async Task<PartnerGetOutputDto> UpdateAsync(string id, PartnerUpdateInputVo input)
+    public async Task<PartnerGetOutputDto> UpdateAsync(Guid id, PartnerUpdateInputVo input)
     {
-        var partnerId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(partnerId))
+        if (id == Guid.Empty)
         {
-            throw new UserFriendlyException("合作伙伴Id不能为空");
+            throw new UserFriendlyException("Partner id is required.");
         }
+        var partnerId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlPartnerDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == partnerId);
         if (entity is null)
         {
-            throw new UserFriendlyException("合作伙伴不存在");
+            throw new UserFriendlyException("Partner not found.");
         }
         var name = input.PartnerName?.Trim();
         if (string.IsNullOrWhiteSpace(name))
         {
-            throw new UserFriendlyException("合作伙伴名称不能为空");
+            throw new UserFriendlyException("Partner name is required.");
         }
         var email = input.ContactEmail?.Trim();
         if (!string.IsNullOrWhiteSpace(email) && !IsPlausibleEmail(email))
         {
-            throw new UserFriendlyException("联系邮箱格式不正确");
+            throw new UserFriendlyException("Invalid contact email format.");
         }
         entity.PartnerName = name;
         entity.ContactEmail = string.IsNullOrWhiteSpace(email) ? null : email;
-        entity.PhoneNumber = string.IsNullOrWhiteSpace(input.PhoneNumber) ? null : input.PhoneNumber.Trim();
+        entity.PhoneNumber = TrimToNull(input.PhoneNumber);
         entity.State = input.State;
+        ApplyAddressFields(entity, input);
         entity.LastModificationTime = Clock.Now;
         entity.LastModifierId = CurrentUser?.Id?.ToString();
         await _dbContext.SqlSugarClient.Updateable(entity).ExecuteCommandAsync();
-        return await GetAsync(partnerId);
+        return await GetAsync(id);
     }
     /// <inheritdoc />
     [UnitOfWork]
-    public async Task DeleteAsync(string id)
+    public async Task DeleteAsync(Guid id)
     {
-        var partnerId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(partnerId))
+        if (id == Guid.Empty)
         {
-            throw new UserFriendlyException("合作伙伴Id不能为空");
+            throw new UserFriendlyException("Partner id is required.");
         }
+        var partnerId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlPartnerDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == partnerId);
         if (entity is null)
         {
-            throw new UserFriendlyException("合作伙伴不存在");
+            throw new UserFriendlyException("Partner not found.");
         }
         entity.IsDeleted = true;
@@ -161,15 +163,17 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
     }
     /// <inheritdoc />
-    public async Task<IActionResult> ExportPdfAsync(PartnerGetListInputVo input)
+    [HttpGet]
+    public async Task<IActionResult> ExportPdfAsync([FromQuery] PartnerGetListInputVo input)
     {
         QuestPDF.Settings.License = LicenseType.Community;
-        var count = await BuildPartnerListQuery(input).CountAsync();
-        var query = BuildPartnerListQuery(input);
+        var count = await (await BuildPartnerListQueryAsync(input)).CountAsync();
+        var query = await BuildPartnerListQueryAsync(input);
         if (count > ExportPdfMaxRows)
         {
-            throw new UserFriendlyException($"导出数据超过上限 {ExportPdfMaxRows} 条，请缩小筛选范围");
+            throw new UserFriendlyException(
+                $"Export exceeds the maximum of {ExportPdfMaxRows} rows. Narrow your filters and try again.");
         }
         var rows = await query.Take(ExportPdfMaxRows).ToListAsync();
@@ -208,9 +212,9 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5)
                             .Text(e.PartnerName ?? string.Empty);
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5)
-                            .Text(string.IsNullOrWhiteSpace(e.ContactEmail) ? "无" : e.ContactEmail!);
+                            .Text(string.IsNullOrWhiteSpace(e.ContactEmail) ? "None" : e.ContactEmail!);
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5)
-                            .Text(string.IsNullOrWhiteSpace(e.PhoneNumber) ? "无" : e.PhoneNumber!);
+                            .Text(string.IsNullOrWhiteSpace(e.PhoneNumber) ? "None" : e.PhoneNumber!);
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5).Text(status);
                         table.Cell().BorderBottom(0.5f).BorderColor(Colors.Grey.Lighten2).Padding(5)
                             .Text(e.CreationTime.ToString("yyyy-MM-dd HH:mm"));
@@ -225,16 +229,27 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
         return new FileStreamResult(stream, "application/pdf") { FileDownloadName = fileName };
     }
-    private ISugarQueryable<FlPartnerDbEntity> BuildPartnerListQuery(PartnerGetListInputVo input)
+    private async Task<ISugarQueryable<FlPartnerDbEntity>> BuildPartnerListQueryAsync(PartnerGetListInputVo input)
     {
+        var scope = await PartnerScopeHelper.ResolvePartnerScopeAsync(CurrentUser, _dbContext);
+
         var keyword = input.Keyword?.Trim();
         var query = _dbContext.SqlSugarClient.Queryable<FlPartnerDbEntity>()
-            .Where(x => !x.IsDeleted)
+            .Where(x => !x.IsDeleted);
+
+        query = PartnerScopeHelper.ApplyPartnerScope(query, scope);
+
+        query = query
             .WhereIF(input.State != null, x => x.State == input.State)
             .WhereIF(!string.IsNullOrWhiteSpace(keyword),
                 x => x.PartnerName.Contains(keyword!) ||
                      (x.ContactEmail != null && x.ContactEmail.Contains(keyword!)) ||
-                     (x.PhoneNumber != null && x.PhoneNumber.Contains(keyword!)));
+                     (x.PhoneNumber != null && x.PhoneNumber.Contains(keyword!)) ||
+                     (x.Street != null && x.Street.Contains(keyword!)) ||
+                     (x.City != null && x.City.Contains(keyword!)) ||
+                     (x.StateCode != null && x.StateCode.Contains(keyword!)) ||
+                     (x.Country != null && x.Country.Contains(keyword!)) ||
+                     (x.ZipCode != null && x.ZipCode.Contains(keyword!)));
         if (!string.IsNullOrWhiteSpace(input.Sorting))
         {
@@ -276,26 +291,60 @@ public class PartnerAppService : ApplicationService, IPartnerAppService
         return query;
     }
-    private static PartnerGetListOutputDto MapListItem(FlPartnerDbEntity x) => new()
+    private static PartnerGetListOutputDto MapListItem(FlPartnerDbEntity x)
     {
-        Id = x.Id,
-        PartnerName = x.PartnerName,
-        ContactEmail = x.ContactEmail,
-        PhoneNumber = x.PhoneNumber,
-        State = x.State,
-        CreationTime = x.CreationTime
-    };
-
-    private static PartnerGetOutputDto MapDetail(FlPartnerDbEntity x) => new()
+        var dto = new PartnerGetListOutputDto
+        {
+            Id = x.Id,
+            PartnerName = x.PartnerName,
+            ContactEmail = x.ContactEmail,
+            PhoneNumber = x.PhoneNumber,
+            State = x.State,
+            CreationTime = x.CreationTime
+        };
+        MapAddressFields(dto, x);
+        return dto;
+    }
+
+    private static PartnerGetOutputDto MapDetail(FlPartnerDbEntity x)
     {
-        Id = x.Id,
-        PartnerName = x.PartnerName,
-        ContactEmail = x.ContactEmail,
-        PhoneNumber = x.PhoneNumber,
-        State = x.State,
-        CreationTime = x.CreationTime,
-        LastModificationTime = x.LastModificationTime
-    };
+        var dto = new PartnerGetOutputDto
+        {
+            Id = x.Id,
+            PartnerName = x.PartnerName,
+            ContactEmail = x.ContactEmail,
+            PhoneNumber = x.PhoneNumber,
+            State = x.State,
+            CreationTime = x.CreationTime,
+            LastModificationTime = x.LastModificationTime
+        };
+        MapAddressFields(dto, x);
+        return dto;
+    }
+
+    private static void ApplyAddressFields(FlPartnerDbEntity entity, PartnerAddressFieldsDto input)
+    {
+        entity.Street = TrimToNull(input.Street);
+        entity.City = TrimToNull(input.City);
+        entity.StateCode = TrimToNull(input.StateCode);
+        entity.Country = TrimToNull(input.Country);
+        entity.ZipCode = TrimToNull(input.ZipCode);
+    }
+
+    private static void MapAddressFields(PartnerAddressFieldsDto dto, FlPartnerDbEntity entity)
+    {
+        dto.Street = entity.Street;
+        dto.City = entity.City;
+        dto.StateCode = entity.StateCode;
+        dto.Country = entity.Country;
+        dto.ZipCode = entity.ZipCode;
+    }
+
+    private static string? TrimToNull(string? value)
+    {
+        var t = value?.Trim();
+        return string.IsNullOrEmpty(t) ? null : t;
+    }
     private static bool IsPlausibleEmail(string email)
     {
@@ -36,11 +36,12 @@ public class ProductAppService : ApplicationService, IProductAppService
         _batchImportOptions = batchImportOptions;
     }
+    /// <inheritdoc />
     public async Task<PagedResultWithPageDto<ProductGetListOutputDto>> GetListAsync(ProductGetListInputVo input)
     {
         RefAsync<int> total = 0;
-        var query = BuildFilteredProductQuery(input);
+        var query = await BuildFilteredProductQueryAsync(input);
         if (!string.IsNullOrWhiteSpace(input.Sorting))
         {
             query = query.OrderBy(input.Sorting);
@@ -107,14 +108,14 @@ public class ProductAppService : ApplicationService, IProductAppService
         return BuildPagedResult(input.SkipCount, input.MaxResultCount, (int)total, items);
     }
-    public async Task<ProductGetOutputDto> GetAsync(string id)
+    public async Task<ProductGetOutputDto> GetAsync(Guid id)
     {
-        var productId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(productId))
+        if (id == Guid.Empty)
         {
             throw new UserFriendlyException("产品Id不能为空");
         }
+        var productId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlProductDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == productId);
@@ -134,11 +135,15 @@ public class ProductAppService : ApplicationService, IProductAppService
             }
         }
-        var locationIds = await _dbContext.SqlSugarClient.Queryable<FlLocationProductDbEntity>()
-            .Where(x => x.ProductId == productId)
-            .Select(x => x.LocationId)
-            .Distinct()
-            .ToListAsync();
+        var locationIds = LocationScopeBindingHelper.NormalizeIds(
+            await _dbContext.SqlSugarClient.Queryable<FlLocationProductDbEntity>()
+                .Where(x => x.ProductId == productId)
+                .Select(x => x.LocationId)
+                .ToListAsync());
+        var partnerIds = await LocationScopeBindingHelper.ResolvePartnerIdsFromLocationIdsAsync(
+            _dbContext.SqlSugarClient, locationIds);
+        var groupIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+            _dbContext.SqlSugarClient, locationIds);
         return new ProductGetOutputDto
         {
@@ -149,6 +154,9 @@ public class ProductAppService : ApplicationService, IProductAppService
             CategoryName = categoryName,
             ProductImageUrl = entity.ProductImageUrl,
             State = entity.State,
+            PartnerId = partnerIds.Count > 0 ? partnerIds[0] : null,
+            PartnerIds = partnerIds,
+            GroupIds = groupIds,
             LocationIds = locationIds
         };
     }
@@ -190,24 +198,24 @@ public class ProductAppService : ApplicationService, IProductAppService
         await _dbContext.SqlSugarClient.Insertable(entity).ExecuteCommandAsync();
-        if (input.LocationIds is not null)
+        if (HasProductScopeBinding(input))
         {
-            var locIds = await NormalizeAndValidateLocationIdsAsync(input.LocationIds);
+            var locIds = await ResolveProductLocationIdsForSaveAsync(input);
             await ReplaceProductLocationLinksAsync(entity.Id, locIds);
         }
-        return await GetAsync(entity.Id);
+        return await GetAsync(Guid.Parse(entity.Id));
     }
     [UnitOfWork]
-    public async Task<ProductGetOutputDto> UpdateAsync(string id, ProductUpdateInputVo input)
+    public async Task<ProductGetOutputDto> UpdateAsync(Guid id, ProductUpdateInputVo input)
     {
-        var productId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(productId))
+        if (id == Guid.Empty)
         {
             throw new UserFriendlyException("产品Id不能为空");
         }
+        var productId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlProductDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == productId);
         if (entity is null)
@@ -246,24 +254,24 @@ public class ProductAppService : ApplicationService, IProductAppService
         await _dbContext.SqlSugarClient.Updateable(entity).ExecuteCommandAsync();
-        if (input.LocationIds is not null)
+        if (HasProductScopeBinding(input))
         {
-            var locIds = await NormalizeAndValidateLocationIdsAsync(input.LocationIds);
+            var locIds = await ResolveProductLocationIdsForSaveAsync(input);
             await ReplaceProductLocationLinksAsync(productId, locIds);
         }
-        return await GetAsync(productId);
+        return await GetAsync(id);
     }
     [UnitOfWork]
-    public async Task DeleteAsync(string id)
+    public async Task DeleteAsync(Guid id)
     {
-        var productId = id?.Trim();
-        if (string.IsNullOrWhiteSpace(productId))
+        if (id == Guid.Empty)
         {
             throw new UserFriendlyException("产品Id不能为空");
         }
+        var productId = id.ToString();
         var entity = await _dbContext.SqlSugarClient.Queryable<FlProductDbEntity>()
             .FirstAsync(x => !x.IsDeleted && x.Id == productId);
         if (entity is null)
@@ -276,6 +284,7 @@ public class ProductAppService : ApplicationService, IProductAppService
     }
     /// <inheritdoc />
+    [HttpGet]
     public Task<IActionResult> DownloadProductImportTemplateAsync()
     {
         var opt = _batchImportOptions.Value;
@@ -306,16 +315,20 @@ public class ProductAppService : ApplicationService, IProductAppService
     }
     /// <inheritdoc />
+    [HttpGet]
     public async Task<IActionResult> ExportProductsExcelAsync([FromQuery] ProductGetListInputVo input)
     {
         var exportFilter = new ProductGetListInputVo
         {
             Sorting = input.Sorting,
             Keyword = input.Keyword,
-            State = input.State
+            State = input.State,
+            PartnerId = input.PartnerId,
+            GroupId = input.GroupId,
+            LocationId = input.LocationId
         };
-        var query = BuildFilteredProductQuery(exportFilter);
+        var query = await BuildFilteredProductQueryAsync(exportFilter);
         if (!string.IsNullOrWhiteSpace(exportFilter.Sorting))
         {
             query = query.OrderBy(exportFilter.Sorting);
@@ -334,6 +347,7 @@ public class ProductAppService : ApplicationService, IProductAppService
     }
     /// <inheritdoc />
+    [HttpPost]
     public async Task<ProductBatchImportResultDto> ImportProductsBatchAsync(
         [FromForm] ProductBatchImportInputVo input)
     {
@@ -423,10 +437,14 @@ public class ProductAppService : ApplicationService, IProductAppService
             throw new UserFriendlyException($"单次批量编辑最多允许 {maxItems} 条，请分批提交");
         }
-        var effectiveCount = input.Items.Count(static x => x is not null && !string.IsNullOrWhiteSpace(x.Id));
+        var effectiveCount = input.Items.Count(static x =>
+            x is not null &&
+            !string.IsNullOrWhiteSpace(x.Id) &&
+            Guid.TryParse(x.Id!.Trim(), out var g) &&
+            g != Guid.Empty);
         if (effectiveCount == 0)
         {
-            throw new UserFriendlyException("没有有效的产品 Id（请为待保存行填写 id）");
+            throw new UserFriendlyException("没有有效的产品 Id（请为待保存行填写 Guid 格式 id）");
         }
         var result = new ProductBulkUpdateResultDto();
@@ -438,9 +456,14 @@ public class ProductAppService : ApplicationService, IProductAppService
                 continue;
             }
+            if (!Guid.TryParse(item.Id.Trim(), out var productGuid) || productGuid == Guid.Empty)
+            {
+                continue;
+            }
+
             try
             {
-                await UpdateAsync(item.Id.Trim(), item);
+                await UpdateAsync(productGuid, item);
                 result.SuccessCount++;
             }
             catch (UserFriendlyException ex)
@@ -458,7 +481,7 @@ public class ProductAppService : ApplicationService, IProductAppService
         return result;
     }
-    private ISugarQueryable<FlProductDbEntity> BuildFilteredProductQuery(ProductGetListInputVo input)
+    private async Task<ISugarQueryable<FlProductDbEntity>> BuildFilteredProductQueryAsync(ProductGetListInputVo input)
     {
         var keyword = input.Keyword?.Trim();
@@ -467,6 +490,22 @@ public class ProductAppService : ApplicationService, IProductAppService
             .Where(x => !x.IsDeleted)
             .WhereIF(input.State != null, x => x.State == input.State);
+        var locationIds = await ResolveFilteredLocationIdsAsync(input.PartnerId, input.GroupId, input.LocationId);
+        if (locationIds is not null)
+        {
+            if (locationIds.Count == 0)
+            {
+                query = query.Where(_ => false);
+            }
+            else
+            {
+                query = query.Where(p =>
+                    SqlFunc.Subqueryable<FlLocationProductDbEntity>()
+                        .Where(lp => lp.ProductId == p.Id && locationIds.Contains(lp.LocationId))
+                        .Any());
+            }
+        }
+
         if (!string.IsNullOrWhiteSpace(keyword))
         {
             query = query
@@ -481,6 +520,66 @@ public class ProductAppService : ApplicationService, IProductAppService
         return query;
     }
+    /// <summary>
+    /// 与 Reports 列表一致：按门店 Id 优先，否则按 Region（groupId）或公司（partnerId）解析 location 主键集合。
+    /// </summary>
+    private async Task<List<string>?> ResolveFilteredLocationIdsAsync(string? partnerId, string? groupId,
+        string? locationId)
+    {
+        var locId = locationId?.Trim();
+        if (!string.IsNullOrWhiteSpace(locId))
+        {
+            if (!Guid.TryParse(locId, out var locationGuid))
+            {
+                return new List<string>();
+            }
+
+            var exists = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
+                .AnyAsync(x => !x.IsDeleted && x.Id == locationGuid);
+            return exists ? new List<string> { locId } : new List<string>();
+        }
+
+        var gid = groupId?.Trim();
+        var pid = partnerId?.Trim();
+
+        if (string.IsNullOrWhiteSpace(pid) && string.IsNullOrWhiteSpace(gid))
+        {
+            return null;
+        }
+
+        var q = _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>().Where(x => !x.IsDeleted);
+
+        if (!string.IsNullOrWhiteSpace(gid))
+        {
+            var g = await _dbContext.SqlSugarClient.Queryable<FlGroupDbEntity>()
+                .FirstAsync(x => !x.IsDeleted && x.Id == gid);
+            if (g is null)
+            {
+                return new List<string>();
+            }
+
+            var gName = g.GroupName?.Trim() ?? string.Empty;
+            var partner = await _dbContext.SqlSugarClient.Queryable<FlPartnerDbEntity>()
+                .FirstAsync(x => !x.IsDeleted && x.Id == g.PartnerId);
+            var pName = partner?.PartnerName?.Trim() ?? string.Empty;
+            q = q.Where(x => x.GroupName == gName && x.Partner == pName);
+        }
+        else if (!string.IsNullOrWhiteSpace(pid))
+        {
+            var partner = await _dbContext.SqlSugarClient.Queryable<FlPartnerDbEntity>()
+                .FirstAsync(x => !x.IsDeleted && x.Id == pid);
+            if (partner is null)
+            {
+                return new List<string>();
+            }
+
+            var pName = partner.PartnerName?.Trim() ?? string.Empty;
+            q = q.Where(x => x.Partner == pName);
+        }
+
+        return await q.Select(x => SqlFunc.ToString(x.Id)).ToListAsync();
+    }
+
     private async Task<List<ProductBatchExcelHelper.ExportRow>> BuildProductExcelExportRowsAsync(
         List<FlProductDbEntity> entities)
     {
@@ -657,40 +756,23 @@ public class ProductAppService : ApplicationService, IProductAppService
         throw new UserFriendlyException("无法生成唯一产品编码，请稍后重试或手动填写产品编码");
     }
+    private static bool HasProductScopeBinding(ProductCreateInputVo input) =>
+        !string.IsNullOrWhiteSpace(input.PartnerId) ||
+        input.GroupIds is not null ||
+        input.LocationIds is not null;
+
     /// <summary>
-    /// 去重、校验门店 Id 格式与存在性。
+    /// 合并 Company（partnerId）、Region（groupIds）、门店（locationIds）并校验存在性。
     /// </summary>
-    private async Task<List<string>> NormalizeAndValidateLocationIdsAsync(IEnumerable<string> rawIds)
+    private async Task<List<string>> ResolveProductLocationIdsForSaveAsync(ProductCreateInputVo input)
     {
-        var distinct = rawIds
-            .Where(x => !string.IsNullOrWhiteSpace(x))
-            .Select(x => x.Trim())
-            .Distinct(StringComparer.Ordinal)
-            .ToList();
-
-        if (distinct.Count == 0)
-        {
-            return new List<string>();
-        }
-
-        foreach (var id in distinct)
-        {
-            if (!Guid.TryParse(id, out _))
-            {
-                throw new UserFriendlyException("门店Id格式不正确");
-            }
-        }
-
-        var guidList = distinct.Select(Guid.Parse).ToList();
-        var existCount = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
-            .Where(x => !x.IsDeleted && guidList.Contains(x.Id))
-            .CountAsync();
-        if (existCount != distinct.Count)
-        {
-            throw new UserFriendlyException("门店不存在");
-        }
-
-        return distinct;
+        var merged = await LocationScopeBindingHelper.MergeToLocationIdsAsync(
+            _dbContext.SqlSugarClient,
+            input.PartnerId,
+            input.GroupIds,
+            input.LocationIds);
+        await LocationScopeBindingHelper.ValidateLocationIdsExistAsync(_dbContext.SqlSugarClient, merged);
+        return merged;
     }
     /// <summary>
@@ -3,6 +3,7 @@ using FoodLabeling.Application.Contracts.Dtos.Common;
 using FoodLabeling.Application.Contracts.Dtos.ProductCategory;
 using FoodLabeling.Application.Contracts.IServices;
 using FoodLabeling.Application.Services.DbModels;
+using FoodLabeling.Domain.Entities;
 using SqlSugar;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
@@ -40,6 +41,8 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
                      (x.DisplayText != null && x.DisplayText.Contains(keyword!)))
             .WhereIF(input.State != null, x => x.State == input.State);
+        query = await ApplyCategoryScopeFilterAsync(query, input.GroupId, input.LocationId);
+
         // Sorting 仅允许白名单字段，避免不同数据库列命名导致 Unknown column
         // 同时避免将 input.Sorting 原样拼接到 SQL（存在注入风险）
         if (!string.IsNullOrWhiteSpace(input.Sorting))
@@ -74,18 +77,28 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
         var entities = await query.ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
-        var items = entities.Select(x => new ProductCategoryGetListOutputDto
+        var scopeMap = await BuildCategoryScopeMapAsync(entities);
+
+        var items = entities.Select(x =>
         {
-            Id = x.Id,
-            CategoryCode = x.CategoryCode,
-            CategoryName = x.CategoryName,
-            DisplayText = x.DisplayText,
-            CategoryPhotoUrl = x.CategoryPhotoUrl,
-            ButtonAppearance = x.ButtonAppearance,
-            State = x.State,
-            AvailabilityType = x.AvailabilityType,
-            OrderNum = x.OrderNum,
-            LastEdited = x.LastModificationTime ?? x.CreationTime
+            scopeMap.TryGetValue(x.Id, out var scope);
+            return new ProductCategoryGetListOutputDto
+            {
+                Id = x.Id,
+                CategoryCode = x.CategoryCode,
+                CategoryName = x.CategoryName,
+                DisplayText = x.DisplayText,
+                CategoryPhotoUrl = x.CategoryPhotoUrl,
+                ButtonAppearance = x.ButtonAppearance,
+                State = x.State,
+                AvailabilityType = x.AvailabilityType,
+                OrderNum = x.OrderNum,
+                LastEdited = x.LastModificationTime ?? x.CreationTime,
+                Region = scope?.Region ?? string.Empty,
+                Location = scope?.Location ?? string.Empty,
+                RegionIds = scope?.RegionIds ?? new List<string>(),
+                LocationIds = scope?.LocationIds ?? new List<string>()
+            };
         }).ToList();
         return BuildPagedResult(input.SkipCount, input.MaxResultCount, total, items);
@@ -110,7 +123,11 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
                 .Where(x => x.CategoryId == entity.Id)
                 .Select(x => x.LocationId)
                 .ToListAsync();
-            dto.LocationIds = locationIds?.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).Distinct().ToList() ?? new();
+            dto.LocationIds = LocationScopeBindingHelper.NormalizeIds(locationIds);
+            var regionIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+                _dbContext.SqlSugarClient, dto.LocationIds);
+            dto.RegionIds = regionIds;
+            dto.GroupIds = regionIds;
         }
         return dto;
@@ -130,9 +147,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
         var displayText = input.DisplayText?.Trim();
         var appearance = CategoryAppearanceStorageHelper.NormalizeButtonAppearanceForStorage(input.ButtonAppearance);
-        var availabilityType = (input.AvailabilityType ?? "ALL").Trim().ToUpperInvariant();
-        var locationIds = NormalizeLocationIds(input.LocationIds);
-        ValidateAvailabilityTypeAndLocations(availabilityType, locationIds);
+        var (availabilityType, mergedLocationIds) = await ResolveCategoryScopeForSaveAsync(input);
         var duplicated = await _dbContext.SqlSugarClient.Queryable<FlProductCategoryDbEntity>()
             .AnyAsync(x => !x.IsDeleted && (x.CategoryCode == code || x.CategoryName == name));
@@ -163,7 +178,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
         };
         await _dbContext.SqlSugarClient.Insertable(entity).ExecuteCommandAsync();
-        await SaveCategoryLocationsAsync(entity.Id, availabilityType, locationIds, currentUserId, now);
+        await SaveCategoryLocationsAsync(entity.Id, availabilityType, mergedLocationIds, currentUserId, now);
         return await GetAsync(entity.Id);
     }
@@ -188,9 +203,7 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
         var displayText = input.DisplayText?.Trim();
         var appearance = CategoryAppearanceStorageHelper.NormalizeButtonAppearanceForStorage(input.ButtonAppearance);
-        var availabilityType = (input.AvailabilityType ?? "ALL").Trim().ToUpperInvariant();
-        var locationIds = NormalizeLocationIds(input.LocationIds);
-        ValidateAvailabilityTypeAndLocations(availabilityType, locationIds);
+        var (availabilityType, mergedLocationIds) = await ResolveCategoryScopeForSaveAsync(input);
         var duplicated = await _dbContext.SqlSugarClient.Queryable<FlProductCategoryDbEntity>()
             .AnyAsync(x => !x.IsDeleted && x.Id != id && (x.CategoryCode == code || x.CategoryName == name));
@@ -211,7 +224,8 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
         entity.LastModifierId = CurrentUser?.Id?.ToString();
         await _dbContext.SqlSugarClient.Updateable(entity).ExecuteCommandAsync();
-        await SaveCategoryLocationsAsync(entity.Id, availabilityType, locationIds, entity.LastModifierId, entity.LastModificationTime ?? DateTime.Now);
+        await SaveCategoryLocationsAsync(entity.Id, availabilityType, mergedLocationIds, entity.LastModifierId,
+            entity.LastModificationTime ?? DateTime.Now);
         return await GetAsync(id);
     }
@@ -257,26 +271,86 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
         };
     }
-    private static void ValidateAvailabilityTypeAndLocations(string availabilityType, List<string> locationIds)
+    private async Task<(string AvailabilityType, List<string> LocationIds)> ResolveCategoryScopeForSaveAsync(
+        ProductCategoryCreateInputVo input)
     {
+        var regionIds = NormalizeRegionIds(input);
+        var explicitLocationIds = LocationScopeBindingHelper.NormalizeIds(input.LocationIds);
+        var availabilityType = (input.AvailabilityType ?? "ALL").Trim().ToUpperInvariant();
+
+        var hasScopeArrays = input.RegionIds is not null || input.GroupIds is not null || input.LocationIds is not null;
+        if (regionIds.Count > 0 || explicitLocationIds.Count > 0)
+        {
+            availabilityType = "SPECIFIED";
+        }
+        else if (hasScopeArrays && string.Equals(availabilityType, "ALL", StringComparison.OrdinalIgnoreCase))
+        {
+            // 显式传了空数组 [] 表示清空指定范围，仍视为 SPECIFIED（0 门店）或改回 ALL
+            availabilityType = "ALL";
+        }
+
         if (availabilityType != "ALL" && availabilityType != "SPECIFIED")
         {
             throw new UserFriendlyException("门店可用范围不合法（ALL/SPECIFIED）");
         }
-        if (availabilityType == "SPECIFIED" && locationIds.Count == 0)
+        if (availabilityType == "ALL")
+        {
+            return ("ALL", new List<string>());
+        }
+
+        var merged = await LocationScopeBindingHelper.MergeToLocationIdsAsync(
+            _dbContext.SqlSugarClient, (IReadOnlyList<string>?)null, regionIds, explicitLocationIds);
+        if (merged.Count == 0)
         {
-            throw new UserFriendlyException("指定门店范围时必须至少选择一个门店");
+            throw new UserFriendlyException("指定适用区域或门店时，至少需要匹配到一个有效门店");
         }
+
+        await LocationScopeBindingHelper.ValidateLocationIdsExistAsync(_dbContext.SqlSugarClient, merged);
+        return ("SPECIFIED", merged);
     }
-    private static List<string> NormalizeLocationIds(List<string>? locationIds)
+    /// <summary>
+    /// 合并入参中的 Region 多选（<see cref="ProductCategoryCreateInputVo.RegionIds"/> 与 <see cref="ProductCategoryCreateInputVo.GroupIds"/>）。
+    /// </summary>
+    private static List<string> NormalizeRegionIds(ProductCategoryCreateInputVo input)
     {
-        return locationIds?
-            .Where(x => !string.IsNullOrWhiteSpace(x))
-            .Select(x => x.Trim())
-            .Distinct()
-            .ToList() ?? new();
+        var merged = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.RegionIds))
+        {
+            merged.Add(id);
+        }
+
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.GroupIds))
+        {
+            merged.Add(id);
+        }
+
+        return merged.OrderBy(x => x, StringComparer.Ordinal).ToList();
+    }
+
+    private async Task<ISugarQueryable<FlProductCategoryDbEntity>> ApplyCategoryScopeFilterAsync(
+        ISugarQueryable<FlProductCategoryDbEntity> query,
+        string? groupId,
+        string? locationId)
+    {
+        var scopeLocIds = await LocationScopeBindingHelper.ResolveScopedLocationIdsAsync(
+            _dbContext.SqlSugarClient, groupId, locationId);
+        if (scopeLocIds is null)
+        {
+            return query;
+        }
+
+        if (scopeLocIds.Count == 0)
+        {
+            return query.Where(c => c.AvailabilityType == "ALL");
+        }
+
+        return query.Where(c =>
+            c.AvailabilityType == "ALL" ||
+            SqlFunc.Subqueryable<FlProductCategoryLocationDbEntity>()
+                .Where(cl => cl.CategoryId == c.Id && scopeLocIds.Contains(cl.LocationId))
+                .Any());
     }
     private async Task SaveCategoryLocationsAsync(
@@ -312,6 +386,143 @@ public class ProductCategoryAppService : ApplicationService, IProductCategoryApp
         await _dbContext.SqlSugarClient.Insertable(rows).ExecuteCommandAsync();
     }
+    private const string AllRegionsDisplay = "All Regions";
+    private const string AllLocationsDisplay = "All Locations";
+    private const string EmptyDisplay = "无";
+
+    /// <summary>
+    /// 列表行：Region/Location 展示文案 + 多选 Id 数组（编辑回显）。
+    /// </summary>
+    private async Task<Dictionary<string, CategoryScopeData>> BuildCategoryScopeMapAsync(
+        List<FlProductCategoryDbEntity> entities)
+    {
+        var result = new Dictionary<string, CategoryScopeData>(StringComparer.Ordinal);
+        if (entities.Count == 0)
+        {
+            return result;
+        }
+
+        foreach (var e in entities.Where(x =>
+                     !string.Equals(x.AvailabilityType, "SPECIFIED", StringComparison.OrdinalIgnoreCase)))
+        {
+            result[e.Id] = new CategoryScopeData
+            {
+                Region = AllRegionsDisplay,
+                Location = AllLocationsDisplay,
+                RegionIds = new List<string>(),
+                LocationIds = new List<string>()
+            };
+        }
+
+        var specifiedIds = entities
+            .Where(x => string.Equals(x.AvailabilityType, "SPECIFIED", StringComparison.OrdinalIgnoreCase))
+            .Select(x => x.Id)
+            .ToList();
+        if (specifiedIds.Count == 0)
+        {
+            return result;
+        }
+
+        var links = await _dbContext.SqlSugarClient.Queryable<FlProductCategoryLocationDbEntity>()
+            .Where(x => specifiedIds.Contains(x.CategoryId))
+            .ToListAsync();
+
+        var locIdSet = links
+            .Select(x => x.LocationId)
+            .Where(x => !string.IsNullOrWhiteSpace(x))
+            .Select(x => x.Trim())
+            .Distinct(StringComparer.Ordinal)
+            .ToList();
+
+        var locById = new Dictionary<string, LocationAggregateRoot>(StringComparer.Ordinal);
+        if (locIdSet.Count > 0)
+        {
+            var guidList = locIdSet.Where(x => Guid.TryParse(x, out _)).Select(Guid.Parse).ToList();
+            if (guidList.Count > 0)
+            {
+                var locs = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
+                    .Where(x => !x.IsDeleted && guidList.Contains(x.Id))
+                    .ToListAsync();
+                foreach (var loc in locs)
+                {
+                    locById[loc.Id.ToString()] = loc;
+                }
+            }
+        }
+
+        foreach (var catId in specifiedIds)
+        {
+            var catLinks = links.Where(x => x.CategoryId == catId).ToList();
+            var locationIds = LocationScopeBindingHelper.NormalizeIds(
+                catLinks.Select(x => x.LocationId).ToList());
+
+            if (catLinks.Count == 0)
+            {
+                result[catId] = new CategoryScopeData
+                {
+                    Region = EmptyDisplay,
+                    Location = EmptyDisplay,
+                    RegionIds = new List<string>(),
+                    LocationIds = new List<string>()
+                };
+                continue;
+            }
+
+            var regions = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            var locationNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var link in catLinks)
+            {
+                var lid = link.LocationId?.Trim() ?? string.Empty;
+                if (string.IsNullOrEmpty(lid) || !locById.TryGetValue(lid, out var loc))
+                {
+                    continue;
+                }
+
+                var groupName = loc.GroupName?.Trim();
+                if (!string.IsNullOrEmpty(groupName))
+                {
+                    regions.Add(groupName);
+                }
+
+                var locName = loc.LocationName?.Trim();
+                if (string.IsNullOrEmpty(locName))
+                {
+                    locName = loc.LocationCode?.Trim();
+                }
+
+                if (!string.IsNullOrEmpty(locName))
+                {
+                    locationNames.Add(locName);
+                }
+            }
+
+            var regionIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+                _dbContext.SqlSugarClient, locationIds);
+
+            result[catId] = new CategoryScopeData
+            {
+                Region = regions.Count > 0
+                    ? string.Join(", ", regions.OrderBy(x => x, StringComparer.OrdinalIgnoreCase))
+                    : EmptyDisplay,
+                Location = locationNames.Count > 0
+                    ? string.Join(", ", locationNames.OrderBy(x => x, StringComparer.OrdinalIgnoreCase))
+                    : EmptyDisplay,
+                RegionIds = regionIds,
+                LocationIds = locationIds
+            };
+        }
+
+        return result;
+    }
+
+    private sealed class CategoryScopeData
+    {
+        public string Region { get; init; } = string.Empty;
+        public string Location { get; init; } = string.Empty;
+        public List<string> RegionIds { get; init; } = new();
+        public List<string> LocationIds { get; init; } = new();
+    }
+
     private static PagedResultWithPageDto<T> BuildPagedResult<T>(int skipCount, int maxResultCount, int total, List<T> items)
     {
         var pageSize = maxResultCount <= 0 ? items.Count : maxResultCount;
@@ -23,6 +23,7 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
 {
     private readonly ISqlSugarDbContext _dbContext;
     private readonly ISqlSugarRepository<RoleAggregateRoot, Guid> _roleRepository;
+    private readonly ISqlSugarRepository<MenuAggregateRoot, Guid> _menuRepository;
     private readonly ISqlSugarRepository<RoleMenuEntity> _roleMenuRepository;
     private readonly ISqlSugarRepository<RoleDeptEntity> _roleDeptRepository;
     private readonly ISqlSugarRepository<UserRoleEntity> _userRoleRepository;
@@ -30,12 +31,14 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
     public RbacRoleAppService(
         ISqlSugarDbContext dbContext,
         ISqlSugarRepository<RoleAggregateRoot, Guid> roleRepository,
+        ISqlSugarRepository<MenuAggregateRoot, Guid> menuRepository,
         ISqlSugarRepository<RoleMenuEntity> roleMenuRepository,
         ISqlSugarRepository<RoleDeptEntity> roleDeptRepository,
         ISqlSugarRepository<UserRoleEntity> userRoleRepository)
     {
         _dbContext = dbContext;
         _roleRepository = roleRepository;
+        _menuRepository = menuRepository;
         _roleMenuRepository = roleMenuRepository;
         _roleDeptRepository = roleDeptRepository;
         _userRoleRepository = userRoleRepository;
@@ -75,6 +78,8 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
             AccessPermissionCodes = DeserializeAccessPermissionCodes(x.AccessPermissionCodesJson)
         }).ToList();
+        await FillAccessPermissionsAsync(items);
+
         var pageSize = input.MaxResultCount <= 0 ? items.Count : input.MaxResultCount;
         var pageIndex = pageSize <= 0 ? 1 : PagedQueryConvention.PageIndexFromSkipCount(input.SkipCount);
         var totalPages = pageSize <= 0 ? 0 : (int)Math.Ceiling(total / (double)pageSize);
@@ -103,7 +108,7 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
             .Select(x => x.MenuId)
             .ToListAsync();
-        return new RbacRoleGetOutputDto
+        var dto = new RbacRoleGetOutputDto
         {
             Id = entity.Id,
             RoleName = entity.RoleName ?? string.Empty,
@@ -115,9 +120,12 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
             AccessPermissionCodes = DeserializeAccessPermissionCodes(entity.AccessPermissionCodesJson),
             MenuIds = menuIds
         };
+        await FillAccessPermissionsAsync(new List<RbacRoleGetListOutputDto> { dto });
+        return dto;
     }
     /// <inheritdoc />
+    [UnitOfWork]
     public async Task<RbacRoleGetOutputDto> CreateAsync([FromBody] RbacRoleCreateInputVo input)
     {
         var roleName = input.RoleName?.Trim();
@@ -145,17 +153,19 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
             Remark = input.Remark?.Trim(),
             DataScope = (Yi.Framework.Rbac.Domain.Shared.Enums.DataScopeEnum)input.DataScope,
             State = input.State,
-            OrderNum = input.OrderNum ?? 0,
-            AccessPermissionCodesJson = SerializeAccessPermissionCodes(ResolveAccessPermissions(input))
+            OrderNum = input.OrderNum ?? 0
         };
         EntityHelper.TrySetId(entity, () => GuidGenerator.Create());
         await _roleRepository.InsertAsync(entity);
+        await ApplyRoleMenuBindingsAsync(entity.Id, input);
+
         return await GetAsync(entity.Id);
     }
     /// <inheritdoc />
+    [UnitOfWork]
     public async Task<RbacRoleGetOutputDto> UpdateAsync(Guid id, [FromBody] RbacRoleUpdateInputVo input)
     {
         var entity = await _roleRepository.GetSingleAsync(x => x.Id == id && x.IsDeleted == false);
@@ -189,15 +199,157 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
         entity.Remark = input.Remark?.Trim();
         entity.DataScope = (Yi.Framework.Rbac.Domain.Shared.Enums.DataScopeEnum)input.DataScope;
         entity.State = input.State;
-        entity.OrderNum = input.OrderNum ?? 0;
-        entity.AccessPermissionCodesJson =
-            SerializeAccessPermissionCodes(ResolveAccessPermissions(input));
+        if (input.OrderNum is not null)
+        {
+            entity.OrderNum = input.OrderNum.Value;
+        }
         await _roleRepository.UpdateAsync(entity);
+        await ApplyRoleMenuBindingsAsync(entity.Id, input);
+
         return await GetAsync(entity.Id);
     }
+    /// <summary>
+    /// 新增/编辑时按 menuIds 或 accessPermissions 绑定角色菜单（二者都未传则不改绑定）
+    /// </summary>
+    private async Task ApplyRoleMenuBindingsAsync(Guid roleId, RbacRoleCreateInputVo input)
+    {
+        if (input.MenuIds is not null)
+        {
+            await SetRoleMenusAsync(roleId, input.MenuIds);
+            return;
+        }
+
+        if (input.AccessPermissions is not null)
+        {
+            var menuIds = await ResolveMenuIdsFromAccessPermissionsAsync(input.AccessPermissions);
+            await SetRoleMenusAsync(roleId, menuIds);
+        }
+    }
+
+    private async Task SetRoleMenusAsync(Guid roleId, List<Guid> menuIds)
+    {
+        var distinct = menuIds?.Distinct().ToList() ?? new List<Guid>();
+        await _roleMenuRepository.DeleteAsync(x => x.RoleId == roleId);
+
+        if (distinct.Count == 0)
+        {
+            return;
+        }
+
+        var existMenuIds = await _menuRepository._DbQueryable
+            .Where(x => x.IsDeleted == false)
+            .Where(x => distinct.Contains(x.Id))
+            .Select(x => x.Id)
+            .ToListAsync();
+
+        if (existMenuIds.Count == 0)
+        {
+            return;
+        }
+
+        var entities = existMenuIds.Select(menuId => new RoleMenuEntity
+        {
+            RoleId = roleId,
+            MenuId = menuId
+        }).ToList();
+
+        await _roleMenuRepository.InsertRangeAsync(entities);
+    }
+
+    private async Task<List<Guid>> ResolveMenuIdsFromAccessPermissionsAsync(string accessPermissions)
+    {
+        var codes = accessPermissions
+            .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+            .Where(c => !string.IsNullOrWhiteSpace(c))
+            .Distinct(StringComparer.Ordinal)
+            .ToList();
+
+        if (codes.Count == 0)
+        {
+            return new List<Guid>();
+        }
+
+        var menus = await _menuRepository._DbQueryable
+            .Where(m => m.IsDeleted == false && m.PermissionCode != null)
+            .Where(m => codes.Contains(m.PermissionCode!))
+            .Select(m => m.Id)
+            .ToListAsync();
+
+        return menus;
+    }
+
+    private async Task FillAccessPermissionsAsync(List<RbacRoleGetListOutputDto> items)
+    {
+        if (items.Count == 0)
+        {
+            return;
+        }
+
+        var map = await GetAccessPermissionsByRoleIdsAsync(items.Select(x => x.Id).ToList());
+        foreach (var item in items)
+        {
+            item.AccessPermissions = map.GetValueOrDefault(item.Id, string.Empty);
+        }
+    }
+
+    /// <summary>
+    /// 按角色汇总已绑定菜单上的 PermissionCode（去重、英文逗号+空格拼接）
+    /// </summary>
+    private async Task<Dictionary<Guid, string>> GetAccessPermissionsByRoleIdsAsync(List<Guid> roleIds)
+    {
+        var result = roleIds.Distinct().ToDictionary(id => id, _ => string.Empty);
+        if (result.Count == 0)
+        {
+            return result;
+        }
+
+        var distinctRoleIds = result.Keys.ToList();
+        var links = await _roleMenuRepository._DbQueryable
+            .Where(rm => distinctRoleIds.Contains(rm.RoleId))
+            .Select(rm => new { rm.RoleId, rm.MenuId })
+            .ToListAsync();
+        if (links.Count == 0)
+        {
+            return result;
+        }
+
+        var menuIds = links.Select(x => x.MenuId).Distinct().ToList();
+        var menus = await _menuRepository._DbQueryable
+            .Where(m => menuIds.Contains(m.Id) && m.IsDeleted == false)
+            .Select(m => new { m.Id, m.PermissionCode })
+            .ToListAsync();
+        var permByMenuId = menus.ToDictionary(x => x.Id, x => x.PermissionCode);
+
+        var byRole = distinctRoleIds.ToDictionary(id => id, _ => new HashSet<string>(StringComparer.Ordinal));
+        foreach (var link in links)
+        {
+            if (!permByMenuId.TryGetValue(link.MenuId, out var code) || string.IsNullOrWhiteSpace(code))
+            {
+                continue;
+            }
+
+            if (byRole.TryGetValue(link.RoleId, out var set))
+            {
+                set.Add(code.Trim());
+            }
+        }
+
+        foreach (var kv in byRole)
+        {
+            if (kv.Value.Count == 0)
+            {
+                continue;
+            }
+
+            result[kv.Key] = string.Join(", ", kv.Value.OrderBy(x => x, StringComparer.Ordinal));
+        }
+
+        return result;
+    }
+
     /// <inheritdoc />
     [UnitOfWork]
     public async Task DeleteAsync([FromBody] List<Guid> ids)
@@ -106,6 +106,11 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
         var role = await _dbContext.SqlSugarClient.Queryable<UserRoleEntity>().FirstAsync(x => x.UserId == id);
+        var partnerIds = await LocationScopeBindingHelper.ResolvePartnerIdsFromLocationIdsAsync(
+            _dbContext.SqlSugarClient, locationIds);
+        var regionIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+            _dbContext.SqlSugarClient, locationIds);
+
         return new TeamMemberGetOutputDto
         {
             Id = user.Id,
@@ -115,6 +120,9 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
             Phone = user.Phone,
             State = user.State,
             RoleId = role?.RoleId,
+            PartnerIds = partnerIds,
+            RegionIds = regionIds,
+            GroupIds = regionIds,
             LocationIds = locationIds,
             AssignedLocations = assigned
         };
@@ -123,10 +131,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
     /// <inheritdoc />
     public async Task<TeamMemberGetOutputDto> CreateAsync(TeamMemberCreateInputVo input)
     {
-        if (input.LocationIds is null || input.LocationIds.Count == 0)
-        {
-            throw new UserFriendlyException("成员必须至少分配一个门店");
-        }
+        var mergedLocationIds = await ResolveTeamMemberLocationIdsForSaveAsync(input);
         var user = new UserAggregateRoot(input.UserName.Trim(), input.Password, input.Phone, input.FullName.Trim())
         {
@@ -145,7 +150,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
             await _userManager.GiveUserSetRoleAsync(new List<Guid> { user.Id }, new List<Guid> { input.RoleId.Value });
         }
-        await UpsertUserLocationsAsync(user.Id, input.LocationIds);
+        await UpsertUserLocationsAsync(user.Id, mergedLocationIds);
         return await GetAsync(user.Id);
     }
@@ -153,10 +158,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
     /// <inheritdoc />
     public async Task<TeamMemberGetOutputDto> UpdateAsync(Guid id, TeamMemberUpdateInputVo input)
     {
-        if (input.LocationIds is null || input.LocationIds.Count == 0)
-        {
-            throw new UserFriendlyException("成员必须至少分配一个门店");
-        }
+        var mergedLocationIds = await ResolveTeamMemberLocationIdsForSaveAsync(input);
         var user = await _userRepository.GetByIdAsync(id);
         if (user is null || user.IsDeleted)
@@ -187,7 +189,7 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
             await _userManager.GiveUserSetRoleAsync(new List<Guid> { id }, new List<Guid>());
         }
-        await UpsertUserLocationsAsync(id, input.LocationIds);
+        await UpsertUserLocationsAsync(id, mergedLocationIds);
         return await GetAsync(id);
     }
@@ -584,10 +586,13 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
                     return null;
                 }).Where(x => x != null).Cast<TeamMemberAssignedLocationDto>().ToList());
+        var scopeIdsMap = await BuildTeamMemberScopeIdsMapAsync(assignedMap);
+
         return users.Select(u =>
         {
             roleMap.TryGetValue(u.Id, out var role);
             assignedMap.TryGetValue(u.Id.ToString(), out var assigned);
+            scopeIdsMap.TryGetValue(u.Id.ToString(), out var scopeIds);
             return new TeamMemberGetListOutputDto
             {
@@ -599,11 +604,109 @@ public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
                 State = u.State,
                 RoleId = role?.Id,
                 RoleName = role?.RoleName,
+                PartnerIds = scopeIds?.PartnerIds ?? new List<string>(),
+                RegionIds = scopeIds?.RegionIds ?? new List<string>(),
                 AssignedLocations = assigned ?? new List<TeamMemberAssignedLocationDto>()
             };
         }).ToList();
     }
+    private async Task<Dictionary<string, TeamMemberScopeIds>> BuildTeamMemberScopeIdsMapAsync(
+        Dictionary<string, List<TeamMemberAssignedLocationDto>> assignedMap)
+    {
+        var result = new Dictionary<string, TeamMemberScopeIds>(StringComparer.Ordinal);
+        foreach (var (userId, assigned) in assignedMap)
+        {
+            var locationIds = assigned
+                .Select(x => x.Id)
+                .Where(x => !string.IsNullOrWhiteSpace(x))
+                .Select(x => x.Trim())
+                .Distinct(StringComparer.Ordinal)
+                .ToList();
+            if (locationIds.Count == 0)
+            {
+                result[userId] = new TeamMemberScopeIds();
+                continue;
+            }
+
+            var partnerIds = await LocationScopeBindingHelper.ResolvePartnerIdsFromLocationIdsAsync(
+                _dbContext.SqlSugarClient, locationIds);
+            var regionIds = await LocationScopeBindingHelper.ResolveGroupIdsFromLocationIdsAsync(
+                _dbContext.SqlSugarClient, locationIds);
+            result[userId] = new TeamMemberScopeIds
+            {
+                PartnerIds = partnerIds,
+                RegionIds = regionIds
+            };
+        }
+
+        return result;
+    }
+
+    private sealed class TeamMemberScopeIds
+    {
+        public List<string> PartnerIds { get; init; } = new();
+        public List<string> RegionIds { get; init; } = new();
+    }
+
+    private Task<List<string>> ResolveTeamMemberLocationIdsForSaveAsync(TeamMemberUpdateInputVo input) =>
+        ResolveTeamMemberLocationIdsForSaveAsync(new TeamMemberCreateInputVo
+        {
+            PartnerId = input.PartnerId,
+            PartnerIds = input.PartnerIds,
+            RegionIds = input.RegionIds,
+            GroupIds = input.GroupIds,
+            LocationIds = input.LocationIds
+        });
+
+    private async Task<List<string>> ResolveTeamMemberLocationIdsForSaveAsync(TeamMemberCreateInputVo input)
+    {
+        var partnerIds = NormalizePartnerIds(input);
+        var regionIds = NormalizeRegionIds(input);
+        var merged = await LocationScopeBindingHelper.MergeToLocationIdsAsync(
+            _dbContext.SqlSugarClient, partnerIds, regionIds, input.LocationIds);
+
+        if (merged.Count == 0)
+        {
+            throw new UserFriendlyException("成员必须至少分配一个门店（公司/区域/门店至少选一项）");
+        }
+
+        await LocationScopeBindingHelper.ValidateLocationIdsExistAsync(_dbContext.SqlSugarClient, merged);
+        return merged;
+    }
+
+    private static List<string> NormalizePartnerIds(TeamMemberCreateInputVo input)
+    {
+        var merged = new HashSet<string>(StringComparer.Ordinal);
+        if (!string.IsNullOrWhiteSpace(input.PartnerId))
+        {
+            merged.Add(input.PartnerId.Trim());
+        }
+
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.PartnerIds))
+        {
+            merged.Add(id);
+        }
+
+        return merged.OrderBy(x => x, StringComparer.Ordinal).ToList();
+    }
+
+    private static List<string> NormalizeRegionIds(TeamMemberCreateInputVo input)
+    {
+        var merged = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.RegionIds))
+        {
+            merged.Add(id);
+        }
+
+        foreach (var id in LocationScopeBindingHelper.NormalizeIds(input.GroupIds))
+        {
+            merged.Add(id);
+        }
+
+        return merged.OrderBy(x => x, StringComparer.Ordinal).ToList();
+    }
+
     private async Task UpsertUserLocationsAsync(Guid userId, List<string> locationIds)
     {
         var now = DateTime.Now;
@@ -15,6 +15,7 @@ using Lazy.Captcha.Core;
 using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using SqlSugar;
@@ -25,6 +26,8 @@ using Volo.Abp.Security.Claims;
 using Volo.Abp.Uow;
 using Volo.Abp.Users;
 using Yi.Framework.Core.Helper;
+using Yi.Framework.Rbac.Application.Contracts.Dtos.Account;
+using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.Rbac.Domain.Entities;
 using Yi.Framework.Rbac.Domain.Managers;
 using Yi.Framework.Rbac.Domain.Shared.Consts;
@@ -47,6 +50,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService
     private readonly ICaptcha _captcha;
     private readonly RbacOptions _rbacOptions;
     private readonly JwtOptions _jwtOptions;
+    private readonly IForgotPasswordByEmailService _forgotPasswordByEmailService;
     public UsAppAuthAppService(
         IAccountManager accountManager,
@@ -55,7 +59,8 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService
         IHttpContextAccessor httpContextAccessor,
         ICaptcha captcha,
         IOptions<JwtOptions> jwtOptions,
-        IOptions<RbacOptions> rbacOptions)
+        IOptions<RbacOptions> rbacOptions,
+        IForgotPasswordByEmailService forgotPasswordByEmailService)
     {
         _accountManager = accountManager;
         _userRepository = userRepository;
@@ -64,6 +69,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService
         _captcha = captcha;
         _jwtOptions = jwtOptions.Value;
         _rbacOptions = rbacOptions.Value;
+        _forgotPasswordByEmailService = forgotPasswordByEmailService;
     }
     protected ILocalEventBus LocalEventBus => LazyServiceProvider.LazyGetRequiredService<ILocalEventBus>();
@@ -124,6 +130,19 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService
         };
     }
+    /// <inheritdoc />
+    [AllowAnonymous]
+    [HttpPost("us-app-auth/forgot-password/email/send-code")]
+    public virtual Task PostSendForgotPasswordCodeByEmailAsync(EmailCaptchaImageDto input) =>
+        _forgotPasswordByEmailService.SendForgotPasswordCodeAsync(input);
+
+    /// <inheritdoc />
+    [AllowAnonymous]
+    [UnitOfWork]
+    [HttpPost("us-app-auth/forgot-password/email/reset")]
+    public virtual Task<string> PostResetPasswordByEmailAsync(RetrievePasswordByEmailDto input) =>
+        _forgotPasswordByEmailService.ResetPasswordByEmailAsync(input);
+
     /// <summary>
     /// 获取当前登录用户已绑定的门店（切换门店时可重新拉取）
     /// </summary>
@@ -147,7 +166,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService
     /// 店长：在同店绑定用户中，取 <c>Role.RoleCode</c> 或 <c>Role.RoleName</c>（忽略大小写）包含 <c>manager</c> 的第一条；
     /// 若无匹配则店长姓名与电话均为「无」。
     ///
-    /// <c>OperatingHours</c>：当前 <c>location</c> 表无营业时间字段，固定返回「无」。
+    /// <c>OperatingHours</c>：读取 <c>location.OperatingHours</c>；为空时返回「无」。
     /// </remarks>
     /// <param name="locationId">门店主键（Guid 字符串）</param>
     /// <returns>与原型一致的展示字段</returns>
@@ -193,7 +212,7 @@ public class UsAppAuthAppService : ApplicationService, IUsAppAuthAppService
             LocationName = string.IsNullOrWhiteSpace(loc.LocationName) ? "无" : loc.LocationName.Trim(),
             FullAddress = BuildFullAddress(loc),
             StorePhone = FormatStorePhoneDisplay(loc.Phone),
-            OperatingHours = "无",
+            OperatingHours = string.IsNullOrWhiteSpace(loc.OperatingHours) ? "无" : loc.OperatingHours.Trim(),
             ManagerName = mgrName,
             ManagerPhone = mgrPhone
         };
@@ -130,5 +130,11 @@ public class LocationAggregateRoot : AggregateRoot&lt;Guid&gt;, ISoftDelete, IAuditedO
     /// Longitude
     /// </summary>
     public decimal? Longitude { get; set; }
+
+    /// <summary>
+    /// 经营时间（自由文本，如 Mon–Fri 9:00 AM – 6:00 PM）
+    /// </summary>
+    [SugarColumn(ColumnName = "OperatingHours")]
+    public string? OperatingHours { get; set; }
 }
@@ -11,6 +11,11 @@ CREATE TABLE IF NOT EXISTS `fl_partner` (
   `PartnerName` varchar(256) NOT NULL COMMENT '合作伙伴名称',
   `ContactEmail` varchar(256) DEFAULT NULL COMMENT '联系邮箱',
   `PhoneNumber` varchar(64) DEFAULT NULL COMMENT '电话',
+  `Street` varchar(512) DEFAULT NULL COMMENT '街道地址',
+  `City` varchar(128) DEFAULT NULL COMMENT '城市',
+  `StateCode` varchar(32) DEFAULT NULL COMMENT '州/省代码（如 NY）',
+  `Country` varchar(128) DEFAULT NULL COMMENT '国家',
+  `ZipCode` varchar(32) DEFAULT NULL COMMENT '邮编',
   `State` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
   PRIMARY KEY (`Id`),
   KEY `IX_fl_partner_IsDeleted` (`IsDeleted`),
@@ -14,5 +14,10 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Role
         public bool State { get; set; }
         public int OrderNum { get; set; }
+
+        /// <summary>
+        /// 访问权限：该角色在已绑定菜单上的 PermissionCode 汇总（去重、逗号+空格拼接；无则为空串）
+        /// </summary>
+        public string AccessPermissions { get; set; } = string.Empty;
     }
 }
@@ -14,5 +14,10 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Role
         public bool State { get; set; }
         public int OrderNum { get; set; }
+
+        /// <summary>
+        /// 访问权限：该角色在已绑定菜单上的 PermissionCode 汇总（去重、逗号+空格拼接；无则为空串）
+        /// </summary>
+        public string AccessPermissions { get; set; } = string.Empty;
     }
 }
@@ -37,6 +37,7 @@ namespace Yi.Framework.Rbac.Application.Services
         private readonly IGuidGenerator _guidGenerator;
         private readonly RbacOptions _rbacOptions;
         private readonly IAliyunManger _aliyunManger;
+        private readonly IForgotPasswordByEmailService _forgotPasswordByEmailService;
         private IDistributedCache<UserInfoCacheItem, UserInfoCacheKey> _userCache;
         private UserManager _userManager;
         private IHttpContextAccessor _httpContextAccessor;
@@ -51,6 +52,7 @@ namespace Yi.Framework.Rbac.Application.Services
             IGuidGenerator guidGenerator,
             IOptions<RbacOptions> options,
             IAliyunManger aliyunManger,
+            IForgotPasswordByEmailService forgotPasswordByEmailService,
             UserManager userManager, IHttpContextAccessor httpContextAccessor)
         {
             _userRepository = userRepository;
@@ -62,6 +64,7 @@ namespace Yi.Framework.Rbac.Application.Services
             _guidGenerator = guidGenerator;
             _rbacOptions = options.Value;
             _aliyunManger = aliyunManger;
+            _forgotPasswordByEmailService = forgotPasswordByEmailService;
             _userCache = userCache;
             _userManager = userManager;
             _httpContextAccessor = httpContextAccessor;
@@ -328,6 +331,58 @@ namespace Yi.Framework.Rbac.Application.Services
             return entity.UserName;
         }
+        /// <summary>
+        /// Send a forgot-password verification code to the account email (platform).
+        /// </summary>
+        /// <remarks>
+        /// When <c>RbacOptions.EnableCaptcha</c> is true, pass <c>Uuid</c> and <c>Code</c> from <c>GetCaptchaImageAsync</c>.
+        /// If the email is not registered, the API still returns 200 without sending mail (anti-enumeration).
+        ///
+        /// Example request:
+        /// ```json
+        /// {
+        ///   "email": "user@example.com",
+        ///   "uuid": "optional-captcha-uuid",
+        ///   "code": "optional-captcha-text"
+        /// }
+        /// ```
+        /// </remarks>
+        /// <param name="input">Email and optional image captcha fields.</param>
+        /// <returns>No payload when accepted.</returns>
+        /// <response code="200">Accepted (email may or may not exist).</response>
+        /// <response code="400">Invalid input, captcha, rate limit, or SMTP not configured.</response>
+        /// <response code="500">Server error</response>
+        [AllowAnonymous]
+        [HttpPost("account/forgot-password/email/send-code")]
+        public virtual Task PostSendForgotPasswordCodeByEmailAsync(EmailCaptchaImageDto input) =>
+            _forgotPasswordByEmailService.SendForgotPasswordCodeAsync(input);
+
+        /// <summary>
+        /// Reset password using the email verification code (platform).
+        /// </summary>
+        /// <remarks>
+        /// New password rules: at least 8 characters; upper and lower case; digit; special character.
+        ///
+        /// Example request:
+        /// ```json
+        /// {
+        ///   "email": "user@example.com",
+        ///   "code": "ABCDEF",
+        ///   "password": "NewPassw0rd!"
+        /// }
+        /// ```
+        /// </remarks>
+        /// <param name="input">Email, OTP, and new password.</param>
+        /// <returns>Matched account user name.</returns>
+        /// <response code="200">Password updated.</response>
+        /// <response code="400">Invalid OTP, weak password, or account not found.</response>
+        /// <response code="500">Server error</response>
+        [AllowAnonymous]
+        [UnitOfWork]
+        [HttpPost("account/forgot-password/email/reset")]
+        public virtual Task<string> PostResetPasswordByEmailAsync(RetrievePasswordByEmailDto input) =>
+            _forgotPasswordByEmailService.ResetPasswordByEmailAsync(input);
+
         /// <summary>
         /// 注册，需要验证码通过
@@ -19,6 +19,7 @@ using Yi.Framework.Rbac.Domain.Managers;
 using Yi.Framework.Rbac.Domain.Shared.Consts;
 using Yi.Framework.Rbac.Domain.Shared.Enums;
 using Yi.Framework.SqlSugarCore.Abstractions;
+using System.Linq;
 namespace Yi.Framework.Rbac.Application.Services.System
 {
@@ -75,7 +76,17 @@ namespace Yi.Framework.Rbac.Application.Services.System
                 .WhereIF(!string.IsNullOrEmpty(input.RoleName), x => x.RoleName.Contains(input.RoleName!))
                 .WhereIF(input.State is not null, x => x.State == input.State)
                 .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
-            return new PagedResultDto<RoleGetListOutputDto>(total, await MapToGetListOutputDtosAsync(entities));
+            var list = await MapToGetListOutputDtosAsync(entities);
+            await FillAccessPermissionsForRoleListAsync(list);
+            return new PagedResultDto<RoleGetListOutputDto>(total, list);
+        }
+
+        /// <inheritdoc />
+        public override async Task<RoleGetOutputDto> GetAsync(Guid id)
+        {
+            var dto = await base.GetAsync(id);
+            await FillAccessPermissionsForRoleGetAsync(dto);
+            return dto;
         }
         /// <inheritdoc />
@@ -165,9 +176,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
             var entity = await MapToEntityAsync(input);
             await _repository.InsertAsync(entity);
-            var outputDto = await MapToGetOutputDtoAsync(entity);
-
-            return outputDto;
+            return await MapToGetOutputDtoWithPermissionsAsync(entity);
         }
         /// <summary>
@@ -191,8 +200,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
             await _roleManager.GiveRoleSetMenuAsync(new List<Guid> { id }, input.MenuIds);
-            var dto = await MapToGetOutputDtoAsync(entity);
-            return dto;
+            return await MapToGetOutputDtoWithPermissionsAsync(entity);
         }
@@ -213,7 +221,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
             entity.State = state;
             await _repository.UpdateAsync(entity);
-            return await MapToGetOutputDtoAsync(entity);
+            return await MapToGetOutputDtoWithPermissionsAsync(entity);
         }
@@ -337,5 +345,92 @@ namespace Yi.Framework.Rbac.Application.Services.System
                 depts = deptList.DeptTreeBuild()
             });
         }
+
+        private async Task<RoleGetOutputDto> MapToGetOutputDtoWithPermissionsAsync(RoleAggregateRoot entity)
+        {
+            var dto = await MapToGetOutputDtoAsync(entity);
+            await FillAccessPermissionsForRoleGetAsync(dto);
+            return dto;
+        }
+
+        private async Task FillAccessPermissionsForRoleListAsync(List<RoleGetListOutputDto> items)
+        {
+            if (items.Count == 0)
+            {
+                return;
+            }
+
+            var map = await GetAccessPermissionsByRoleIdsAsync(items.Select(x => x.Id).ToList());
+            foreach (var item in items)
+            {
+                item.AccessPermissions = map.GetValueOrDefault(item.Id, string.Empty);
+            }
+        }
+
+        private async Task FillAccessPermissionsForRoleGetAsync(RoleGetOutputDto dto)
+        {
+            var map = await GetAccessPermissionsByRoleIdsAsync(new List<Guid> { dto.Id });
+            dto.AccessPermissions = map.GetValueOrDefault(dto.Id, string.Empty);
+        }
+
+        /// <summary>
+        /// 按角色汇总已绑定菜单上的 PermissionCode（去重、英文逗号+空格拼接）
+        /// </summary>
+        private async Task<Dictionary<Guid, string>> GetAccessPermissionsByRoleIdsAsync(List<Guid> roleIds)
+        {
+            var result = roleIds.Distinct().ToDictionary(id => id, _ => string.Empty);
+            if (result.Count == 0)
+            {
+                return result;
+            }
+
+            var distinctRoleIds = result.Keys.ToList();
+            var links = await _menuRepository._Db.Queryable<RoleMenuEntity>()
+                .Where(rm => distinctRoleIds.Contains(rm.RoleId))
+                .Select(rm => new { rm.RoleId, rm.MenuId })
+                .ToListAsync();
+            if (links.Count == 0)
+            {
+                return result;
+            }
+
+            var menuIds = links.Select(x => x.MenuId).Distinct().ToList();
+            var menus = await _menuRepository._DbQueryable
+                .Where(m => menuIds.Contains(m.Id) && m.IsDeleted == false)
+                .Select(m => new { m.Id, m.PermissionCode })
+                .ToListAsync();
+            var permByMenuId = menus.ToDictionary(x => x.Id, x => x.PermissionCode);
+
+            var byRole = new Dictionary<Guid, HashSet<string>>();
+            foreach (var rid in distinctRoleIds)
+            {
+                byRole[rid] = new HashSet<string>(StringComparer.Ordinal);
+            }
+
+            foreach (var link in links)
+            {
+                if (!permByMenuId.TryGetValue(link.MenuId, out var code) || string.IsNullOrWhiteSpace(code))
+                {
+                    continue;
+                }
+
+                if (byRole.TryGetValue(link.RoleId, out var set))
+                {
+                    set.Add(code.Trim());
+                }
+            }
+
+            foreach (var kv in byRole)
+            {
+                if (kv.Value.Count == 0)
+                {
+                    continue;
+                }
+
+                result[kv.Key] = string.Join(", ", kv.Value.OrderBy(x => x, StringComparer.Ordinal));
+            }
+
+            return result;
+        }
     }
 }
 \ No newline at end of file
@@ -8,6 +8,7 @@
   <ItemGroup>
+	  <PackageReference Include="MailKit" Version="4.8.0" />
 	  <PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
 	  <PackageReference Include="QuestPDF" Version="2024.12.2" />
 	  <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
@@ -18,6 +18,8 @@ namespace Yi.Framework.Rbac.Domain.Shared
             Configure<JwtOptions>(configuration.GetSection(nameof(JwtOptions)));
             Configure<RefreshJwtOptions>(configuration.GetSection(nameof(RefreshJwtOptions)));
             Configure<RbacOptions>(configuration.GetSection(nameof(RbacOptions)));
+            Configure<ForgotPasswordEmailOptions>(
+                configuration.GetSection(ForgotPasswordEmailOptions.SectionName));
         }
     }
 }
 \ No newline at end of file
@@ -8,6 +8,8 @@
   <ItemGroup>
+    <!-- 与 FoodLabeling.Application 中 Excel 导出一致；显式引用避免部分发布/拷贝场景下漏带 ClosedXML.dll -->
+    <PackageReference Include="ClosedXML" Version="0.102.3" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
     <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
     <!-- 解决 docker 构建冲突问题，冲突版本信息如下 -->
@@ -67,4 +69,11 @@
     </None>
   </ItemGroup>
+  <!-- 避免「只拷业务 dll 覆盖线上」导致缺 ClosedXML；完整 dotnet publish 应始终包含该文件 -->
+  <Target Name="VerifyClosedXmlInPublishOutput" AfterTargets="Publish">
+    <Error
+      Condition="!Exists('$(PublishDir)ClosedXML.dll')"
+      Text="发布目录缺少 ClosedXML.dll。请使用 dotnet publish Yi.Abp.Web 的完整输出（含全部依赖 dll 与 Yi.Abp.Web.deps.json）部署到服务器，勿仅用 bin 内部分文件做覆盖。" />
+  </Target>
+
 </Project>
@@ -18,10 +18,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  //应用启动
+  //应用启动：SelfUrl 供 Program.cs UseUrls 绑定；用 0.0.0.0 避免写成固定局域网 IP 在本机无该网卡时启动失败(WinError 10049)
   "App": {
     "SelfUrl": "http://localhost:19001",
-    "CorsOrigins": "http://localhost:19001;http://localhost:18000;http://localhost:5666"
+    "CorsOrigins": "http://localhost:19001;http://localhost:18000;http://localhost:5666;http://localhost:3000"
   },
   //配置
   "Settings": {
@@ -104,11 +104,39 @@
     //开启定时数据库备份
     "EnableDataBaseBackup": false
   },
+
+  // Forgot password: Microsoft 365 may return 535 until SMTP AUTH is enabled for the mailbox
+  // (Exchange admin) and credentials are correct; use an app password if MFA is on.
+  "ForgotPasswordEmail": {
+    "IsEnabled": true,
+    "SmtpHost": "smtp.office365.com",
+    "SmtpPort": 587,
+    "SecureSocketPreset": "StartTls",
+    "UserName": "Sandi.ma@3ffoodsafety.com",
+    "Password": "",
+    "FromAddress": "Sandi.ma@3ffoodsafety.com",
+    "FromDisplayName": "Food Labeling",
+    "CodeLength": 6,
+    "CacheExpirationMinutes": 10
+  },
   //语义内核
   "SemanticKernel": {
     "ModelIds": ["gpt-4o"],
     "Endpoint": "https://xxx.com/v1",
     "ApiKey": "sk-xxxxxx"
+  },
+
+  "FoodLabeling": {
+    "BatchImport": {
+      "TemplateDirectory": "/www/wwwroot/FoodLabelingManagementUs/batchImportOfFiles",
+      "LocationTemplateFileName": "Location-Manager-批量导入模板.xlsx",
+      "TeamMemberTemplateFileName": "Team-Member-批量导入模板.xlsx",
+      "ProductTemplateFileName": "Product-Manager-批量导入模板.xlsx",
+      "TeamMemberImportDefaultPassword": "ChangeMe123!",
+      "MaxImportRows": 5000,
+      "MaxUploadBytes": 10485760,
+      "MaxBulkUpdateItems": 500
+    }
   }
 }
@@ -1819,7 +1819,7 @@ function RoleDialog({
     }
     setSubmitting(true);
     try {
-      const payload = {
+      const payload: RbacRoleUpsertInput = {
         roleName: roleName.trim(),
         roleCode: roleCode.trim(),
         remark: remark.trim() ? remark.trim() : null,
@@ -27,5 +27,11 @@ export type CurrentUserMenuPermissionsOutputDto = {
   roleCodes: string[];
   permissionCodes: string[];
   menus: CurrentUserMenuNodeDto[];
+  /** User.LastModificationTime（ISO 字符串或 null） */
+  lastUpdated?: string | null;
+  /** 角色展示名，多角色英文逗号拼接 */
+  role?: string;
+  /** 全名：姓名 > 昵称 > 用户名 */
+  fullName?: string;
 };
@@ -224,12 +224,14 @@
 **列表筛选字段**（导出与列表对齐）：`Keyword`、`State`、`Sorting` — 与产品分页列表一致（`Keyword` 匹配产品编码、名称、分类名称）。
+**路由说明**：单条 **GET/PUT/DELETE** 的 `{id}` 为 **`Guid` 类型**（与 `fl_product.Id` 的 Guid 字符串一致），约定路由会带 **`{id:guid}`** 约束，因此 **`export-products-excel`、`download-product-import-template`、`import-products-batch`、`update-products-bulk`** 等字面路径不会被误判为产品 Id。
+
 ### 3.1 下载批量导入模板
 | 项目 | 说明 |
 |------|------|
 | 方法 | `DownloadProductImportTemplateAsync` |
-| HTTP | `GET` |
+| HTTP | `GET`（已标 `[HttpGet]`，与约定 `Download*` 可能判为 `POST` 的情况区分） |
 | 常见路径 | `/api/app/product/download-product-import-template` |
 | 作用 | 从 `TemplateDirectory` 读取 `ProductTemplateFileName` 指向的 xlsx 并下载（工作表名一般为 `Products`） |
@@ -238,14 +240,17 @@
 | 项目 | 说明 |
 |------|------|
 | 方法 | `ExportProductsExcelAsync` |
-| HTTP | `GET` |
+| HTTP | `GET`（应用服务方法上已标 `[HttpGet]`；ABP 对 `Export*` 默认易判成 `POST`，用 GET 否则会 **405**） |
 | 常见路径 | `/api/app/product/export-products-excel` |
+| Postman | **不要** 填 Body；筛选用 **Params**（Query）或拼在 URL 上；导出**不需要**上传 `file`（上传文件是 **3.3 导入**） |
 | Query | 与产品列表筛选一致：`Keyword`、`State`、`Sorting` |
 | 数据范围 | **全量**：符合筛选条件的全部产品；**不使用** `SkipCount` / `MaxResultCount` |
 | 排序 | 有 `Sorting` 则按其排序，否则默认按 `ProductName` 降序 |
 | 响应文件名示例 | `products-export-yyyyMMdd-HHmmss.xlsx` |
 | 列（与导入模板一致） | **Location**（多门店英文逗号拼接门店名称）、**Product Category**（分类名称）、**Product**（产品名称）、**Product Code**（产品编码；可为空则导出为空单元格） |
+**部署**：须使用 **`dotnet publish` 后的完整输出目录**（含 `ClosedXML.dll`、`DocumentFormat.OpenXml.dll`、`Yi.Abp.Web.deps.json` 等）部署；**不要用 `bin/Debug`（或 `bin/Release`）里挑文件当上线包**。也**禁止**「本地跑起来后只把若干 dll / 自己改过的文件」覆盖到线上（极易漏掉第三方依赖）。上线建议整包替换发布目录，或在服务器上 `git pull` + `dotnet publish`；发布时若输出里缺少 `ClosedXML.dll`，当前 `Yi.Abp.Web` 工程会在 `dotnet publish` 结束时报错提示。
+
 ### 3.3 批量导入 Excel
 | 项目 | 说明 |
@@ -289,7 +294,7 @@
 ## 5 Account Management（Company / Region）
-前端 **Account Management** 菜单中 **Company**、**Region** 两个页签的「Bulk Export (PDF)」对应后端已有接口：数据模型分别为 **`fl_partner`**（合作伙伴 / 公司）、**`fl_group`**（组织 / 大区）；应用服务为 **`PartnerAppService`**、**`GroupAppService`**。导出为 **QuestPDF** 生成的 **PDF**，筛选条件与各自**分页列表**一致，**不使用** `SkipCount` / `MaxResultCount`（全量导出）。单次导出超过 **5000** 条时返回业务错误，需缩小筛选范围。
+前端 **Account Management** 菜单中 **Company**、**Region** 两个页签的「Bulk Export (PDF)」对应后端已有接口：数据模型分别为 **`fl_partner`**（合作伙伴 / 公司）、**`fl_group`**（组织 / 大区）；应用服务为 **`PartnerAppService`**、**`GroupAppService`**。导出为 **QuestPDF** 生成的 **PDF**，筛选条件与各自**分页列表**一致，**不使用** `SkipCount` / `MaxResultCount`（全量导出）。单次导出超过 **5000** 条时返回业务错误，需缩小筛选范围。单条 **GET/PUT/DELETE** 的 `{id}` 为 **`Guid`**（与 `fl_partner.Id` / `fl_group.Id` 的 Guid 字符串一致），约定路由 **`{id:guid}`**，**`export-pdf`** 等字面路径不会误判为资源 Id；`ExportPdfAsync` 已标 **`[HttpGet]`**。
 ### 5.1 Company（合作伙伴 / `PartnerAppService`）