城市合伙人端的修改（后台）

apps/admin-web/src/lib/china-region.ts

@@ -2,14 +2,35 @@ import { codeToText, regionData } from 'element-china-area-data';
 
 export { regionData as CHINA_REGION_OPTIONS };
 
+export type ProvinceCityOption = {
+  value: string;
+  label: string;
+  children?: Array<{ value: string; label: string }>;
+};
+
+/** 省 / 市二级（不含区县） */
+export const PROVINCE_CITY_OPTIONS: ProvinceCityOption[] = regionData.map((province) => ({
+  value: province.value,
+  label: province.label,
+  children: province.children?.map((city) => ({
+    value: city.value,
+    label: city.label,
+  })),
+}));
+
 export type OpenCityRef = {
   id: string;
   name: string;
   code: string;
-  partnerId?: string | null;
-  partner?: { id: string };
+  partnerBindings?: Array<{ partnerAccountId: string }>;
+  boundPartnerIds?: string[];
 };
 
+function cityBoundPartnerIds(city: OpenCityRef): string[] {
+  if (city.boundPartnerIds?.length) return city.boundPartnerIds.map(String);
+  return (city.partnerBindings ?? []).map((b) => String(b.partnerAccountId));
+}
+
 export type ParsedChinaRegion = {
   province: string;
   city: string;
@@ -19,6 +40,39 @@ export type ParsedChinaRegion = {
   districtCode: string;
 };
 
+export type ParsedProvinceCity = {
+  province: string;
+  city: string;
+  provinceCode: string;
+  cityCode: string;
+};
+
+/** element-china-area-data 市级码（如 4101）→ 国标 6 位 adcode（410100） */
+export function normalizeCityAdcode(code: string): string {
+  const raw = code.trim();
+  if (/^\d{6}$/.test(raw)) return raw;
+  if (/^\d{4}$/.test(raw)) return `${raw}00`;
+  if (/^\d{2}$/.test(raw)) return `${raw}0100`;
+  return raw.padEnd(6, '0').slice(0, 6);
+}
+
+export function parseProvinceCityCodes(codes?: string[]): ParsedProvinceCity | null {
+  if (!codes || codes.length < 2) return null;
+  const [provinceCode, cityCode] = codes;
+  const province = codeToText[provinceCode];
+  let city = codeToText[cityCode];
+  if (!province || !city) return null;
+  if (city === '市辖区' || city === '县' || city === '省直辖县级行政区划') {
+    city = province.endsWith('市') ? province : city;
+  }
+  return {
+    province,
+    city,
+    provinceCode,
+    cityCode: normalizeCityAdcode(cityCode),
+  };
+}
+
 /** 区县 adcode → 地级市 adcode（如 410105 → 410100） */
 export function districtCodeToCityCode(districtCode: string): string {
   if (districtCode.length < 6) return districtCode;
@@ -42,14 +96,11 @@ export function formatRegionLabel(region: ParsedChinaRegion): string {
 export function matchOpenCityId(
   cities: OpenCityRef[],
   districtCode: string,
-  partnerId?: string,
+  partnerAccountId?: string,
 ): string | undefined {
   const cityCode = districtCodeToCityCode(districtCode);
-  const scoped = partnerId
-    ? cities.filter((c) => {
-        const pid = c.partnerId ?? c.partner?.id;
-        return !pid || String(pid) === partnerId;
-      })
+  const scoped = partnerAccountId
+    ? cities.filter((c) => cityBoundPartnerIds(c).includes(String(partnerAccountId)))
     : cities;
   return (
     scoped.find((c) => c.code === cityCode)?.id
@@ -61,11 +112,11 @@ export function matchOpenCityId(
 export function resolveRegionBinding(
   codes: string[],
   cities: OpenCityRef[],
-  partnerId?: string,
+  partnerAccountId?: string,
 ) {
   const region = parseRegionCodes(codes);
   if (!region) return null;
-  const cityId = matchOpenCityId(cities, region.districtCode, partnerId);
+  const cityId = matchOpenCityId(cities, region.districtCode, partnerAccountId);
   const matchedCity = cityId ? cities.find((c) => c.id === cityId) : undefined;
   return {
     region,

apps/admin-web/src/lib/hq-log.ts

@@ -1,6 +1,13 @@
 export const HQ_OPERATION_ACTION_OPTIONS = [
   { value: 'CITY_CREATE', label: '新增开城城市' },
   { value: 'CITY_UPDATE', label: '编辑开城城市' },
+  { value: 'CITY_DELETE', label: '删除开城城市' },
+  { value: 'CITY_PARTNER_BIND', label: '绑定城市合伙人' },
+  { value: 'CITY_PARTNER_UPDATE', label: '编辑城市合伙人绑定' },
+  { value: 'CITY_PARTNER_UNBIND', label: '解绑城市合伙人' },
+  { value: 'WAREHOUSE_CREATE', label: '新增城市仓库' },
+  { value: 'WAREHOUSE_UPDATE', label: '编辑城市仓库' },
+  { value: 'WAREHOUSE_DELETE', label: '删除城市仓库' },
   { value: 'PARTNER_CREATE', label: '新增城市合伙人' },
   { value: 'PARTNER_UPDATE', label: '编辑城市合伙人' },
   { value: 'PARTNER_ACCOUNT_CREATE', label: '新增合伙人账户' },

apps/admin-web/src/lib/storeCreate.ts

@@ -1,5 +1,5 @@
 export type StoreCreateForm = {
-  partnerId: string;
+  partnerAccountId: string;
   cityId: string;
   regionCodes?: string[];
   province?: string;
@@ -16,17 +16,18 @@ export type StoreCreateForm = {
   bankAccountName: string;
   bankAccountNo: string;
   bankBranch: string;
+  settlementRate?: number;
 };
 
 const PHONE_RE = /^1\d{10}$/;
 const BANK_RE = /^\d{16,19}$/;
 
 export function validateStoreCreateStep1(
-  form: Pick<StoreCreateForm, 'partnerId' | 'cityId' | 'regionCodes' | 'name' | 'phone' | 'address' | 'intro'>,
+  form: Pick<StoreCreateForm, 'partnerAccountId' | 'cityId' | 'regionCodes' | 'name' | 'phone' | 'address' | 'intro'>,
 ): string | null {
-  if (!form.partnerId) return '请选择开城合伙人';
+  if (!form.partnerAccountId) return '请选择开城合伙人';
   if (!form.regionCodes || form.regionCodes.length < 3) return '请选择省 / 市 / 区县';
-  if (!form.cityId) return '所选地区未匹配到开城城市，请先在「开城 → 开城城市」配置对应区划';
+  if (!form.cityId) return '所选地区未匹配到开城城市，请先在「开城 → 城市」配置对应区划';
   if (!form.name?.trim()) return '请填写门店名称';
   if (!form.phone?.trim()) return '请填写门店手机号';
   if (!PHONE_RE.test(form.phone.trim())) return '门店手机号须为11位手机号';