merge(dev_jacy): admin订单配送/仓库自动发货/跨城起购与mini-user联调

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

@@ -79,6 +79,11 @@ export type DashboardStats = {
   partnersTotal: number;
   redeemToday: number;
   deliveriesTotal: number;
+  pendingPayouts?: number;
+  /** 合伙人已确认、待总部审核打款 */
+  pendingBills?: number;
+  pendingPartnerDraftBills?: number;
+  openTickets?: number;
   ordersByStatus: Array<{ status: string; count: number }>;
 };
 
@@ -116,15 +121,36 @@ export type AdminUserRow = {
   orderCount: number;
 };
 
+export type AdminOrderItem = {
+  productName: string;
+  productSpec: string;
+  productImage: string;
+  unitPrice: number;
+  quantity: number;
+};
+
 export type AdminOrderRow = {
   id: string;
   orderNo: string;
   status: string;
   deliveryType: string;
   payAmount: number;
+  productName?: string;
+  productSpec?: string;
+  quantity?: number;
   receiverName: string;
   receiverPhone: string;
   createdAt: string;
+  cityId?: string;
+  city?: { id: string; name: string; code: string };
+  fulfillmentWarehouseId?: string | null;
+  fulfillmentWarehouse?: { id: string; name: string } | null;
   user?: { id: string; userNo: string; phone: string | null; nickname: string | null };
-  delivery?: { provider: string; trackingNo: string | null; providerOrderNo: string | null };
+  delivery?: {
+    provider: string;
+    trackingNo: string | null;
+    providerOrderNo: string | null;
+    logisticsCompany?: string | null;
+    manualQueryUrl?: string | null;
+  };
 };

apps/admin-web/src/pages/CityWarehousesPage.tsx

@@ -11,6 +11,7 @@ import {
   Popconfirm,
   Select,
   Space,
+  Switch,
   Table,
   Tag,
   Typography,
@@ -59,29 +60,54 @@ type PartnerOption = { id: string; companyName: string };
 const MANAGER_OPTIONS = Object.entries(WAREHOUSE_MANAGER_LABELS).map(([value, label]) => ({ value, label }));
 const STATUS_OPTIONS = Object.entries(WAREHOUSE_STATUS_LABELS).map(([value, label]) => ({ value, label }));
 
-const FULFILLMENT_MODE_OPTIONS = Object.entries(WAREHOUSE_FULFILLMENT_MODE_LABELS).map(([value, label]) => ({
-  value,
-  label,
-}));
-
 function FulfillmentFields({
   mode,
   providerOptions,
+  onModeChange,
 }: {
   mode: WarehouseFulfillmentMode;
   providerOptions: FulfillmentProviderDto[];
+  onModeChange: (mode: WarehouseFulfillmentMode) => void;
 }) {
+  const autoShip = mode === WarehouseFulfillmentMode.API_AUTO;
   return (
     <>
-      {mode === WarehouseFulfillmentMode.API_AUTO && (
-        <Form.Item name="fulfillmentProviderId" label="仓配承运商" rules={[{ required: true }]}>
+      <Form.Item
+        name="fulfillmentMode"
+        label="支付后自动发货"
+        extra={
+          autoShip
+            ? '同城订单支付成功后，自动推送仓配承运商（如小飞侠）并进入配送中'
+            : '支付后仅分配仓库，保持待发货，由仓管或总部手工填运单'
+        }
+        getValueProps={(v) => ({ checked: v === WarehouseFulfillmentMode.API_AUTO })}
+        getValueFromEvent={(checked: boolean) =>
+          checked ? WarehouseFulfillmentMode.API_AUTO : WarehouseFulfillmentMode.MANUAL
+        }
+      >
+        <Switch
+          checkedChildren="开"
+          unCheckedChildren="关"
+          onChange={(checked) => {
+            onModeChange(
+              checked ? WarehouseFulfillmentMode.API_AUTO : WarehouseFulfillmentMode.MANUAL,
+            );
+          }}
+        />
+      </Form.Item>
+      {autoShip && (
+        <Form.Item
+          name="fulfillmentProviderId"
+          label="仓配承运商"
+          rules={[{ required: true, message: '自动发货须选择承运商' }]}
+        >
           <Select
             placeholder={providerOptions.length ? '选择已注册承运商' : '请先在仓配管理注册'}
             options={providerOptions.map((p) => ({ value: p.id, label: `${p.name} (${p.code})` }))}
           />
         </Form.Item>
       )}
-      {mode === WarehouseFulfillmentMode.MANUAL && (
+      {!autoShip && (
         <>
           <Form.Item name="manualCarrierLabel" label="默认承运商名称">
             <Input placeholder="如 顺丰速运" />
@@ -183,18 +209,17 @@ export default function CityWarehousesPage() {
   }
 
   function onManagerTypeChange(
-    type: WarehouseManagerType,
-    form: typeof createForm | typeof editForm,
-    setType: (v: WarehouseManagerType) => void,
+    v: WarehouseManagerType,
+    form: typeof createForm,
+    setType: (t: WarehouseManagerType) => void,
   ) {
-    setType(type);
-    if (type !== WarehouseManagerType.PARTNER) {
+    setType(v);
+    if (v !== WarehouseManagerType.PARTNER) {
       form.setFieldValue('partnerAccountId', undefined);
     }
   }
 
   const columns: ColumnsType<Row> = [
-    { title: '仓库名', dataIndex: 'name', ellipsis: true, width: 140 },
     {
       title: '城市',
       width: 100,
@@ -204,17 +229,17 @@ export default function CityWarehousesPage() {
         </span>
       ),
     },
-    { title: '地址', dataIndex: 'address', ellipsis: true },
+    { title: '仓库', dataIndex: 'name', width: 140, ellipsis: true },
+    { title: '地址', dataIndex: 'address', width: 180, ellipsis: true },
     { title: '联系人', dataIndex: 'contactName', width: 90 },
     { title: '电话', dataIndex: 'contactPhone', width: 120 },
     {
-      title: '管仓类型',
-      dataIndex: 'managerType',
-      width: 100,
-      render: (v) => WAREHOUSE_MANAGER_LABELS[v as WarehouseManagerType] || v,
+      title: '管仓',
+      width: 90,
+      render: (_, row) => WAREHOUSE_MANAGER_LABELS[row.managerType] || row.managerType,
     },
     {
-      title: '管仓合伙人',
+      title: '合伙人',
       dataIndex: 'partnerCompanyName',
       width: 120,
       ellipsis: true,
@@ -226,12 +251,14 @@ export default function CityWarehousesPage() {
         ),
     },
     {
-      title: '履约',
-      width: 120,
+      title: '自动发货',
+      width: 130,
       render: (_, row) =>
-        row.fulfillmentMode === 'API_AUTO'
-          ? row.fulfillmentProviderName || 'API'
-          : WAREHOUSE_FULFILLMENT_MODE_LABELS[WarehouseFulfillmentMode.MANUAL],
+        row.fulfillmentMode === 'API_AUTO' ? (
+          <Tag color="blue">{row.fulfillmentProviderName || '自动'}</Tag>
+        ) : (
+          <Tag>{WAREHOUSE_FULFILLMENT_MODE_LABELS[WarehouseFulfillmentMode.MANUAL]}</Tag>
+        ),
     },
     {
       title: '状态',
@@ -274,21 +301,23 @@ export default function CityWarehousesPage() {
   return (
     <div>
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
-        <Typography.Title level={4} style={{ margin: 0 }}>
-          仓库管理
-        </Typography.Title>
+        <Typography.Title level={4} style={{ margin: 0 }}>仓库</Typography.Title>
         <Button
           type="primary"
           onClick={() => {
             createForm.resetFields();
-            createForm.setFieldsValue({ managerType: WarehouseManagerType.HQ, status: WarehouseStatus.ACTIVE });
             setCreateManagerType(WarehouseManagerType.HQ);
             setCreateCityId(undefined);
-            setPartners([]);
+            setCreateFulfillmentMode(WarehouseFulfillmentMode.MANUAL);
+            createForm.setFieldsValue({
+              managerType: WarehouseManagerType.HQ,
+              status: WarehouseStatus.ACTIVE,
+              fulfillmentMode: WarehouseFulfillmentMode.MANUAL,
+            });
             setCreateOpen(true);
           }}
         >
-          新建仓库
+          新增仓库
         </Button>
       </Space>
 
@@ -296,7 +325,7 @@ export default function CityWarehousesPage() {
         type="info"
         showIcon
         style={{ marginBottom: 16 }}
-        message="管仓合伙人仅可在此页面分配；城市合伙人详情中的管仓仓库为只读展示。"
+        message="同城有仓订单：支付后按「自动发货」开关决定是否推仓配 API；关闭则待人工填单。跨城/无仓仍走总部快递填单。"
       />
 
       <Form
@@ -309,7 +338,7 @@ export default function CityWarehousesPage() {
         }}
       >
         <Form.Item name="name" label="仓库名">
-          <Input allowClear placeholder="仓库名" />
+          <Input allowClear />
         </Form.Item>
         <Form.Item name="cityId" label="城市">
           <Select
@@ -317,47 +346,33 @@ export default function CityWarehousesPage() {
             showSearch
             optionFilterProp="label"
             style={{ width: 140 }}
-            placeholder="全部城市"
             options={cities.map((c) => ({ value: c.id, label: c.name }))}
           />
         </Form.Item>
-        <Form.Item name="managerType" label="管仓类型">
-          <Select allowClear style={{ width: 120 }} placeholder="全部" options={MANAGER_OPTIONS} />
+        <Form.Item name="managerType" label="管仓">
+          <Select allowClear style={{ width: 120 }} options={MANAGER_OPTIONS} />
         </Form.Item>
         <Form.Item name="status" label="状态">
-          <Select allowClear style={{ width: 100 }} placeholder="全部" options={STATUS_OPTIONS} />
+          <Select allowClear style={{ width: 100 }} options={STATUS_OPTIONS} />
         </Form.Item>
         <Form.Item>
-          <Space>
-            <Button type="primary" htmlType="submit">
-              查询
-            </Button>
-            <Button
-              onClick={() => {
-                filterForm.resetFields();
-                setFilters({});
-                setPage(1);
-              }}
-            >
-              重置
-            </Button>
-          </Space>
+          <Button type="primary" htmlType="submit">
+            查询
+          </Button>
         </Form.Item>
       </Form>
 
       <Table
         rowKey="id"
-        className="admin-table-nowrap"
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1100 }}
+        scroll={{ x: 1400 }}
         pagination={{
           current: page,
           pageSize,
           total: data?.total ?? 0,
           showSizeChanger: true,
-          showTotal: (t) => `共 ${t} 条`,
           onChange: (p, ps) => {
             setPage(p);
             setPageSize(ps);
@@ -366,7 +381,7 @@ export default function CityWarehousesPage() {
       />
 
       <Modal
-        title="新建仓库"
+        title="新增仓库"
         open={createOpen}
         width={520}
         onCancel={() => setCreateOpen(false)}
@@ -425,13 +440,11 @@ export default function CityWarehousesPage() {
           <Form.Item name="status" label="状态" initialValue={WarehouseStatus.ACTIVE}>
             <Select options={STATUS_OPTIONS} />
           </Form.Item>
-          <Form.Item name="fulfillmentMode" label="履约方式" initialValue={WarehouseFulfillmentMode.MANUAL}>
-            <Select
-              options={FULFILLMENT_MODE_OPTIONS}
-              onChange={(v) => setCreateFulfillmentMode(v)}
-            />
-          </Form.Item>
-          <FulfillmentFields mode={createFulfillmentMode} providerOptions={providerOptions} />
+          <FulfillmentFields
+            mode={createFulfillmentMode}
+            providerOptions={providerOptions}
+            onModeChange={setCreateFulfillmentMode}
+          />
         </Form>
       </Modal>
 
@@ -490,13 +503,11 @@ export default function CityWarehousesPage() {
           <Form.Item name="status" label="状态">
             <Select options={STATUS_OPTIONS} />
           </Form.Item>
-          <Form.Item name="fulfillmentMode" label="履约方式">
-            <Select
-              options={FULFILLMENT_MODE_OPTIONS}
-              onChange={(v) => setEditFulfillmentMode(v)}
-            />
-          </Form.Item>
-          <FulfillmentFields mode={editFulfillmentMode} providerOptions={providerOptions} />
+          <FulfillmentFields
+            mode={editFulfillmentMode}
+            providerOptions={providerOptions}
+            onModeChange={setEditFulfillmentMode}
+          />
         </Form>
       </Modal>
     </div>

apps/admin-web/src/pages/DashboardPage.tsx

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
 import {
   Button, Card, Col, Descriptions, Modal, Row, Space, Statistic, Table, Typography, message,
 } from 'antd';
@@ -164,6 +165,47 @@ export default function DashboardPage() {
           </Card>
         </Col>
       </Row>
+
+      <Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
+        <Col xs={24} sm={12} lg={8}>
+          <Card
+            loading={loading}
+            title="待审核合伙人打款"
+            extra={<Link to="/finance/partner-bills">去处理</Link>}
+          >
+            <Statistic
+              value={stats?.pendingBills ?? 0}
+              suffix="笔"
+              valueStyle={{ color: (stats?.pendingBills ?? 0) > 0 ? '#fa8c16' : undefined }}
+            />
+            <Typography.Text type="secondary">
+              合伙人已确认申请，待总部通过或驳回
+              {(stats?.pendingPartnerDraftBills ?? 0) > 0
+                ? `（另有 ${stats?.pendingPartnerDraftBills} 笔待合伙人确认）`
+                : ''}
+            </Typography.Text>
+          </Card>
+        </Col>
+        <Col xs={24} sm={12} lg={8}>
+          <Card
+            loading={loading}
+            title="待打款门店结算"
+            extra={<Link to="/finance/store-bills">去处理</Link>}
+          >
+            <Statistic
+              value={stats?.pendingPayouts ?? 0}
+              suffix="笔"
+              valueStyle={{ color: (stats?.pendingPayouts ?? 0) > 0 ? '#fa8c16' : undefined }}
+            />
+          </Card>
+        </Col>
+        <Col xs={24} sm={12} lg={8}>
+          <Card loading={loading} title="待处理工单">
+            <Statistic value={stats?.openTickets ?? 0} suffix="个" />
+          </Card>
+        </Col>
+      </Row>
+
       <Row gutter={[16, 16]}>
         <Col xs={24} lg={12}>
           <Card title="已合并访客账号" loading={loading}>

apps/admin-web/src/pages/FulfillmentProvidersPage.tsx

@@ -1,5 +1,6 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import {
+  Alert,
   Button,
   Form,
   Input,
@@ -17,6 +18,7 @@ import {
   FULFILLMENT_PROVIDER_TYPE_LABELS,
   FulfillmentProviderStatus,
   FulfillmentProviderType,
+  isXfxProviderCode,
   type FulfillmentProviderDto,
 } from '@dukang/shared-types';
 import { request } from '../lib/api';
@@ -30,6 +32,12 @@ const STATUS_OPTIONS = Object.entries(FULFILLMENT_PROVIDER_STATUS_LABELS).map(([
   value,
   label,
 }));
+const SIGN_OPTIONS = [
+  { value: 'MD5', label: 'MD5' },
+  { value: 'HMAC-SHA256', label: 'HMAC-SHA256' },
+];
+
+const DEFAULT_XFX_API_URL = 'https://beta.51xiaoju.cn/app/api/interface.do';
 
 export default function FulfillmentProvidersPage() {
   const [rows, setRows] = useState<FulfillmentProviderDto[]>([]);
@@ -37,6 +45,13 @@ export default function FulfillmentProvidersPage() {
   const [open, setOpen] = useState(false);
   const [editRow, setEditRow] = useState<FulfillmentProviderDto | null>(null);
   const [form] = Form.useForm();
+  const watchedCode = Form.useWatch('code', form);
+  const watchedType = Form.useWatch('type', form);
+
+  const showXfxFields = useMemo(
+    () => isXfxProviderCode(String(watchedCode || '')) && watchedType === FulfillmentProviderType.API,
+    [watchedCode, watchedType],
+  );
 
   const load = useCallback(async () => {
     setLoading(true);
@@ -56,48 +71,64 @@ export default function FulfillmentProvidersPage() {
     setEditRow(null);
     form.resetFields();
     form.setFieldsValue({
+      code: 'XFX',
+      name: '小飞侠',
       type: FulfillmentProviderType.API,
       status: FulfillmentProviderStatus.ACTIVE,
-      capabilitiesJson: JSON.stringify(
-        { createShipment: true, getTrack: true, callback: true },
-        null,
-        2,
-      ),
+      apiUrl: DEFAULT_XFX_API_URL,
+      signType: 'MD5',
     });
     setOpen(true);
   }
 
   function openEdit(row: FulfillmentProviderDto) {
     setEditRow(row);
+    const xfx = row.xiaofeixiaConfig;
     form.setFieldsValue({
       code: row.code,
       name: row.name,
       type: row.type,
       status: row.status,
-      capabilitiesJson: row.capabilities ? JSON.stringify(row.capabilities, null, 2) : '',
-      configJson: '',
+      apiUrl: xfx?.apiUrl || DEFAULT_XFX_API_URL,
+      mchId: xfx?.mchId || '',
+      apiKey: '',
+      signType: xfx?.signType || 'MD5',
+      appId: xfx?.appId || '',
     });
     setOpen(true);
   }
 
   async function submit() {
     const v = await form.validateFields();
+    const payload: Record<string, unknown> = {
+      name: v.name,
+      type: v.type,
+      status: v.status,
+    };
+
+    if (isXfxProviderCode(String(v.code)) && v.type === FulfillmentProviderType.API) {
+      payload.xiaofeixiaConfig = {
+        apiUrl: v.apiUrl,
+        mchId: v.mchId,
+        apiKey: v.apiKey || undefined,
+        signType: v.signType,
+        appId: v.appId || undefined,
+      };
+    }
+
     if (editRow) {
       await request(`/admin/fulfillment-providers/${editRow.id}`, {
         method: 'PUT',
-        body: JSON.stringify({
-          name: v.name,
-          type: v.type,
-          status: v.status,
-          configJson: v.configJson || undefined,
-          capabilitiesJson: v.capabilitiesJson || undefined,
-        }),
+        body: JSON.stringify(payload),
       });
       message.success('已更新');
     } else {
       await request('/admin/fulfillment-providers', {
         method: 'POST',
-        body: JSON.stringify(v),
+        body: JSON.stringify({
+          code: v.code,
+          ...payload,
+        }),
       });
       message.success('已创建');
     }
@@ -123,14 +154,18 @@ export default function FulfillmentProvidersPage() {
       ),
     },
     {
-      title: '能力',
+      title: '接口配置',
       render: (_, row) => {
-        const caps = row.capabilities;
-        if (!caps) return '—';
-        return Object.entries(caps)
-          .filter(([, on]) => on)
-          .map(([k]) => k)
-          .join('、') || '—';
+        if (isXfxProviderCode(row.code)) {
+          const cfg = row.xiaofeixiaConfig;
+          if (!cfg?.apiUrl) return <Tag>未配置</Tag>;
+          return (
+            <span title={cfg.apiUrl}>
+              {cfg.hasApiKey ? '已配置' : '缺 Key'} · {cfg.mchId || '无商户号'}
+            </span>
+          );
+        }
+        return row.hasConfig ? '已配置' : '—';
       },
     },
     { title: '更新时间', dataIndex: 'updatedAt', width: 170, render: fmtTime },
@@ -153,7 +188,7 @@ export default function FulfillmentProvidersPage() {
             仓配管理
           </Typography.Title>
           <Typography.Text type="secondary">
-            注册第三方履约接口后，仓库设置中方可选择对应承运商
+            注册第三方履约接口并填写凭证；仓库绑定后，推单将使用此处配置的 API 地址与密钥
           </Typography.Text>
         </div>
         <Button type="primary" onClick={openCreate}>
@@ -161,6 +196,13 @@ export default function FulfillmentProvidersPage() {
         </Button>
       </Space>
 
+      <Alert
+        type="info"
+        showIcon
+        style={{ marginBottom: 16 }}
+        message="小飞侠配置已从「系统设置 → 同城配送」迁至本页。寄件地址以仓库联系人/地址为准。"
+      />
+
       <Table rowKey="id" loading={loading} columns={columns} dataSource={rows} pagination={false} />
 
       <Modal
@@ -169,6 +211,7 @@ export default function FulfillmentProvidersPage() {
         onCancel={() => setOpen(false)}
         onOk={() => void submit()}
         width={560}
+        destroyOnClose
       >
         <Form form={form} layout="vertical">
           <Form.Item name="code" label="编码" rules={[{ required: true }]}>
@@ -183,12 +226,47 @@ export default function FulfillmentProvidersPage() {
           <Form.Item name="status" label="状态" rules={[{ required: true }]}>
             <Select options={STATUS_OPTIONS} />
           </Form.Item>
-          <Form.Item name="configJson" label="凭证配置 JSON（可选）">
-            <Input.TextArea rows={3} placeholder="API 密钥等，仅存服务端" />
-          </Form.Item>
-          <Form.Item name="capabilitiesJson" label="能力配置 JSON">
-            <Input.TextArea rows={4} />
-          </Form.Item>
+
+          {showXfxFields && (
+            <>
+              <Typography.Title level={5} style={{ marginTop: 8 }}>
+                小飞侠接口参数
+              </Typography.Title>
+              <Form.Item
+                name="apiUrl"
+                label="API 地址"
+                rules={[{ required: true, message: '请填写小飞侠 API 地址' }]}
+                extra="推单请求将发往此地址"
+              >
+                <Input placeholder={DEFAULT_XFX_API_URL} />
+              </Form.Item>
+              <Form.Item
+                name="mchId"
+                label="商户号"
+                rules={[{ required: true, message: '请填写商户号' }]}
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item
+                name="apiKey"
+                label="API Key"
+                rules={editRow ? [] : [{ required: true, message: '请填写 API Key' }]}
+                extra={
+                  editRow?.xiaofeixiaConfig?.hasApiKey
+                    ? '已配置密钥；留空则保持不变'
+                    : undefined
+                }
+              >
+                <Input.Password placeholder={editRow ? '留空则不修改' : '请输入'} />
+              </Form.Item>
+              <Form.Item name="signType" label="签名类型" initialValue="MD5">
+                <Select options={SIGN_OPTIONS} />
+              </Form.Item>
+              <Form.Item name="appId" label="AppID（可选）">
+                <Input />
+              </Form.Item>
+            </>
+          )}
         </Form>
       </Modal>
     </div>

apps/admin-web/src/pages/OrdersPage.tsx

@@ -9,6 +9,7 @@ import {
   Input,
   InputNumber,
   Modal,
+  Radio,
   Select,
   Space,
   Table,
@@ -17,8 +18,14 @@ import {
   message,
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
-import { request, type AdminOrderRow, type Paginated } from '../lib/api';
-import { DELIVERY_PROVIDER_LABELS, ORDER_STATUS_COLORS, ORDER_STATUS_LABELS, fmtTime } from '../lib/constants';
+import { request, type AdminOrderItem, type AdminOrderRow, type Paginated } from '../lib/api';
+import {
+  ADMIN_OPTIONS_PAGE_SIZE,
+  DELIVERY_PROVIDER_LABELS,
+  ORDER_STATUS_COLORS,
+  ORDER_STATUS_LABELS,
+  fmtTime,
+} from '../lib/constants';
 
 type ShipDefaults = {
   provider: string;
@@ -33,6 +40,21 @@ type ShipDefaults = {
   payMode: string;
 };
 
+type CityOption = { id: string; name: string; code: string };
+
+type WarehouseOption = {
+  id: string;
+  name: string;
+  cityId?: string;
+  cityName?: string;
+  status?: string;
+  contactName: string;
+  contactPhone: string;
+  address: string;
+  lng?: number | null;
+  lat?: number | null;
+};
+
 type OrderDetail = AdminOrderRow & {
   receiverAddress?: string;
   receiverProvince?: string;
@@ -51,17 +73,58 @@ type OrderDetail = AdminOrderRow & {
   productAmount?: number;
   freightAmount?: number;
   benefitAmount?: number;
-  deliveryType?: string;
-  fulfillmentWarehouseId?: string | null;
   paidAt?: string | null;
   payExpireAt?: string | null;
-  items?: Array<Record<string, unknown>>;
+  productImage?: string;
+  listUnitPrice?: number;
+  items?: AdminOrderItem[];
   payment?: Record<string, unknown> | null;
   statusLogs?: Array<{ fromStatus: string | null; toStatus: string; createdAt: string }>;
   benefitCoupons?: Array<Record<string, unknown>>;
-  city?: { name: string; code: string };
+  fulfillmentWarehouse?: {
+    id: string;
+    name: string;
+    contactName?: string;
+    contactPhone?: string;
+    address?: string;
+    lng?: number | null;
+    lat?: number | null;
+  } | null;
 };
 
+type ShipMode = 'WAREHOUSE' | 'EXPRESS';
+
+function orderProductRows(detail: OrderDetail): AdminOrderItem[] {
+  if (detail.items?.length) return detail.items;
+  if (!detail.productName) return [];
+  return [{
+    productName: detail.productName,
+    productSpec: detail.productSpec ?? '',
+    productImage: detail.productImage ?? '',
+    unitPrice: Number(detail.listUnitPrice ?? 0),
+    quantity: detail.quantity ?? 1,
+  }];
+}
+
+function canShip(row: { status: string; delivery?: { trackingNo?: string | null } | null }) {
+  return ['PENDING_SHIP', 'OUT_WAREHOUSE'].includes(row.status) && !row.delivery?.trackingNo;
+}
+
+function warehouseToDefaults(wh: WarehouseOption, base?: ShipDefaults | null): ShipDefaults {
+  return {
+    provider: 'XFX',
+    providerLabel: '小飞侠',
+    fromName: wh.contactName || base?.fromName || '杜康仓库',
+    fromMobile: wh.contactPhone || base?.fromMobile || '13800000000',
+    fromAddress: wh.address || base?.fromAddress || '',
+    fromAddressDetail: wh.name || base?.fromAddressDetail || '',
+    fromLng: wh.lng != null ? Number(wh.lng) : (base?.fromLng ?? 113.665),
+    fromLat: wh.lat != null ? Number(wh.lat) : (base?.fromLat ?? 34.757),
+    weight: base?.weight ?? 2,
+    payMode: base?.payMode ?? '1',
+  };
+}
+
 export default function OrdersPage() {
   const [form] = Form.useForm();
   const [shipForm] = Form.useForm();
@@ -78,6 +141,11 @@ export default function OrdersPage() {
   const [shipDefaults, setShipDefaults] = useState<ShipDefaults | null>(null);
   const [shipping, setShipping] = useState(false);
   const [logisticsShipping, setLogisticsShipping] = useState(false);
+  const [cities, setCities] = useState<CityOption[]>([]);
+  const [shipModalOpen, setShipModalOpen] = useState(false);
+  const [shipTarget, setShipTarget] = useState<OrderDetail | null>(null);
+  const [shipMode, setShipMode] = useState<ShipMode>('EXPRESS');
+  const [warehouses, setWarehouses] = useState<WarehouseOption[]>([]);
 
   const selectedOrders = useMemo(
     () => (data?.items ?? []).filter((row) => selectedRowKeys.includes(row.id)),
@@ -91,6 +159,7 @@ export default function OrdersPage() {
       const qs = new URLSearchParams({ page: String(page), pageSize: String(pageSize) });
       if (values.orderNo) qs.set('orderNo', values.orderNo);
       if (values.status) qs.set('status', values.status);
+      if (values.cityId) qs.set('cityId', values.cityId);
       if (values.receiverPhone) qs.set('receiverPhone', values.receiverPhone);
       const res = await request<Paginated<AdminOrderRow>>(`/admin/orders?${qs}`);
       setData(res);
@@ -105,40 +174,100 @@ export default function OrdersPage() {
 
   useEffect(() => {
     void request<ShipDefaults>('/admin/orders/ship-defaults').then(setShipDefaults).catch(() => {});
+    void request<Paginated<CityOption>>(`/admin/cities?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
+      .then((res) => setCities(res.items ?? []))
+      .catch(() => {});
   }, []);
 
+  function applyShipDefaults(defaults: ShipDefaults, warehouseId?: string | null) {
+    shipForm.setFieldsValue({
+      warehouseId: warehouseId || undefined,
+      provider: defaults.provider,
+      weight: defaults.weight,
+      payMode: defaults.payMode,
+      fromName: defaults.fromName,
+      fromMobile: defaults.fromMobile,
+      fromAddress: defaults.fromAddress,
+      fromAddressDetail: defaults.fromAddressDetail,
+      fromLng: defaults.fromLng,
+      fromLat: defaults.fromLat,
+    });
+  }
+
+  async function loadWarehouses() {
+    const res = await request<Paginated<WarehouseOption>>(
+      `/admin/city-warehouses?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}&status=ACTIVE`,
+    ).catch(() => null);
+    const rows = (res?.items ?? []).filter((w) => !w.status || w.status === 'ACTIVE');
+    setWarehouses(rows);
+    return rows;
+  }
+
   async function openDetail(id: string) {
     const res = await request<OrderDetail>(`/admin/orders/${id}`);
     setDetail(res);
     setDrawerOpen(true);
-    const defaults = shipDefaults ?? await request<ShipDefaults>('/admin/orders/ship-defaults').catch(() => null);
+  }
+
+  async function openShipModal(id: string) {
+    const res = await request<OrderDetail>(`/admin/orders/${id}`);
+    setShipTarget(res);
+    setDetail(res);
+    logisticsForm.setFieldsValue({
+      logisticsCompany: '',
+      trackingNo: '',
+      manualQueryUrl: '',
+    });
+    const rows = await loadWarehouses();
+    const preferredWarehouseId = res.fulfillmentWarehouseId || res.fulfillmentWarehouse?.id;
+    const preferred =
+      rows.find((w) => w.id === preferredWarehouseId) ||
+      rows.find((w) => w.cityId === (res.city?.id || res.cityId)) ||
+      rows[0];
+    const defaults = preferred
+      ? warehouseToDefaults(preferred, shipDefaults)
+      : (shipDefaults ?? await request<ShipDefaults>('/admin/orders/ship-defaults').catch(() => null));
     if (defaults) {
       setShipDefaults(defaults);
-      shipForm.setFieldsValue({
-        provider: defaults.provider,
-        weight: defaults.weight,
-        payMode: defaults.payMode,
-        fromName: defaults.fromName,
-        fromMobile: defaults.fromMobile,
-        fromAddress: defaults.fromAddress,
-        fromAddressDetail: defaults.fromAddressDetail,
-        fromLng: defaults.fromLng,
-        fromLat: defaults.fromLat,
-      });
+      applyShipDefaults(defaults, preferred?.id);
+    } else {
+      shipForm.setFieldsValue({ warehouseId: preferred?.id, provider: 'XFX' });
     }
+    setShipMode(preferred ? 'WAREHOUSE' : 'EXPRESS');
+    setShipModalOpen(true);
+  }
+
+  async function onWarehouseChange(warehouseId: string) {
+    const wh = warehouses.find((w) => w.id === warehouseId);
+    if (!wh) return;
+    applyShipDefaults(warehouseToDefaults(wh, shipDefaults), warehouseId);
   }
 
   async function submitShip() {
-    if (!detail) return;
+    if (!shipTarget) return;
     const values = await shipForm.validateFields();
     setShipping(true);
     try {
-      const res = await request<OrderDetail>(`/admin/orders/${detail.id}/ship`, {
+      const res = await request<OrderDetail>(`/admin/orders/${shipTarget.id}/ship`, {
         method: 'POST',
-        body: JSON.stringify(values),
+        body: JSON.stringify({
+          provider: values.provider || 'XFX',
+          warehouseId: values.warehouseId,
+          weight: values.weight,
+          payMode: values.payMode,
+          remark: values.remark,
+          fromName: values.fromName,
+          fromMobile: values.fromMobile,
+          fromAddress: values.fromAddress,
+          fromAddressDetail: values.fromAddressDetail,
+          fromLng: values.fromLng,
+          fromLat: values.fromLat,
+        }),
       });
-      message.success('发货成功');
+      message.success('选仓发货成功');
+      setShipTarget(res);
       setDetail(res);
+      setShipModalOpen(false);
       void load();
     } catch (e) {
       message.error(e instanceof Error ? e.message : '发货失败');
@@ -148,16 +277,28 @@ export default function OrdersPage() {
   }
 
   async function submitLogisticsShip() {
-    if (!detail) return;
-    const values = await logisticsForm.validateFields();
+    if (!shipTarget) return;
+    const values = await logisticsForm.validateFields(['logisticsCompany', 'trackingNo', 'manualQueryUrl']);
+    const logisticsCompany = String(values.logisticsCompany ?? '').trim();
+    const trackingNo = String(values.trackingNo ?? '').trim();
+    if (!logisticsCompany || !trackingNo) {
+      message.error('请填写快递公司与运单号');
+      return;
+    }
     setLogisticsShipping(true);
     try {
-      const res = await request<OrderDetail>(`/admin/orders/${detail.id}/logistics-ship`, {
+      const res = await request<OrderDetail>(`/admin/orders/${shipTarget.id}/logistics-ship`, {
         method: 'POST',
-        body: JSON.stringify(values),
+        body: JSON.stringify({
+          logisticsCompany,
+          trackingNo,
+          manualQueryUrl: String(values.manualQueryUrl ?? '').trim() || undefined,
+        }),
       });
       message.success('快递单已录入');
+      setShipTarget(res);
       setDetail(res);
+      setShipModalOpen(false);
       void load();
     } catch (e) {
       message.error(e instanceof Error ? e.message : '填单失败');
@@ -191,6 +332,25 @@ export default function OrdersPage() {
 
   const columns: ColumnsType<AdminOrderRow> = [
     { title: '订单号', dataIndex: 'orderNo', width: 180 },
+    {
+      title: '城市',
+      width: 90,
+      render: (_, row) => row.city?.name || '—',
+    },
+    {
+      title: '商品',
+      width: 180,
+      ellipsis: true,
+      render: (_, row) => {
+        const name = row.productName || '—';
+        const qty = row.quantity != null ? ` ×${row.quantity}` : '';
+        return (
+          <span title={row.productSpec ? `${name}（${row.productSpec}）` : name}>
+            {name}{qty}
+          </span>
+        );
+      },
+    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -227,11 +387,19 @@ export default function OrdersPage() {
     },
     {
       title: '操作',
-      width: 80,
+      width: 140,
+      fixed: 'right',
       render: (_, row) => (
-        <Button type="link" size="small" onClick={() => openDetail(row.id)}>
-          详情
-        </Button>
+        <Space size={0}>
+          <Button type="link" size="small" onClick={() => openDetail(row.id)}>
+            详情
+          </Button>
+          {canShip(row) && (
+            <Button type="link" size="small" onClick={() => void openShipModal(row.id)}>
+              配送
+            </Button>
+          )}
+        </Space>
       ),
     },
   ];
@@ -255,6 +423,16 @@ export default function OrdersPage() {
         <Form.Item name="status" label="状态">
           <Select allowClear style={{ width: 120 }} options={Object.entries(ORDER_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
         </Form.Item>
+        <Form.Item name="cityId" label="城市">
+          <Select
+            allowClear
+            showSearch
+            optionFilterProp="label"
+            style={{ width: 140 }}
+            placeholder="全部"
+            options={cities.map((c) => ({ value: c.id, label: c.name }))}
+          />
+        </Form.Item>
         <Form.Item name="receiverPhone" label="收货手机">
           <Input allowClear />
         </Form.Item>
@@ -271,7 +449,7 @@ export default function OrdersPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 1500 }}
         rowSelection={{
           selectedRowKeys,
           onChange: (keys) => setSelectedRowKeys(keys as string[]),
@@ -295,6 +473,11 @@ export default function OrdersPage() {
         onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Space>
+            {canShip(detail) && (
+              <Button type="primary" onClick={() => void openShipModal(detail.id)}>
+                配送发货
+              </Button>
+            )}
             <Typography.Text type="secondary">调试改状态</Typography.Text>
             <Select
               value={detail.status}
@@ -318,6 +501,13 @@ export default function OrdersPage() {
           <>
             <Descriptions column={1} bordered size="small" title="基本信息">
               <Descriptions.Item label="订单号">{detail.orderNo}</Descriptions.Item>
+              <Descriptions.Item label="开城城市">
+                {detail.city?.name || '—'}
+                {detail.city?.code ? `（${detail.city.code}）` : ''}
+              </Descriptions.Item>
+              <Descriptions.Item label="履约仓">
+                {detail.fulfillmentWarehouse?.name || '未分配'}
+              </Descriptions.Item>
               <Descriptions.Item label="状态">
                 <Tag color={ORDER_STATUS_COLORS[detail.status] || 'default'}>
                   {ORDER_STATUS_LABELS[detail.status] || detail.status}
@@ -330,6 +520,51 @@ export default function OrdersPage() {
               <Descriptions.Item label="下单时间">{new Date(detail.createdAt).toLocaleString('zh-CN')}</Descriptions.Item>
             </Descriptions>
 
+            <Typography.Title level={5} style={{ marginTop: 16, marginBottom: 8 }}>商品</Typography.Title>
+            <Table
+              size="small"
+              rowKey={(_, i) => String(i)}
+              pagination={false}
+              dataSource={orderProductRows(detail)}
+              locale={{ emptyText: '无商品信息' }}
+              columns={[
+                {
+                  title: '商品',
+                  dataIndex: 'productName',
+                  render: (name: string, row) => (
+                    <Space>
+                      {row.productImage ? (
+                        <img
+                          src={row.productImage}
+                          alt=""
+                          style={{ width: 40, height: 40, objectFit: 'cover', borderRadius: 4 }}
+                        />
+                      ) : null}
+                      <span>
+                        {name || '—'}
+                        {row.productSpec ? (
+                          <Typography.Text type="secondary" style={{ display: 'block', fontSize: 12 }}>
+                            {row.productSpec}
+                          </Typography.Text>
+                        ) : null}
+                      </span>
+                    </Space>
+                  ),
+                },
+                {
+                  title: '单价',
+                  dataIndex: 'unitPrice',
+                  width: 90,
+                  render: (v: number) => `¥${v}`,
+                },
+                {
+                  title: '数量',
+                  dataIndex: 'quantity',
+                  width: 70,
+                },
+              ]}
+            />
+
             <Descriptions column={1} bordered size="small" title="收货信息" style={{ marginTop: 16 }}>
               <Descriptions.Item label="收货人">{detail.receiverName} {detail.receiverPhone}</Descriptions.Item>
               <Descriptions.Item label="地址">{detail.receiverAddress}</Descriptions.Item>
@@ -363,99 +598,6 @@ export default function OrdersPage() {
               </Descriptions>
             )}
 
-            {['PENDING_SHIP', 'OUT_WAREHOUSE'].includes(detail.status) && !detail.delivery?.trackingNo && (
-              <div style={{ marginTop: 16 }}>
-                {(detail.deliveryType === 'CROSS_CITY' || !detail.fulfillmentWarehouseId) && (
-                  <>
-                    <Typography.Title level={5}>总部快递填单</Typography.Title>
-                    <Typography.Paragraph type="secondary" style={{ fontSize: 12 }}>
-                      适用于跨城订单或同城无仓订单
-                    </Typography.Paragraph>
-                    <Form form={logisticsForm} layout="vertical" size="small">
-                      <Form.Item name="logisticsCompany" label="快递公司" rules={[{ required: true }]}>
-                        <Input placeholder="如 顺丰速运、京东物流" />
-                      </Form.Item>
-                      <Form.Item name="trackingNo" label="运单号" rules={[{ required: true }]}>
-                        <Input />
-                      </Form.Item>
-                      <Form.Item name="manualQueryUrl" label="物流查询链接（可选）">
-                        <Input placeholder="https://..." />
-                      </Form.Item>
-                      <Button type="primary" loading={logisticsShipping} onClick={() => void submitLogisticsShip()}>
-                        提交快递单
-                      </Button>
-                    </Form>
-                  </>
-                )}
-
-                {detail.fulfillmentWarehouseId && (
-                  <>
-                    <Typography.Title level={5} style={{ marginTop: 16 }}>
-                      仓配小飞侠重试
-                    </Typography.Title>
-                    <Typography.Paragraph type="secondary" style={{ fontSize: 12 }}>
-                      仓配订单通常支付后自动推单；失败时可手动重试
-                    </Typography.Paragraph>
-                <Form form={shipForm} layout="vertical" size="small">
-                  <Form.Item name="provider" label="快递公司" rules={[{ required: true }]}>
-                    <Select
-                      options={[{ value: 'XFX', label: '小飞侠' }]}
-                    />
-                  </Form.Item>
-                  <Form.Item name="weight" label="重量(kg)" rules={[{ required: true }]}>
-                    <InputNumber min={0.01} step={0.5} style={{ width: '100%' }} />
-                  </Form.Item>
-                  <Form.Item name="payMode" label="付费方式" rules={[{ required: true }]}>
-                    <Select
-                      options={[
-                        { value: '1', label: '寄付' },
-                        { value: '2', label: '到付' },
-                      ]}
-                    />
-                  </Form.Item>
-                  <Form.Item name="remark" label="备注">
-                    <Input.TextArea rows={2} placeholder="可选" />
-                  </Form.Item>
-                  <Collapse
-                    ghost
-                    items={[{
-                      key: 'from',
-                      label: '寄件信息（默认仓库，可修改）',
-                      children: (
-                        <>
-                          <Form.Item name="fromName" label="寄件人" rules={[{ required: true }]}>
-                            <Input />
-                          </Form.Item>
-                          <Form.Item name="fromMobile" label="寄件手机" rules={[{ required: true }]}>
-                            <Input />
-                          </Form.Item>
-                          <Form.Item name="fromAddress" label="寄件区域" rules={[{ required: true }]}>
-                            <Input />
-                          </Form.Item>
-                          <Form.Item name="fromAddressDetail" label="寄件详细地址" rules={[{ required: true }]}>
-                            <Input />
-                          </Form.Item>
-                          <Space>
-                            <Form.Item name="fromLng" label="经度">
-                              <InputNumber step={0.001} />
-                            </Form.Item>
-                            <Form.Item name="fromLat" label="纬度">
-                              <InputNumber step={0.001} />
-                            </Form.Item>
-                          </Space>
-                        </>
-                      ),
-                    }]}
-                  />
-                  <Button type="primary" loading={shipping} onClick={() => void submitShip()}>
-                    调用小飞侠发货
-                  </Button>
-                </Form>
-                  </>
-                )}
-              </div>
-            )}
-
             {detail.statusLogs && detail.statusLogs.length > 0 && (
               <>
                 <Typography.Title level={5} style={{ marginTop: 16 }}>状态流转</Typography.Title>
@@ -476,6 +618,150 @@ export default function OrdersPage() {
         )}
       </Drawer>
 
+      <Modal
+        title={shipTarget ? `配送发货 · ${shipTarget.orderNo}` : '配送发货'}
+        open={shipModalOpen}
+        onCancel={() => setShipModalOpen(false)}
+        width={560}
+        destroyOnClose={false}
+        forceRender
+        footer={
+          <Space>
+            <Button onClick={() => setShipModalOpen(false)}>取消</Button>
+            {shipMode === 'WAREHOUSE' ? (
+              <Button type="primary" loading={shipping} onClick={() => void submitShip()}>
+                确认选仓发货
+              </Button>
+            ) : (
+              <Button type="primary" loading={logisticsShipping} onClick={() => void submitLogisticsShip()}>
+                提交快递单
+              </Button>
+            )}
+          </Space>
+        }
+      >
+        {shipTarget && (
+          <>
+            <Descriptions size="small" column={1} style={{ marginBottom: 16 }}>
+              <Descriptions.Item label="城市">{shipTarget.city?.name || '—'}</Descriptions.Item>
+              <Descriptions.Item label="收货">
+                {shipTarget.receiverName} {shipTarget.receiverPhone}
+              </Descriptions.Item>
+              <Descriptions.Item label="商品">
+                {shipTarget.productName || '—'}
+                {shipTarget.quantity != null ? ` ×${shipTarget.quantity}` : ''}
+              </Descriptions.Item>
+            </Descriptions>
+
+            <Radio.Group
+              value={shipMode}
+              onChange={(e) => setShipMode(e.target.value as ShipMode)}
+              optionType="button"
+              buttonStyle="solid"
+              style={{ marginBottom: 16 }}
+              options={[
+                { value: 'WAREHOUSE', label: '选仓配送' },
+                { value: 'EXPRESS', label: '填写快递单号' },
+              ]}
+            />
+
+            <div style={{ display: shipMode === 'WAREHOUSE' ? 'block' : 'none' }}>
+              <Form form={shipForm} layout="vertical" size="small" preserve>
+                <Form.Item
+                  name="warehouseId"
+                  label="选择仓库"
+                  rules={[{ required: true, message: '请选择仓库' }]}
+                >
+                  <Select
+                    showSearch
+                    optionFilterProp="label"
+                    placeholder={warehouses.length ? '选择仓库' : '暂无可用仓库'}
+                    options={warehouses.map((w) => ({
+                      value: w.id,
+                      label: w.cityName ? `${w.cityName} · ${w.name}` : w.name,
+                    }))}
+                    onChange={(id) => void onWarehouseChange(id)}
+                  />
+                </Form.Item>
+                <Form.Item name="provider" label="承运商" rules={[{ required: true }]} initialValue="XFX">
+                  <Select options={[{ value: 'XFX', label: '小飞侠' }]} />
+                </Form.Item>
+                <Form.Item name="weight" label="重量(kg)" rules={[{ required: true }]}>
+                  <InputNumber min={0.01} step={0.5} style={{ width: '100%' }} />
+                </Form.Item>
+                <Form.Item name="payMode" label="付费方式" rules={[{ required: true }]}>
+                  <Select
+                    options={[
+                      { value: '1', label: '寄付' },
+                      { value: '2', label: '到付' },
+                    ]}
+                  />
+                </Form.Item>
+                <Form.Item name="remark" label="备注">
+                  <Input.TextArea rows={2} placeholder="可选" />
+                </Form.Item>
+                <Collapse
+                  ghost
+                  items={[{
+                    key: 'from',
+                    label: '寄件信息（默认仓库，可修改）',
+                    children: (
+                      <>
+                        <Form.Item name="fromName" label="寄件人" rules={[{ required: true }]}>
+                          <Input />
+                        </Form.Item>
+                        <Form.Item name="fromMobile" label="寄件手机" rules={[{ required: true }]}>
+                          <Input />
+                        </Form.Item>
+                        <Form.Item name="fromAddress" label="寄件区域" rules={[{ required: true }]}>
+                          <Input />
+                        </Form.Item>
+                        <Form.Item name="fromAddressDetail" label="寄件详细地址" rules={[{ required: true }]}>
+                          <Input />
+                        </Form.Item>
+                        <Space>
+                          <Form.Item name="fromLng" label="经度">
+                            <InputNumber step={0.001} />
+                          </Form.Item>
+                          <Form.Item name="fromLat" label="纬度">
+                            <InputNumber step={0.001} />
+                          </Form.Item>
+                        </Space>
+                      </>
+                    ),
+                  }]}
+                />
+              </Form>
+            </div>
+
+            <div style={{ display: shipMode === 'EXPRESS' ? 'block' : 'none' }}>
+              <Form form={logisticsForm} layout="vertical" size="small" preserve>
+                <Typography.Paragraph type="secondary" style={{ fontSize: 12, marginTop: 0 }}>
+                  填写快递公司与运单号即可完成发货
+                </Typography.Paragraph>
+                <Form.Item
+                  name="logisticsCompany"
+                  label="快递公司"
+                  rules={[{ required: true, message: '请填写快递公司' }]}
+                >
+                  <Input placeholder="如 顺丰速运、京东物流" />
+                </Form.Item>
+                <Form.Item
+                  name="trackingNo"
+                  label="运单号"
+                  rules={[{ required: true, message: '请填写运单号' }]}
+                >
+                  <Input placeholder="请输入运单号" />
+                </Form.Item>
+                <Form.Item name="manualQueryUrl" label="物流查询链接（可选）">
+                  <Input placeholder="https://..." />
+                </Form.Item>
+              </Form>
+            </div>
+          </>
+        )}
+      </Modal>
+
       <Modal
         title={`确认批量删除（${selectedOrders.length} 笔）`}
         open={batchDeleteOpen}
@@ -501,13 +787,27 @@ export default function OrdersPage() {
           dataSource={selectedOrders}
           columns={[
             { title: '订单号', dataIndex: 'orderNo', width: 170 },
+            {
+              title: '城市',
+              width: 80,
+              render: (_, row) => row.city?.name || '—',
+            },
+            {
+              title: '商品',
+              width: 160,
+              ellipsis: true,
+              render: (_, row) =>
+                row.productName
+                  ? `${row.productName}${row.quantity != null ? ` ×${row.quantity}` : ''}`
+                  : '—',
+            },
             {
               title: '状态',
               dataIndex: 'status',
               width: 100,
               render: (s) => (
-        <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
-      ),
+                <Tag color={ORDER_STATUS_COLORS[s] || 'default'}>{ORDER_STATUS_LABELS[s] || s}</Tag>
+              ),
             },
             { title: '实付', dataIndex: 'payAmount', width: 90, render: (v) => `¥${v}` },
             { title: '收货人', dataIndex: 'receiverName', width: 90 },

apps/admin-web/src/pages/PartnerBillsPage.tsx

@@ -4,6 +4,7 @@ import {
   Card,
   DatePicker,
   Form,
+  Input,
   Modal,
   Select,
   Space,
@@ -29,6 +30,7 @@ type Row = {
   status: string;
   periodStart: string;
   periodEnd: string;
+  rejectReason?: string | null;
   partner?: { companyName?: string; phone?: string };
   partnerAccount?: { companyName?: string; phone?: string };
 };
@@ -36,15 +38,17 @@ type Row = {
 type PartnerOption = { id: string; companyName: string; phone?: string };
 
 const STATUS_LABELS: Record<string, string> = {
-  DRAFT: '草稿',
-  CONFIRMED: '已确认',
+  DRAFT: '待合伙人确认',
+  CONFIRMED: '待打款审核',
   PAID: '已打款',
+  REJECTED: '已驳回',
 };
 
 const STATUS_COLORS: Record<string, string> = {
   DRAFT: 'default',
-  CONFIRMED: 'blue',
+  CONFIRMED: 'orange',
   PAID: 'green',
+  REJECTED: 'red',
 };
 
 export default function PartnerBillsPage() {
@@ -66,6 +70,10 @@ export default function PartnerBillsPage() {
   const [genOpen, setGenOpen] = useState(false);
   const [genForm] = Form.useForm();
   const [exporting, setExporting] = useState(false);
+  const [rejectOpen, setRejectOpen] = useState(false);
+  const [rejectTarget, setRejectTarget] = useState<Row | null>(null);
+  const [rejectForm] = Form.useForm();
+  const [rejecting, setRejecting] = useState(false);
 
   useEffect(() => {
     void request<Paginated<PartnerOption>>(`/admin/partners?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`)
@@ -95,7 +103,7 @@ export default function PartnerBillsPage() {
 
   async function confirmBill(id: string) {
     await request(`/admin/partner-bills/${id}/confirm`, { method: 'POST' });
-    message.success('已确认');
+    message.success('已代确认，进入待打款审核');
     reload();
   }
 
@@ -104,10 +112,33 @@ export default function PartnerBillsPage() {
       method: 'POST',
       body: JSON.stringify({ paymentRef: `PAY-${Date.now()}` }),
     });
-    message.success('已标记打款');
+    message.success('已通过并标记打款');
     reload();
   }
 
+  function openReject(row: Row) {
+    setRejectTarget(row);
+    rejectForm.resetFields();
+    setRejectOpen(true);
+  }
+
+  async function submitReject(values: { reason: string }) {
+    if (!rejectTarget) return;
+    setRejecting(true);
+    try {
+      await request(`/admin/partner-bills/${rejectTarget.id}/reject`, {
+        method: 'POST',
+        body: JSON.stringify({ reason: values.reason.trim() }),
+      });
+      message.success('已驳回打款申请');
+      setRejectOpen(false);
+      setRejectTarget(null);
+      reload();
+    } finally {
+      setRejecting(false);
+    }
+  }
+
   async function exportExcel() {
     setExporting(true);
     try {
@@ -163,24 +194,38 @@ export default function PartnerBillsPage() {
     {
       title: '状态',
       dataIndex: 'status',
-      width: 90,
-      render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
+      width: 120,
+      render: (s, row) => (
+        <Space direction="vertical" size={0}>
+          <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>
+          {s === 'REJECTED' && row.rejectReason ? (
+            <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+              {row.rejectReason}
+            </Typography.Text>
+          ) : null}
+        </Space>
+      ),
     },
     {
       title: '操作',
-      width: 160,
+      width: 220,
       fixed: 'right',
       render: (_, row) => (
-        <Space size={0}>
+        <Space size={0} wrap>
           {row.status === 'DRAFT' && (
             <Button type="link" size="small" onClick={() => void confirmBill(row.id)}>
-              确认
+              代确认
             </Button>
           )}
           {row.status === 'CONFIRMED' && (
-            <Button type="link" size="small" onClick={() => void markPaid(row.id)}>
-              标记打款
-            </Button>
+            <>
+              <Button type="link" size="small" onClick={() => void markPaid(row.id)}>
+                通过打款
+              </Button>
+              <Button type="link" size="small" danger onClick={() => openReject(row)}>
+                驳回
+              </Button>
+            </>
           )}
         </Space>
       ),
@@ -194,7 +239,7 @@ export default function PartnerBillsPage() {
           合伙人账单
         </Typography.Title>
         <Typography.Text type="secondary">
-          T+30 结算：按自然月汇总酒单佣金（酒单价 × 酒单佣金比例）与门店核销佣金（核销额 × 核销佣金比例）
+          T+30 结算：合伙人确认并申请打款后，总部在此审核通过或驳回（驳回须填写理由）
         </Typography.Text>
       </Space>
 
@@ -242,7 +287,7 @@ export default function PartnerBillsPage() {
         <Form.Item name="status" label="状态">
           <Select
             allowClear
-            style={{ width: 120 }}
+            style={{ width: 140 }}
             options={Object.entries(STATUS_LABELS).map(([value, label]) => ({ value, label }))}
           />
         </Form.Item>
@@ -280,7 +325,7 @@ export default function PartnerBillsPage() {
         loading={loading}
         columns={columns}
         dataSource={data?.items ?? []}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 1280 }}
         pagination={{
           current: page,
           pageSize,
@@ -320,6 +365,38 @@ export default function PartnerBillsPage() {
           </Button>
         </Form>
       </Modal>
+
+      <Modal
+        title="驳回打款申请"
+        open={rejectOpen}
+        onCancel={() => {
+          setRejectOpen(false);
+          setRejectTarget(null);
+        }}
+        footer={null}
+        destroyOnClose
+      >
+        <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
+          账单 {rejectTarget?.billNo} · {rejectTarget ? partnerName(rejectTarget) : ''}
+          <br />
+          驳回理由将展示在合伙人 H5 账单页。
+        </Typography.Paragraph>
+        <Form form={rejectForm} layout="vertical" onFinish={(v) => void submitReject(v)}>
+          <Form.Item
+            name="reason"
+            label="驳回理由"
+            rules={[
+              { required: true, message: '请填写驳回理由' },
+              { max: 500, message: '不超过 500 字' },
+            ]}
+          >
+            <Input.TextArea rows={4} placeholder="请说明驳回原因，便于合伙人核对后重新申请" maxLength={500} showCount />
+          </Form.Item>
+          <Button type="primary" danger htmlType="submit" block loading={rejecting}>
+            确认驳回
+          </Button>
+        </Form>
+      </Modal>
     </div>
   );
 }

apps/admin-web/src/pages/XiaofeixiaTestPage.tsx

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
 import {
   Alert, Button, Card, Col, Descriptions, Form, Input, InputNumber, Row, Select, Space,
   Tabs, Tag, Typography, message,
@@ -15,6 +16,8 @@ type XfxConfig = {
   hasApiKey: boolean;
   signType: string;
   ready: boolean;
+  source?: string;
+  hint?: string;
 };
 
 type ApiResult = {
@@ -115,8 +118,9 @@ export default function XiaofeixiaTestPage() {
     <div>
       <Typography.Title level={4}>小飞侠接口联调</Typography.Title>
       <Typography.Paragraph type="secondary">
-        通过 HQ 后台直接调用后端封装的小飞侠 API（cmd 100101~100301）。请确保服务器已配置
-        {' '}<code>XIAOFEIXIA_MCH_ID</code>、<code>XIAOFEIXIA_API_KEY</code>。
+        通过 HQ 后台直接调用后端封装的小飞侠 API（cmd 100101~100301）。凭证请在
+        <Link to="/fulfillment-providers">仓配管理</Link>
+        中配置；联调会优先使用仓配管理里启用的小飞侠承运商。
       </Typography.Paragraph>
 
       {config && (
@@ -132,13 +136,17 @@ export default function XiaofeixiaTestPage() {
             <Descriptions.Item label="状态">
               {config.ready ? <Tag color="green">可调用</Tag> : <Tag color="orange">配置不完整</Tag>}
             </Descriptions.Item>
+            <Descriptions.Item label="来源" span={3}>
+              {config.source === 'fulfillment_provider' ? '仓配管理' : '环境变量(兼容)'}
+              {config.hint ? ` · ${config.hint}` : ''}
+            </Descriptions.Item>
           </Descriptions>
           {!config.ready && (
             <Alert
               type="warning"
               showIcon
               style={{ marginTop: 12 }}
-              message="请在 server/dukang-api/.env 中配置 XIAOFEIXIA_MCH_ID 与 XIAOFEIXIA_API_KEY 后重启 API"
+              message="请先在仓配管理中注册小飞侠并填写 API 地址、商户号与 API Key"
             />
           )}
         </Card>

apps/h5-partner/src/PartnerAppRoutes.tsx

@@ -13,7 +13,6 @@ import CenterPage from './pages/CenterPage';
 import PartnerMePage from './pages/PartnerMePage';
 import BillsPage from './pages/BillsPage';
 import SettlementPage from './pages/SettlementPage';
-import ReshipPage from './pages/ReshipPage';
 import WeeklyReportPage from './pages/WeeklyReportPage';
 import ProxyOrderPage from './pages/ProxyOrderPage';
 import StaffListPage from './pages/StaffListPage';
@@ -34,7 +33,6 @@ function PrimaryRoutes() {
       <Route path="/center/staff" element={<StaffListPage />} />
       <Route path="/center/staff/new" element={<StaffCreatePage />} />
       <Route path="/proxy-order" element={<ProxyOrderPage />} />
-      <Route path="/reshipments" element={<ReshipPage />} />
       <Route path="/reports/weekly" element={<WeeklyReportPage />} />
       <Route path="/leaderboard" element={<LeaderboardPage />} />
       <Route path="/stores/:id" element={<StoreDetailPage />} />

apps/h5-partner/src/contexts/PartnerSessionContext.tsx

@@ -53,6 +53,10 @@ function accountFromProfile(profile: PartnerSessionProfile): PartnerAccount {
     primaryPhone: profile.primaryPhone,
     primaryName: profile.primaryName,
     hasWechat: profile.hasWechat,
+    wxNickname: profile.wxNickname,
+    wxAvatarUrl: profile.wxAvatarUrl,
+    managedWarehouseId: profile.managedWarehouseId,
+    hasWarehouseAccess: profile.hasWarehouseAccess,
   };
 }
 

apps/h5-partner/src/lib/api.ts

@@ -24,7 +24,20 @@ const AUTH_RECOVERY_EXEMPT_PATHS = [
 
 export type PartnerSessionProfile = Pick<
   PartnerMe,
-  'id' | 'name' | 'phone' | 'companyName' | 'isPrimary' | 'permissions' | 'primaryAccountId' | 'primaryPhone' | 'primaryName' | 'hasWechat'
+  | 'id'
+  | 'name'
+  | 'phone'
+  | 'companyName'
+  | 'isPrimary'
+  | 'permissions'
+  | 'primaryAccountId'
+  | 'primaryPhone'
+  | 'primaryName'
+  | 'hasWechat'
+  | 'wxNickname'
+  | 'wxAvatarUrl'
+  | 'managedWarehouseId'
+  | 'hasWarehouseAccess'
 > & {
   staffRole?: PartnerStaffRole;
 };
@@ -112,6 +125,10 @@ function profileFromMe(me: PartnerMe): PartnerSessionProfile {
     primaryPhone: me.primaryPhone,
     primaryName: me.primaryName,
     hasWechat: me.hasWechat,
+    wxNickname: me.wxNickname,
+    wxAvatarUrl: me.wxAvatarUrl,
+    managedWarehouseId: me.managedWarehouseId,
+    hasWarehouseAccess: me.hasWarehouseAccess,
   };
 }
 

apps/h5-partner/src/lib/partnerAccess.ts

@@ -35,6 +35,15 @@ export function getPartnerNavKind(account: PartnerMe | null | undefined): Partne
   return 'store_staff';
 }
 
+/** 是否已配置管仓：主账号看 hasWarehouseAccess；子账号还需有仓库相关权限 */
+export function hasWarehouseAccess(account: PartnerMe | null | undefined): boolean {
+  if (!account) return false;
+  if (account.hasWarehouseAccess === false) return false;
+  if (account.hasWarehouseAccess === true) return true;
+  // 旧缓存无字段时保守：主账号未知视为无，避免误展示全城订单
+  return false;
+}
+
 export function partnerHomePath(account: PartnerMe | null | undefined): string {
   return '/';
 }

apps/h5-partner/src/lib/wechat-auth.ts

@@ -14,6 +14,8 @@ export type PartnerProfile = {
   phone: string;
   companyName?: string;
   hasWechat?: boolean;
+  wxNickname?: string | null;
+  wxAvatarUrl?: string | null;
   isPrimary?: boolean;
 };
 
@@ -82,6 +84,8 @@ export function sessionFromWechatLogin(result: WechatLoginResult): PartnerSessio
           companyName: partner.companyName ? String(partner.companyName) : undefined,
           isPrimary: partner.isPrimary !== false,
           hasWechat: true,
+          wxNickname: partner.wxNickname ? String(partner.wxNickname) : undefined,
+          wxAvatarUrl: partner.wxAvatarUrl ? String(partner.wxAvatarUrl) : undefined,
         }
       : undefined,
   };

apps/h5-partner/src/pages/BillsPage.tsx

@@ -1,42 +1,96 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
+import type { PartnerBillDto } from '@dukang/shared-types';
 import { isLoggedIn, request } from '../lib/api';
+import { toastError, toastSuccess } from '../lib/toast';
+
+function fmtMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+}
+
+function billStatusLabel(status: string) {
+  switch (status) {
+    case 'DRAFT': return '待确认';
+    case 'CONFIRMED': return '审核中';
+    case 'PAID': return '已结算';
+    case 'REJECTED': return '已驳回';
+    default: return status;
+  }
+}
+
+function canApplyPayment(status: string) {
+  return status === 'DRAFT' || status === 'REJECTED';
+}
 
 export default function BillsPage() {
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
-  const [bills, setBills] = useState<Array<Record<string, unknown>>>([]);
+  const [bills, setBills] = useState<PartnerBillDto[]>([]);
   const [confirmed, setConfirmed] = useState(false);
   const [submitting, setSubmitting] = useState(false);
+  const [loading, setLoading] = useState(true);
+
+  async function loadBills() {
+    setLoading(true);
+    try {
+      const list = await request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills');
+      setBills(Array.isArray(list) ? list : []);
+    } catch {
+      setBills([]);
+    } finally {
+      setLoading(false);
+    }
+  }
 
   useEffect(() => {
     if (!isLoggedIn()) { navigate('/login'); return; }
-    request<Array<Record<string, unknown>>>('PARTNER_H5', '/partner/settlement/bills').then(setBills);
+    void loadBills();
   }, [navigate]);
 
   const billId = searchParams.get('id');
+  const actionable = useMemo(
+    () => bills.filter((b) => canApplyPayment(b.status)),
+    [bills],
+  );
   const bill = billId
-    ? bills.find((b) => String(b.id) === billId) ?? bills[0]
-    : bills[0];
+    ? bills.find((b) => String(b.id) === billId) ?? actionable[0] ?? bills[0]
+    : actionable[0] ?? bills[0];
 
-  function confirmBill() {
-    if (!confirmed) return;
+  const status = String(bill?.status || '');
+  const showApplyForm = !!bill && canApplyPayment(status);
+  const isReviewing = status === 'CONFIRMED';
+  const isRejected = status === 'REJECTED';
+  const isPaid = status === 'PAID';
+
+  async function confirmBill() {
+    if (!bill || !confirmed || !canApplyPayment(String(bill.status))) return;
     setSubmitting(true);
-    setTimeout(() => {
+    try {
+      await request('PARTNER_H5', `/partner/settlement/bills/${bill.id}/confirm`, {
+        method: 'POST',
+      });
+      toastSuccess('申请已提交，请耐心等待总部打款审核');
+      setConfirmed(false);
+      await loadBills();
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '提交失败');
+    } finally {
       setSubmitting(false);
-      alert('申请已提交，请耐心等待打款审核。（preV1 演示）');
-    }, 1500);
+    }
   }
 
   return (
     <div className="partner-bills-page">
-      <PageHeader title="待确认账单" onBack={() => navigate('/center/settlement')} />
+      <PageHeader title="账单确认" onBack={() => navigate('/center/settlement')} />
 
       <div className="partner-bill-stepper">
         <div className="partner-stepper-inner">
           <div className="partner-stepper-line" aria-hidden>
-            <div className="partner-stepper-line-fill" style={{ width: '50%' }} />
+            <div
+              className="partner-stepper-line-fill"
+              style={{ width: isPaid ? '100%' : isReviewing || isRejected ? '75%' : '50%' }}
+            />
           </div>
           <div className="partner-step">
             <div className="partner-step-circle partner-step-circle--sm partner-step-circle--done">
@@ -45,17 +99,28 @@ export default function BillsPage() {
             <span className="partner-step-label partner-step-label--active">数据核算</span>
           </div>
           <div className="partner-step">
-            <div className="partner-step-circle partner-step-circle--sm partner-step-circle--active">2</div>
+            <div className={`partner-step-circle partner-step-circle--sm${showApplyForm || isReviewing || isRejected || isPaid ? ' partner-step-circle--done' : ' partner-step-circle--active'}`}>
+              {showApplyForm && !confirmed ? '2' : (
+                <span className="material-symbols-outlined" style={{ fontSize: 14, fontVariationSettings: "'FILL' 1" }}>check</span>
+              )}
+            </div>
             <span className="partner-step-label partner-step-label--active">账单确认</span>
           </div>
           <div className="partner-step">
-            <div className="partner-step-circle partner-step-circle--sm">3</div>
-            <span className="partner-step-label">申请打款</span>
+            <div className={`partner-step-circle partner-step-circle--sm${isPaid ? ' partner-step-circle--done' : isReviewing || isRejected ? ' partner-step-circle--active' : ''}`}>
+              {isPaid ? (
+                <span className="material-symbols-outlined" style={{ fontSize: 14, fontVariationSettings: "'FILL' 1" }}>check</span>
+              ) : '3'}
+            </div>
+            <span className={`partner-step-label${isReviewing || isRejected || isPaid ? ' partner-step-label--active' : ''}`}>
+              {isRejected ? '已驳回' : isPaid ? '已打款' : '申请打款'}
+            </span>
           </div>
         </div>
       </div>
 
-      {!bill && <div className="empty">暂无账单</div>}
+      {loading && <div className="empty">加载中…</div>}
+      {!loading && !bill && <div className="empty">暂无账单</div>}
 
       {bill && (
         <section className="partner-bill-card">
@@ -66,25 +131,46 @@ export default function BillsPage() {
                 <p className="label-md text-muted" style={{ textTransform: 'uppercase', letterSpacing: '0.1em', marginBottom: 4 }}>SETTLEMENT PERIOD</p>
                 <h2 className="headline-lg" style={{ fontSize: 20 }}>{String(bill.billNo || '月度结算账单')}</h2>
               </div>
-              <span className="partner-status-pill partner-status-pill--paused">{String(bill.status || '待确认')}</span>
+              <span className={`partner-status-pill${isRejected ? ' partner-status-pill--closed' : isReviewing ? ' partner-status-pill--paused' : isPaid ? ' partner-status-pill--open' : ' partner-status-pill--paused'}`}>
+                {billStatusLabel(status)}
+              </span>
             </div>
 
+            {isRejected && bill.rejectReason && (
+              <div className="partner-info-banner" style={{ marginBottom: 16, background: 'rgba(166,29,36,0.06)' }}>
+                <span className="material-symbols-outlined text-primary" style={{ fontVariationSettings: "'FILL' 1" }}>error</span>
+                <div>
+                  <p className="body-md text-primary" style={{ fontWeight: 600, marginBottom: 4 }}>打款申请已驳回</p>
+                  <p className="body-md text-variant" style={{ lineHeight: 1.5 }}>{bill.rejectReason}</p>
+                </div>
+              </div>
+            )}
+
+            {isReviewing && (
+              <div className="partner-info-banner" style={{ marginBottom: 16 }}>
+                <span className="material-symbols-outlined text-primary" style={{ fontVariationSettings: "'FILL' 1" }}>hourglass_top</span>
+                <p className="body-md text-variant" style={{ lineHeight: 1.5 }}>
+                  您已提交打款申请，总部审核中，请耐心等待。
+                </p>
+              </div>
+            )}
+
             <div className="partner-bill-amount">
               <p className="text-muted body-md" style={{ marginBottom: 8 }}>应结总金额</p>
               <div style={{ display: 'flex', alignItems: 'baseline', justifyContent: 'center', gap: 4 }}>
                 <span className="text-primary" style={{ fontWeight: 700, fontSize: 20 }}>¥</span>
-                <span className="amount-xl">{Number(bill.totalAmount || 0).toLocaleString('zh-CN', { minimumFractionDigits: 2 })}</span>
+                <span className="amount-xl">{fmtMoney(Number(bill.totalAmount || 0))}</span>
               </div>
             </div>
 
             <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
               <div className="partner-info-row">
                 <span className="text-variant body-md">订单分佣收入</span>
-                <span className="body-md" style={{ fontWeight: 700 }}>¥ {(Number(bill.totalAmount || 0) * 0.82).toLocaleString('zh-CN', { minimumFractionDigits: 2 })}</span>
+                <span className="body-md" style={{ fontWeight: 700 }}>¥ {fmtMoney(Number(bill.orderCommission || 0))}</span>
               </div>
               <div className="partner-info-row">
                 <span className="text-variant body-md">核销权益分佣</span>
-                <span className="body-md" style={{ fontWeight: 700 }}>¥ {(Number(bill.totalAmount || 0) * 0.18).toLocaleString('zh-CN', { minimumFractionDigits: 2 })}</span>
+                <span className="body-md" style={{ fontWeight: 700 }}>¥ {fmtMoney(Number(bill.redeemCommission || 0))}</span>
               </div>
             </div>
           </div>
@@ -93,45 +179,58 @@ export default function BillsPage() {
 
       {bills.length > 1 && (
         <div style={{ padding: '0 20px' }}>
-          <h3 className="headline-md" style={{ marginBottom: 12 }}>历史账单</h3>
-          {bills.slice(1).map((b) => (
-            <div key={String(b.id)} className="partner-store-card" style={{ margin: '0 0 12px' }}>
+          <h3 className="headline-md" style={{ marginBottom: 12 }}>全部账单</h3>
+          {bills.map((b) => (
+            <button
+              key={String(b.id)}
+              type="button"
+              className="partner-store-card"
+              style={{ margin: '0 0 12px', width: '100%', textAlign: 'left', cursor: 'pointer' }}
+              onClick={() => navigate(`/center/bills?id=${b.id}`)}
+            >
               <div className="partner-store-card-header" style={{ marginBottom: 0 }}>
                 <div>
-                  <p className="body-md">{String(b.billNo)}</p>
-                  <p className="label-md text-muted">{String(b.status)}</p>
+                  <p className="body-md">{b.billNo}</p>
+                  <p className="label-md text-muted">{billStatusLabel(b.status)}</p>
+                  {b.status === 'REJECTED' && b.rejectReason ? (
+                    <p className="label-md text-primary" style={{ marginTop: 4 }}>驳回：{b.rejectReason}</p>
+                  ) : null}
                 </div>
                 <span className="amount-lg" style={{ fontSize: 18 }}>¥{Number(b.totalAmount).toFixed(2)}</span>
               </div>
-            </div>
+            </button>
           ))}
         </div>
       )}
 
-      <div className="partner-info-banner" style={{ marginTop: 16 }}>
-        <span className="material-symbols-outlined text-primary" style={{ fontVariationSettings: "'FILL' 1" }}>info</span>
-        <p className="body-md text-variant" style={{ lineHeight: 1.5 }}>
-          账单确认后将正式进入打款流程。如有异议，请在确认前联系城市运营经理核实数据。
-        </p>
-      </div>
+      {showApplyForm && (
+        <>
+          <div className="partner-info-banner" style={{ marginTop: 16 }}>
+            <span className="material-symbols-outlined text-primary" style={{ fontVariationSettings: "'FILL' 1" }}>info</span>
+            <p className="body-md text-variant" style={{ lineHeight: 1.5 }}>
+              {isRejected
+                ? '请根据驳回理由核对后重新确认并申请打款。'
+                : '账单确认后将正式进入打款审核。如有异议，请在确认前联系城市运营经理核实数据。'}
+            </p>
+          </div>
 
-      {bill && (
-        <footer className="partner-bill-footer">
-          <label className="partner-checkbox-row" style={{ marginBottom: 16 }}>
-            <input type="checkbox" checked={confirmed} onChange={(e) => setConfirmed(e.target.checked)} />
-            <span>我已核对数据无误，同意根据此账单进行结算</span>
-          </label>
-          <button
-            type="button"
-            className="partner-btn-primary"
-            disabled={!confirmed || submitting}
-            style={{ opacity: confirmed ? 1 : 0.5 }}
-            onClick={confirmBill}
-          >
-            {submitting ? '正在提交...' : '确认并申请打款'}
-            {!submitting && <span className="material-symbols-outlined">payments</span>}
-          </button>
-        </footer>
+          <footer className="partner-bill-footer">
+            <label className="partner-checkbox-row" style={{ marginBottom: 16 }}>
+              <input type="checkbox" checked={confirmed} onChange={(e) => setConfirmed(e.target.checked)} />
+              <span>我已核对数据无误，同意根据此账单进行结算</span>
+            </label>
+            <button
+              type="button"
+              className="partner-btn-primary"
+              disabled={!confirmed || submitting}
+              style={{ opacity: confirmed ? 1 : 0.5 }}
+              onClick={() => void confirmBill()}
+            >
+              {submitting ? '正在提交...' : isRejected ? '重新申请打款' : '确认并申请打款'}
+              {!submitting && <span className="material-symbols-outlined">payments</span>}
+            </button>
+          </footer>
+        </>
       )}
     </div>
   );

apps/h5-partner/src/pages/CenterPage.tsx

@@ -1,10 +1,19 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router-dom';
+import type { PartnerBillDto } from '@dukang/shared-types';
+import { isWxAuthorizeEnabled } from '@dukang/shared-types';
 import { request } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { contactSupport } from '../lib/contact';
 import { isPrimaryAccount } from '../lib/partnerAccess';
-import { toastError } from '../lib/toast';
+import { listPartnerStaff } from '../lib/staff';
+import { toastError, toastSuccess } from '../lib/toast';
+import {
+  authorizePartnerWechat,
+  fetchClientConfig,
+  handlePartnerWechatLoginResult,
+} from '../lib/wechat-auth';
+import { isWechatEnv } from '../lib/weixin';
 
 type CenterPageProps = {
   /** 子账号个人中心复用 */
@@ -12,38 +21,47 @@ type CenterPageProps = {
   roleLabel?: string;
 };
 
+function fmtMoney(n: number) {
+  return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+}
+
 export default function CenterPage({ variant = 'primary', roleLabel }: CenterPageProps) {
-  const { account, logout, refresh } = usePartnerSession();
+  const { account, logout, refresh, applySession } = usePartnerSession();
   const isPrimary = variant === 'primary' && isPrimaryAccount(account);
-  const [name, setName] = useState(account?.name ?? '');
-  const [saving, setSaving] = useState(false);
+  const [authorizing, setAuthorizing] = useState(false);
+  const [bills, setBills] = useState<PartnerBillDto[]>([]);
+  const [staffCount, setStaffCount] = useState(0);
 
   useEffect(() => {
     document.title = isPrimary ? '合伙人中心' : '个人中心';
   }, [isPrimary]);
 
   useEffect(() => {
-    setName(account?.name ?? '');
-  }, [account?.name]);
+    if (!isPrimary) return;
+    void request<PartnerBillDto[]>('PARTNER_H5', '/partner/settlement/bills')
+      .then(setBills)
+      .catch(() => setBills([]));
+    void listPartnerStaff()
+      .then((list) => setStaffCount(list.length))
+      .catch(() => setStaffCount(0));
+  }, [isPrimary]);
 
-  async function handleSave() {
-    const trimmed = name.trim();
-    if (!trimmed) {
-      toastError('请输入姓名');
-      return;
-    }
-    if (trimmed === account?.name) return;
-    setSaving(true);
-    try {
-      await request('PARTNER_H5', '/partner/me', {
-        method: 'PUT',
-        body: JSON.stringify({ name: trimmed }),
-      });
-      await refresh();
-    } finally {
-      setSaving(false);
-    }
-  }
+  const finance = useMemo(() => {
+    const pending = bills.filter((b) => b.status === 'DRAFT' || b.status === 'REJECTED');
+    const settled = bills.filter((b) => b.status === 'PAID');
+    const paidCount = settled.length;
+    const rejectedCount = bills.filter((b) => b.status === 'REJECTED').length;
+    return {
+      pendingBillCount: pending.length,
+      rejectedCount,
+      pendingTotal: bills
+        .filter((b) => b.status === 'DRAFT' || b.status === 'CONFIRMED' || b.status === 'REJECTED')
+        .reduce((s, b) => s + Number(b.totalAmount || 0), 0),
+      settledTotal: settled.reduce((s, b) => s + Number(b.totalAmount || 0), 0),
+      balance: settled.reduce((s, b) => s + Number(b.totalAmount || 0), 0),
+      paidCount,
+    };
+  }, [bills]);
 
   function handleContactPartner() {
     if (isPrimary) {
@@ -57,86 +75,206 @@ export default function CenterPage({ variant = 'primary', roleLabel }: CenterPag
     window.location.href = `tel:${account.primaryPhone}`;
   }
 
+  async function handleAvatarAuth() {
+    if (authorizing) return;
+    if (!isWechatEnv()) {
+      toastError('请在微信内打开以授权头像昵称');
+      return;
+    }
+    setAuthorizing(true);
+    try {
+      const config = await fetchClientConfig();
+      if (!isWxAuthorizeEnabled(config)) {
+        toastError('微信授权暂未开启');
+        return;
+      }
+      const result = await authorizePartnerWechat();
+      if (result) {
+        const session = handlePartnerWechatLoginResult(result);
+        if (session) applySession(session);
+        await refresh();
+        toastSuccess('微信授权成功');
+      }
+      // result 为空表示已跳转 OAuth，无需额外处理
+    } catch (e) {
+      toastError(e instanceof Error ? e.message : '微信授权失败');
+    } finally {
+      setAuthorizing(false);
+    }
+  }
+
+  const locationLabel = [account?.companyName].filter(Boolean).join(' · ') || '—';
+  const displayName = account?.wxNickname?.trim() || account?.name || '合伙人';
+  const avatarUrl = account?.wxAvatarUrl?.trim() || '';
+  const badgeLabel = roleLabel || (isPrimary ? '城市合伙人' : '拓店员');
+
   return (
     <div className="page partner-center-page partner-home--flush-top">
       <section className="partner-profile-card">
-        <div className="partner-profile-avatar">
-          <span className="material-symbols-outlined">person</span>
-        </div>
-        <div style={{ flex: 1 }}>
-          <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
-            <h2 className="headline-lg" style={{ fontSize: 20 }}>{account?.name || '合伙人'}</h2>
-            <span className="partner-role-badge">{roleLabel || (isPrimary ? '城市合伙人' : '拓店员')}</span>
+        <button
+          type="button"
+          className="partner-profile-avatar"
+          onClick={() => void handleAvatarAuth()}
+          disabled={authorizing}
+          aria-label={avatarUrl ? '更新微信头像' : '微信授权获取头像'}
+        >
+          {avatarUrl ? (
+            <img src={avatarUrl} alt="" className="partner-profile-avatar-img" referrerPolicy="no-referrer" />
+          ) : (
+            <span className="material-symbols-outlined">person</span>
+          )}
+          {!avatarUrl && (
+            <span className="partner-profile-avatar-hint">授权</span>
+          )}
+        </button>
+        <div className="partner-profile-main">
+          <div className="partner-profile-title-row">
+            <h2 className="partner-profile-name">{displayName}</h2>
+            <span className="partner-role-badge">{badgeLabel}</span>
           </div>
-          <div style={{ display: 'flex', alignItems: 'center', gap: 4, marginTop: 4, color: 'var(--color-subtle-gray)' }}>
+          <div className="partner-profile-location">
             <span className="material-symbols-outlined" style={{ fontSize: 16 }}>location_on</span>
-            <span className="body-md">{account?.companyName || '—'}</span>
+            <span className="body-md line-2-clamp">{locationLabel}</span>
           </div>
-          <p className="label-md text-muted" style={{ marginTop: 4 }}>{account?.phone || ''}</p>
-        </div>
-      </section>
-
-      <section className="partner-menu-section">
-        <h3 className="headline-md" style={{ marginBottom: 8 }}>个人信息设置</h3>
-        <div className="partner-menu-card" style={{ padding: '16px' }}>
-          <label className="partner-form-label" htmlFor="center-name">姓名</label>
-          <input
-            id="center-name"
-            className="partner-form-input"
-            value={name}
-            onChange={(e) => setName(e.target.value)}
-            placeholder="请输入姓名"
-            maxLength={32}
-          />
-          <label className="partner-form-label" style={{ marginTop: 16 }}>手机号</label>
-          <input className="partner-form-input" value={account?.phone ?? ''} readOnly disabled />
-          <p className="label-md text-muted" style={{ marginTop: 4 }}>手机号由管理员维护，如需修改请联系总部</p>
-          <button
-            type="button"
-            className="partner-btn-primary"
-            style={{ width: '100%', marginTop: 16 }}
-            disabled={saving}
-            onClick={() => void handleSave()}
-          >
-            {saving ? '保存中…' : '保存资料'}
-          </button>
-        </div>
-      </section>
-
-      <section className="partner-menu-section">
-        <div className="partner-menu-card">
-          <button type="button" className="partner-menu-item" onClick={() => { if (!contactSupport()) toastError('暂无客服电话'); }}>
-            <div className="partner-menu-item-left">
-              <div className="partner-menu-icon"><span className="material-symbols-outlined">support_agent</span></div>
-              <span className="body-md" style={{ fontSize: 16 }}>联系客服</span>
-            </div>
-            <span className="material-symbols-outlined text-muted">chevron_right</span>
-          </button>
-          <button type="button" className="partner-menu-item" onClick={handleContactPartner}>
-            <div className="partner-menu-item-left">
-              <div className="partner-menu-icon"><span className="material-symbols-outlined">call</span></div>
-              <span className="body-md" style={{ fontSize: 16 }}>{isPrimary ? '联系总部' : '联系合伙人'}</span>
-            </div>
-            <span className="material-symbols-outlined text-muted">chevron_right</span>
-          </button>
-          {isPrimary && (
-            <Link to="/center/staff" className="partner-menu-item">
-              <div className="partner-menu-item-left">
-                <div className="partner-menu-icon"><span className="material-symbols-outlined">group</span></div>
-                <span className="body-md" style={{ fontSize: 16 }}>子账号管理</span>
-              </div>
-              <span className="material-symbols-outlined text-muted">chevron_right</span>
-            </Link>
+          {!isPrimary && (
+            <p className="label-md text-muted" style={{ marginTop: 4 }}>{account?.phone || ''}</p>
           )}
         </div>
       </section>
 
+      {isPrimary && (
+        <>
+          <section className="partner-assets-section">
+            <div className="partner-section-head">
+              <h3 className="headline-md">资产概览</h3>
+              <Link to="/center/settlement" className="label-md text-primary" style={{ display: 'flex', alignItems: 'center', gap: 2 }}>
+                明细 <span className="material-symbols-outlined" style={{ fontSize: 14 }}>chevron_right</span>
+              </Link>
+            </div>
+
+            {finance.pendingBillCount > 0 && (
+              <Link to="/center/bills" className="partner-bills-banner">
+                <div className="partner-bills-banner-left">
+                  <div className="partner-bills-icon">
+                    <span className="material-symbols-outlined">receipt_long</span>
+                  </div>
+                  <div>
+                    <p className="body-md text-primary" style={{ fontWeight: 600 }}>
+                      {finance.rejectedCount > 0 ? '待处理账单' : '待确认账单'}
+                    </p>
+                    <p className="label-md text-primary" style={{ opacity: 0.85 }}>
+                      {finance.rejectedCount > 0
+                        ? `您有 ${finance.pendingBillCount} 笔账单待处理（含 ${finance.rejectedCount} 笔已驳回）`
+                        : `您有 ${finance.pendingBillCount} 笔账单待确认`}
+                    </p>
+                  </div>
+                </div>
+                <span className="material-symbols-outlined text-primary">chevron_right</span>
+              </Link>
+            )}
+
+            <div className="partner-finance-grid">
+              <div className="partner-finance-card partner-finance-card--hero">
+                <p className="partner-finance-hero-label">账户余额 (元)</p>
+                <p className="partner-finance-hero-amount">{fmtMoney(finance.balance)}</p>
+              </div>
+              <Link to="/center/settlement" className="partner-finance-card">
+                <p className="label-md text-muted">待结算</p>
+                <p className="partner-finance-value text-primary">¥ {fmtMoney(finance.pendingTotal)}</p>
+              </Link>
+              <Link to="/center/settlement" className="partner-finance-card">
+                <p className="label-md text-muted" style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
+                  提现记录
+                  <span className="material-symbols-outlined" style={{ fontSize: 14 }}>history</span>
+                </p>
+                <p className="partner-finance-value">{finance.paidCount} 笔</p>
+              </Link>
+            </div>
+          </section>
+
+          <section className="partner-menu-section">
+            <div className="partner-section-head">
+              <h3 className="headline-md">运营管理</h3>
+            </div>
+            <div className="partner-menu-card">
+              <Link to="/center/staff" className="partner-menu-item">
+                <div className="partner-menu-item-left">
+                  <div className="partner-menu-icon">
+                    <span className="material-symbols-outlined">badge</span>
+                  </div>
+                  <span className="body-md" style={{ fontSize: 16 }}>我的员工</span>
+                </div>
+                <div className="partner-menu-item-right">
+                  {staffCount > 0 && <span className="partner-menu-badge">{staffCount}人</span>}
+                  <span className="material-symbols-outlined text-muted">chevron_right</span>
+                </div>
+              </Link>
+              <Link to="/stores?audit=pending" className="partner-menu-item">
+                <div className="partner-menu-item-left">
+                  <div className="partner-menu-icon">
+                    <span className="material-symbols-outlined">storefront</span>
+                  </div>
+                  <span className="body-md" style={{ fontSize: 16 }}>门店审核记录</span>
+                </div>
+                <span className="material-symbols-outlined text-muted">chevron_right</span>
+              </Link>
+              <Link to="/stores" className="partner-menu-item">
+                <div className="partner-menu-item-left">
+                  <div className="partner-menu-icon">
+                    <span className="material-symbols-outlined">description</span>
+                  </div>
+                  <span className="body-md" style={{ fontSize: 16 }}>合同管理</span>
+                </div>
+                <div className="partner-menu-item-right">
+                  <span className="partner-menu-status">待续约</span>
+                  <span className="material-symbols-outlined text-muted">chevron_right</span>
+                </div>
+              </Link>
+              <button
+                type="button"
+                className="partner-menu-item"
+                onClick={() => { if (!contactSupport()) toastError('暂无客服电话'); }}
+              >
+                <div className="partner-menu-item-left">
+                  <div className="partner-menu-icon">
+                    <span className="material-symbols-outlined">support_agent</span>
+                  </div>
+                  <span className="body-md" style={{ fontSize: 16 }}>联系客服</span>
+                </div>
+                <span className="material-symbols-outlined text-muted">chevron_right</span>
+              </button>
+            </div>
+          </section>
+        </>
+      )}
+
+      {!isPrimary && (
+        <section className="partner-menu-section">
+          <div className="partner-menu-card">
+            <button type="button" className="partner-menu-item" onClick={() => { if (!contactSupport()) toastError('暂无客服电话'); }}>
+              <div className="partner-menu-item-left">
+                <div className="partner-menu-icon"><span className="material-symbols-outlined">support_agent</span></div>
+                <span className="body-md" style={{ fontSize: 16 }}>联系客服</span>
+              </div>
+              <span className="material-symbols-outlined text-muted">chevron_right</span>
+            </button>
+            <button type="button" className="partner-menu-item" onClick={handleContactPartner}>
+              <div className="partner-menu-item-left">
+                <div className="partner-menu-icon"><span className="material-symbols-outlined">call</span></div>
+                <span className="body-md" style={{ fontSize: 16 }}>联系合伙人</span>
+              </div>
+              <span className="material-symbols-outlined text-muted">chevron_right</span>
+            </button>
+          </div>
+        </section>
+      )}
+
       <button type="button" className="partner-logout-btn" onClick={logout}>
         <span className="material-symbols-outlined">logout</span>
         退出登录
       </button>
 
-      <div style={{ textAlign: 'center', opacity: 0.3, padding: '32px 0' }}>
+      <div className="partner-center-footer">
         <p className="label-md text-muted">传承千年 · 杜康好客</p>
       </div>
     </div>

apps/h5-partner/src/pages/HomePage.tsx

@@ -3,14 +3,12 @@ import { Link, useNavigate } from 'react-router-dom';
 import type { PartnerLeaderboardEntry } from '@dukang/shared-types';
 import { isLoggedIn, request } from '../lib/api';
 import { fetchPartnerLeaderboard } from '../lib/leaderboard';
-import { getPartnerNavKind } from '../lib/partnerAccess';
+import { getPartnerNavKind, hasWarehouseAccess } from '../lib/partnerAccess';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
-import { storeStatusLabel, storeStatusPillClass } from '../lib/storeStatus';
 
 function fmtMoney(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
 }
-const HOME_STORE_PREVIEW_LIMIT = 6;
 
 const LEADERBOARD_PREVIEW_LIMIT = 3;
 
@@ -92,67 +90,42 @@ function summarizeOrders(orders: Array<Record<string, unknown>>) {
   return { pendingShip, shipping, completed, todayCount };
 }
 
-function LeaderboardPreview({
-  entries,
-  self,
-}: {
-  entries: PartnerLeaderboardEntry[];
-  self?: PartnerLeaderboardEntry;
-}) {
-  const selfInList = self ? entries.some((e) => e.accountId === self.accountId) : false;
-
+function LeaderboardPreview({ entries }: { entries: PartnerLeaderboardEntry[] }) {
   return (
-    <div className="partner-leaderboard-section">
+    <section className="partner-bento-card partner-leaderboard-preview">
       <div className="partner-leaderboard-header">
         <h3 className="headline-md" style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
-          <span className="material-symbols-outlined text-primary" style={{ fontSize: 18 }}>military_tech</span>
+          <span className="material-symbols-outlined text-primary" style={{ fontSize: 20 }}>emoji_events</span>
           合伙人贡献榜
         </h3>
-        <Link to="/leaderboard" className="label-md text-primary">查看全部</Link>
+        <Link to="/leaderboard" className="label-md text-primary" style={{ display: 'flex', alignItems: 'center', gap: 2 }}>
+          查看全部 <span className="material-symbols-outlined" style={{ fontSize: 14 }}>chevron_right</span>
+        </Link>
       </div>
-      {entries.length === 0 && !self ? (
+      {entries.length === 0 ? (
         <p className="label-md text-muted">暂无排行数据</p>
       ) : (
-        <>
-          {entries.map((entry) => (
-            <div
-              key={entry.accountId}
-              className={`partner-leaderboard-row partner-leaderboard-row--compact${entry.isSelf ? ' partner-leaderboard-row--self' : ''}`}
-            >
-              <div className="partner-leaderboard-rank">{entry.rank}</div>
-              <div className="partner-leaderboard-info">
-                <p className="body-md" style={{ fontWeight: 600 }}>
-                  {entry.name}
-                  {entry.isSelf ? <span className="partner-leaderboard-self-tag">我的排名</span> : null}
-                  <span className="label-md text-muted" style={{ marginLeft: 4 }}>({entry.roleLabel})</span>
-                </p>
-                <p className="label-md text-muted">累计拓店 {entry.totalStores} 间</p>
-              </div>
-              <div className="partner-leaderboard-stat">
-                <p className="headline-md text-primary">{entry.periodStores} 间</p>
-                <p className="label-md text-muted">本月新增</p>
-              </div>
+        entries.map((entry) => (
+          <div key={entry.accountId} className="partner-leaderboard-row partner-leaderboard-row--compact">
+            <div className={`partner-leaderboard-avatar partner-leaderboard-avatar--rank-${Math.min(entry.rank, 3)}`}>
+              <span className="material-symbols-outlined">person</span>
+              <span className="partner-leaderboard-avatar-badge">{entry.rank}</span>
             </div>
-          ))}
-          {self && !selfInList ? (
-            <div className="partner-leaderboard-row partner-leaderboard-row--compact partner-leaderboard-row--self">
-              <div className="partner-leaderboard-rank">{self.rank}</div>
-              <div className="partner-leaderboard-info">
-                <p className="body-md" style={{ fontWeight: 600 }}>
-                  {self.name}
-                  <span className="partner-leaderboard-self-tag">我的排名</span>
-                </p>
-                <p className="label-md text-muted">累计拓店 {self.totalStores} 间</p>
-              </div>
-              <div className="partner-leaderboard-stat">
-                <p className="headline-md text-primary">{self.periodStores} 间</p>
-                <p className="label-md text-muted">本月新增</p>
-              </div>
+            <div className="partner-leaderboard-info">
+              <p className="body-md" style={{ fontWeight: 600 }}>
+                {entry.name}
+                <span className="label-md text-muted" style={{ marginLeft: 4 }}>({entry.roleLabel})</span>
+              </p>
+              <p className="label-md text-muted">累计拓店: {entry.totalStores} 间</p>
             </div>
-          ) : null}
-        </>
+            <div className="partner-leaderboard-stat">
+              <p className="headline-md text-primary">{entry.periodStores} 间</p>
+              <p className="label-md text-muted">本月新增</p>
+            </div>
+          </div>
+        ))
       )}
-    </div>
+    </section>
   );
 }
 
@@ -162,12 +135,12 @@ export default function HomePage() {
   const navKind = getPartnerNavKind(account);
   const isPrimary = navKind === 'primary';
   const isWarehouse = navKind === 'warehouse_staff';
+  const warehouseOk = hasWarehouseAccess(account);
 
   const [dash, setDash] = useState<Record<string, unknown> | null>(null);
   const [stores, setStores] = useState<Array<Record<string, unknown>>>([]);
   const [orders, setOrders] = useState<Array<Record<string, unknown>>>([]);
   const [leaderboardEntries, setLeaderboardEntries] = useState<PartnerLeaderboardEntry[]>([]);
-  const [leaderboardSelf, setLeaderboardSelf] = useState<PartnerLeaderboardEntry | undefined>();
 
   useEffect(() => {
     document.title = '工作台';
@@ -175,10 +148,12 @@ export default function HomePage() {
 
   useEffect(() => {
     if (!isLoggedIn()) { navigate('/login'); return; }
-    if (isWarehouse || isPrimary) {
+    if ((isWarehouse || isPrimary) && warehouseOk) {
       request<{ list: Array<Record<string, unknown>> }>('PARTNER_H5', '/partner/orders')
         .then((data) => setOrders(Array.isArray(data.list) ? data.list : []))
         .catch(() => setOrders([]));
+    } else {
+      setOrders([]);
     }
     if (!isWarehouse) {
       request<Record<string, unknown>>('PARTNER_H5', '/partner/dashboard').then(setDash).catch(() => {});
@@ -186,16 +161,14 @@ export default function HomePage() {
       fetchPartnerLeaderboard('month')
         .then((data) => {
           setLeaderboardEntries(data.list.slice(0, LEADERBOARD_PREVIEW_LIMIT));
-          setLeaderboardSelf(data.self);
         })
         .catch(() => {
           setLeaderboardEntries([]);
-          setLeaderboardSelf(undefined);
         });
     } else {
       request<Record<string, unknown>>('PARTNER_H5', '/partner/dashboard').then(setDash).catch(() => {});
     }
-  }, [navigate, isWarehouse, isPrimary]);
+  }, [navigate, isWarehouse, isPrimary, warehouseOk]);
 
   const storeCount = Number(dash?.storeCount || stores.length || 0);
   const orderStats = useMemo(() => summarizeOrders(orders), [orders]);
@@ -207,12 +180,19 @@ export default function HomePage() {
     const now = new Date();
     return created.getMonth() === now.getMonth() && created.getFullYear() === now.getFullYear();
   }).length;
+  const lastMonthNew = stores.filter((s) => {
+    const created = new Date(String(s.createdAt || ''));
+    const now = new Date();
+    const last = new Date(now.getFullYear(), now.getMonth() - 1, 1);
+    return created.getMonth() === last.getMonth() && created.getFullYear() === last.getFullYear();
+  }).length;
+  const monthGrowthPct = lastMonthNew > 0
+    ? Math.round(((monthNew - lastMonthNew) / lastMonthNew) * 100)
+    : (monthNew > 0 ? 100 : 0);
 
-  const previewStores = stores.slice(0, HOME_STORE_PREVIEW_LIMIT);
   const orderCount = Number(dash?.orderCount || orderStats.todayCount || 0);
   const revenue = orderCount * 128.45;
   const profit = revenue * 0.25;
-  const pendingShipBadge = orderStats.pendingShip;
 
   return (
     <div className="page partner-home partner-home--flush-top">
@@ -246,13 +226,6 @@ export default function HomePage() {
                   </div>
                   <span className="partner-quick-action-label">录入新店</span>
                 </Link>
-                <Link to="/reshipments" className="partner-quick-action">
-                  <div className="partner-quick-action-icon partner-quick-action-icon--amber">
-                    <span className="material-symbols-outlined">assignment_return</span>
-                    {pendingShipBadge > 0 && <span className="partner-quick-badge-count">{pendingShipBadge}</span>}
-                  </div>
-                  <span className="partner-quick-action-label">补发处理</span>
-                </Link>
                 <Link to="/center/settlement" className="partner-quick-action">
                   <div className="partner-quick-action-icon partner-quick-action-icon--green">
                     <span className="material-symbols-outlined">account_balance</span>
@@ -274,7 +247,7 @@ export default function HomePage() {
           <p className="headline-md" style={{ marginBottom: 8 }}>订单管理</p>
         )}
 
-        {(isPrimary || isWarehouse) && (
+        {(isPrimary || isWarehouse) && warehouseOk && (
           <OrderSummarySection
             title={isWarehouse ? '今日订单' : undefined}
             todayCount={orderStats.todayCount}
@@ -284,6 +257,18 @@ export default function HomePage() {
           />
         )}
 
+        {(isPrimary || isWarehouse) && !warehouseOk && (
+          <section className="partner-bento-card" style={{ marginBottom: 16 }}>
+            <div className="partner-warehouse-denied">
+              <span className="material-symbols-outlined text-primary">warehouse</span>
+              <p className="body-md" style={{ fontWeight: 600, marginTop: 8 }}>未配置仓库管理权限</p>
+              <p className="label-md text-muted" style={{ marginTop: 4, lineHeight: 1.5 }}>
+                购酒订单由总部履约，不会推送到本账号。如需管仓发货，请联系总部配置仓库。
+              </p>
+            </div>
+          </section>
+        )}
+
         {!isWarehouse && (
           <>
             <section className="partner-bento-card" style={{ marginBottom: 16 }}>
@@ -309,55 +294,31 @@ export default function HomePage() {
               </div>
             </section>
 
-            <section className="partner-home-store-section">
-              <div className="partner-home-store-header">
-                <h2 className="headline-md">辖区门店</h2>
-                <Link to="/stores" className="label-md text-primary">查看全部</Link>
-              </div>
-              {previewStores.length === 0 ? (
-                <div className="partner-home-store-empty">
-                  <p className="label-md text-muted">暂无门店</p>
-                  <Link to={isPrimary ? '/stores/new' : '/stores/new?step=1'} className="label-md text-primary">录入新店</Link>
-                </div>
-              ) : (
-                previewStores.map((s) => {
-                  const storeId = String(s.id);
-                  const status = String(s.status || 'PAUSED').toUpperCase();
-                  const audit = String(s.auditStatus || 'APPROVED').toUpperCase();
-                  return (
-                    <Link key={storeId} to={`/stores/${storeId}`} className="partner-home-store-row">
-                      <div className="partner-home-store-info">
-                        <p className="headline-md">{String(s.name || '未命名门店')}</p>
-                        <p className="label-md text-muted">{String(s.address || s.district || '')}</p>
-                      </div>
-                      <span className={`partner-status-pill ${audit !== 'APPROVED' ? storeStatusPillClass(audit === 'REJECTED' ? 'CLOSED' : 'PAUSED') : storeStatusPillClass(status)}`}>
-                        {audit === 'PENDING' ? '待审核' : audit === 'REJECTED' ? '已驳回' : storeStatusLabel(status)}
-                      </span>
-                    </Link>
-                  );
-                })
-              )}
-            </section>
-
             <section className="partner-expansion-card">
               <h2 className="headline-md" style={{ marginBottom: 16 }}>拓店情况</h2>
               <div className="partner-expansion-split">
                 <div>
                   <p className="label-md text-muted" style={{ marginBottom: 4 }}>本月新增签约</p>
-                  <span className="headline-lg" style={{ fontSize: 24 }}>{monthNew}</span>
+                  <div className="partner-expansion-value-row">
+                    <span className="headline-lg" style={{ fontSize: 24 }}>{monthNew}</span>
+                    {monthGrowthPct !== 0 && (
+                      <span className={`partner-expansion-trend${monthGrowthPct > 0 ? ' partner-expansion-trend--up' : ' partner-expansion-trend--down'}`}>
+                        <span className="material-symbols-outlined" style={{ fontSize: 14 }}>
+                          {monthGrowthPct > 0 ? 'trending_up' : 'trending_down'}
+                        </span>
+                        {Math.abs(monthGrowthPct)}%
+                      </span>
+                    )}
+                  </div>
                 </div>
                 <div>
                   <p className="label-md text-muted" style={{ marginBottom: 4 }}>待审核门店</p>
                   <span className="headline-lg" style={{ fontSize: 24 }}>{pendingAuditCount}</span>
                 </div>
               </div>
-
-              <LeaderboardPreview entries={leaderboardEntries} self={leaderboardSelf} />
-
-              <p className="label-md text-muted" style={{ paddingTop: 16, borderTop: '1px solid rgba(226,190,188,0.1)' }}>
-                {String(dash?.companyName || '郑州合伙人')} · 辖区管理
-              </p>
             </section>
+
+            <LeaderboardPreview entries={leaderboardEntries} />
           </>
         )}
       </main>

apps/h5-partner/src/pages/OrderListPage.tsx

@@ -2,6 +2,8 @@ import { useEffect, useMemo, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import PageHeader from '@dukang/shared-ui/PageHeader';
 import { isLoggedIn, request } from '../lib/api';
+import { usePartnerSession } from '../contexts/PartnerSessionContext';
+import { hasWarehouseAccess } from '../lib/partnerAccess';
 
 type DateFilter = 'today' | '7d' | '30d';
 type StatusFilter = 'ALL' | 'PENDING_SHIP' | 'SHIPPING' | 'COMPLETED' | 'ABNORMAL';
@@ -34,15 +36,24 @@ type OrderListPageProps = {
   tabRoot?: boolean;
 };
 
+type OrdersResponse = {
+  list: Array<Record<string, unknown>>;
+  hasWarehouseAccess?: boolean;
+  message?: string;
+};
+
 export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
   const navigate = useNavigate();
-  const [data, setData] = useState<{ list: Array<Record<string, unknown>> }>({ list: [] });
+  const { account } = usePartnerSession();
+  const warehouseOk = hasWarehouseAccess(account);
+  const [data, setData] = useState<OrdersResponse>({ list: [] });
   const [tab, setTab] = useState<'orders' | 'coupons'>('orders');
   const [dateFilter, setDateFilter] = useState<DateFilter>('today');
   const [statusFilter, setStatusFilter] = useState<StatusFilter>('ALL');
   const [shippingId, setShippingId] = useState<string | null>(null);
   const [shipForm, setShipForm] = useState({ logisticsCompany: '', trackingNo: '', manualQueryUrl: '' });
   const [shipModalId, setShipModalId] = useState<string | null>(null);
+  const [loaded, setLoaded] = useState(false);
 
   useEffect(() => {
     document.title = '订单管理';
@@ -50,8 +61,22 @@ export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
 
   useEffect(() => {
     if (!isLoggedIn()) { navigate('/login'); return; }
-    request<{ list: Array<Record<string, unknown>> }>('PARTNER_H5', '/partner/orders').then(setData);
-  }, [navigate]);
+    if (!warehouseOk) {
+      setData({ list: [], hasWarehouseAccess: false, message: '未配置仓库管理权限' });
+      setLoaded(true);
+      return;
+    }
+    request<OrdersResponse>('PARTNER_H5', '/partner/orders')
+      .then((res) => {
+        setData({
+          list: Array.isArray(res.list) ? res.list : [],
+          hasWarehouseAccess: res.hasWarehouseAccess,
+          message: res.message,
+        });
+      })
+      .catch(() => setData({ list: [] }))
+      .finally(() => setLoaded(true));
+  }, [navigate, warehouseOk]);
 
   const filtered = useMemo(() => data.list.filter((o) => {
     if (statusFilter === 'ALL') return true;
@@ -83,8 +108,12 @@ export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
         body: JSON.stringify(shipForm),
       });
       setShipModalId(null);
-      const next = await request<{ list: Array<Record<string, unknown>> }>('PARTNER_H5', '/partner/orders');
-      setData(next);
+      const next = await request<OrdersResponse>('PARTNER_H5', '/partner/orders');
+      setData({
+        list: Array.isArray(next.list) ? next.list : [],
+        hasWarehouseAccess: next.hasWarehouseAccess,
+        message: next.message,
+      });
     } catch (err) {
       window.alert(err instanceof Error ? err.message : '发货失败');
     } finally {
@@ -97,6 +126,21 @@ export default function OrderListPage({ tabRoot = false }: OrderListPageProps) {
     return s.includes('PENDING') || s === 'PAID' || s === 'PENDING_SHIP';
   }
 
+  if (loaded && !warehouseOk) {
+    return (
+      <div className={`page partner-orders-page${tabRoot ? '' : ' page-no-tab'}`}>
+        {!tabRoot && <PageHeader title="订单中心" onBack={() => navigate('/')} />}
+        <div className="partner-warehouse-denied" style={{ margin: 20, padding: 32, textAlign: 'center' }}>
+          <span className="material-symbols-outlined text-primary" style={{ fontSize: 40 }}>warehouse</span>
+          <p className="headline-md" style={{ marginTop: 12 }}>未配置仓库管理权限</p>
+          <p className="body-md text-muted" style={{ marginTop: 8, lineHeight: 1.6 }}>
+            购酒订单由总部履约，不会推送到本账号。如需管仓发货，请联系总部配置仓库。
+          </p>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className={`page partner-orders-page${tabRoot ? '' : ' page-no-tab'}`}>
       {!tabRoot && <PageHeader title="订单中心" onBack={() => navigate('/')} />}

apps/h5-partner/src/pages/SettlementPage.tsx

@@ -4,7 +4,7 @@ import PageHeader from '@dukang/shared-ui/PageHeader';
 import type { PartnerBillDto } from '@dukang/shared-types';
 import { isLoggedIn, request } from '../lib/api';
 
-type StatusFilter = 'all' | 'pending' | 'settled' | 'reviewing';
+type StatusFilter = 'all' | 'pending' | 'settled' | 'reviewing' | 'rejected';
 
 function fmtMoney(n: number) {
   return n.toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
@@ -15,6 +15,7 @@ function billStatusLabel(status: string) {
     case 'DRAFT': return '待结算';
     case 'CONFIRMED': return '审核中';
     case 'PAID': return '已结算';
+    case 'REJECTED': return '已驳回';
     default: return status;
   }
 }
@@ -24,6 +25,7 @@ function billStatusClass(status: string) {
     case 'DRAFT': return 'partner-settlement-status--pending';
     case 'CONFIRMED': return 'partner-settlement-status--reviewing';
     case 'PAID': return 'partner-settlement-status--settled';
+    case 'REJECTED': return 'partner-settlement-status--rejected';
     default: return '';
   }
 }
@@ -70,9 +72,10 @@ export default function SettlementPage() {
       const matchMonth = d.getFullYear() === month.year && d.getMonth() + 1 === month.month;
       if (!matchMonth) return false;
       if (statusFilter === 'all') return true;
-      if (statusFilter === 'pending') return b.status === 'DRAFT';
+      if (statusFilter === 'pending') return b.status === 'DRAFT' || b.status === 'REJECTED';
       if (statusFilter === 'settled') return b.status === 'PAID';
       if (statusFilter === 'reviewing') return b.status === 'CONFIRMED';
+      if (statusFilter === 'rejected') return b.status === 'REJECTED';
       return true;
     });
   }, [bills, month, statusFilter]);
@@ -93,8 +96,9 @@ export default function SettlementPage() {
   const statusTabs: Array<{ key: StatusFilter; label: string }> = [
     { key: 'all', label: '全部' },
     { key: 'pending', label: '待结算' },
-    { key: 'settled', label: '已结算' },
     { key: 'reviewing', label: '审核中' },
+    { key: 'rejected', label: '已驳回' },
+    { key: 'settled', label: '已结算' },
   ];
 
   return (
@@ -188,7 +192,12 @@ export default function SettlementPage() {
                     <span className="partner-settlement-dot" />
                     订单分佣 ¥{fmtMoney(Number(bill.orderCommission || 0))}
                   </p>
-                  <p className={`partner-settlement-item-amount${bill.status === 'DRAFT' ? ' text-primary' : ''}`}>
+                  {bill.status === 'REJECTED' && bill.rejectReason ? (
+                    <p className="label-md text-primary" style={{ marginTop: 6 }}>
+                      驳回：{bill.rejectReason}
+                    </p>
+                  ) : null}
+                  <p className={`partner-settlement-item-amount${bill.status === 'DRAFT' || bill.status === 'REJECTED' ? ' text-primary' : ''}`}>
                     ¥{fmtMoney(Number(bill.totalAmount || 0))}
                   </p>
                 </div>

apps/h5-partner/src/pages/StoreListPage.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import { isLoggedIn, request } from '../lib/api';
 import { usePartnerSession } from '../contexts/PartnerSessionContext';
 import { isSubAccount } from '../lib/partnerAccess';
@@ -25,11 +25,13 @@ const FILTERS: { key: StatusFilter; label: string }[] = [
 
 export default function StoreListPage() {
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
   const { account } = usePartnerSession();
   const readonly = isSubAccount(account);
   const [stores, setStores] = useState<Array<Record<string, unknown>>>([]);
   const [q, setQ] = useState('');
-  const [filter, setFilter] = useState<StatusFilter>('ALL');
+  const initialFilter = (searchParams.get('audit') === 'pending' ? 'PENDING_AUDIT' : 'ALL') as StatusFilter;
+  const [filter, setFilter] = useState<StatusFilter>(initialFilter);
   const [updatingId, setUpdatingId] = useState<string | null>(null);
   const [error, setError] = useState('');
 

apps/h5-partner/src/styles.css

@@ -621,9 +621,6 @@ html {
 
 .partner-expansion-split {
   display: flex;
-  border-bottom: 1px solid rgba(226, 190, 188, 0.2);
-  padding-bottom: var(--space-md);
-  margin-bottom: var(--space-md);
 }
 
 .partner-expansion-split > div {
@@ -635,6 +632,28 @@ html {
   border-left: 1px solid rgba(226, 190, 188, 0.2);
 }
 
+.partner-expansion-value-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.partner-expansion-trend {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.partner-expansion-trend--up {
+  color: #16a34a;
+}
+
+.partner-expansion-trend--down {
+  color: var(--color-heritage-red);
+}
+
 .partner-form-error {
   margin: 0 20px 12px;
   padding: 10px 12px;
@@ -845,6 +864,57 @@ html {
   color: #fff;
 }
 
+.partner-leaderboard-preview .partner-leaderboard-header {
+  margin-bottom: 12px;
+}
+
+.partner-leaderboard-avatar {
+  position: relative;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  background: var(--color-surface-container-low);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.partner-leaderboard-avatar .material-symbols-outlined {
+  font-size: 22px;
+  color: var(--color-subtle-gray);
+  font-variation-settings: 'FILL' 1;
+}
+
+.partner-leaderboard-avatar-badge {
+  position: absolute;
+  left: -2px;
+  top: -2px;
+  min-width: 16px;
+  height: 16px;
+  padding: 0 4px;
+  border-radius: 999px;
+  background: #9ca3af;
+  color: #fff;
+  font-size: 10px;
+  font-weight: 700;
+  line-height: 16px;
+  text-align: center;
+  box-shadow: 0 0 0 2px #fff;
+}
+
+.partner-leaderboard-avatar--rank-1 .partner-leaderboard-avatar-badge {
+  background: #d4a017;
+}
+
+.partner-leaderboard-avatar--rank-2 .partner-leaderboard-avatar-badge {
+  background: #9ca3af;
+}
+
+.partner-leaderboard-avatar--rank-3 .partner-leaderboard-avatar-badge {
+  background: #cd7f32;
+}
+
 .partner-leaderboard-info {
   flex: 1;
   min-width: 0;
@@ -2402,6 +2472,14 @@ nav.app-tabbar .app-tabbar-label {
   justify-content: center;
   position: relative;
   flex-shrink: 0;
+  padding: 0;
+  cursor: pointer;
+  overflow: hidden;
+}
+
+.partner-profile-avatar:disabled {
+  opacity: 0.7;
+  cursor: wait;
 }
 
 .partner-profile-avatar .material-symbols-outlined {
@@ -2410,22 +2488,81 @@ nav.app-tabbar .app-tabbar-label {
   font-variation-settings: 'FILL' 1;
 }
 
+.partner-profile-avatar-img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  display: block;
+}
+
+.partner-profile-avatar-hint {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 2px 0;
+  font-size: 10px;
+  font-weight: 600;
+  line-height: 1.2;
+  text-align: center;
+  color: #fff;
+  background: rgba(166, 29, 36, 0.82);
+}
+
+.partner-profile-main {
+  flex: 1;
+  min-width: 0;
+}
+
+.partner-profile-title-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+}
+
+.partner-profile-name {
+  margin: 0;
+  font-size: 20px;
+  font-weight: 700;
+  line-height: 1.3;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.partner-profile-location {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  margin-top: 4px;
+  color: var(--color-subtle-gray);
+}
+
 .partner-role-badge {
+  flex-shrink: 0;
   background: var(--color-secondary-container);
   color: var(--color-on-secondary-container);
   padding: 4px 8px;
   border-radius: 8px;
   font-family: var(--font-label);
   font-size: 10px;
-  text-transform: uppercase;
-  letter-spacing: 0.05em;
+  font-weight: 600;
+  letter-spacing: 0.02em;
+  white-space: nowrap;
+  line-height: 1.2;
+}
+
+.partner-assets-section {
+  margin-top: var(--space-lg);
 }
 
 .partner-bills-banner {
   margin: 0 var(--space-page) 12px;
   padding: 16px;
-  background: rgba(166, 29, 36, 0.05);
-  border: 1px solid rgba(166, 29, 36, 0.1);
+  background: rgba(166, 29, 36, 0.06);
+  border: 1px solid rgba(166, 29, 36, 0.12);
   border-radius: var(--radius-md);
   display: flex;
   align-items: center;
@@ -2464,13 +2601,100 @@ nav.app-tabbar .app-tabbar-label {
   border-radius: var(--radius-md);
   box-shadow: var(--shadow-card);
   border: 1px solid rgba(166, 29, 36, 0.05);
+  text-decoration: none;
+  color: inherit;
+  display: block;
 }
 
 .partner-finance-card--hero {
-  grid-column: span 2;
-  background: var(--color-heritage-red);
+  grid-column: 1 / -1;
+  background: linear-gradient(135deg, #a61d24 0%, #820012 100%);
   color: #fff;
   box-shadow: 0 8px 24px rgba(166, 29, 36, 0.25);
+  border: none;
+  padding: 20px 24px;
+}
+
+.partner-finance-hero-label {
+  font-size: 13px;
+  opacity: 0.88;
+  margin: 0 0 8px;
+}
+
+.partner-finance-hero-amount {
+  font-size: 32px;
+  font-weight: 700;
+  letter-spacing: 0.02em;
+  margin: 0;
+  line-height: 1.2;
+}
+
+.partner-finance-value {
+  margin-top: 8px;
+  font-size: 18px;
+  font-weight: 700;
+  color: var(--color-on-surface);
+}
+
+.partner-section-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 0 var(--space-page) 8px;
+}
+
+.partner-menu-section .partner-section-head {
+  margin: 0 0 8px;
+}
+
+.partner-menu-item-right {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.partner-menu-badge {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--color-heritage-red);
+  background: rgba(166, 29, 36, 0.08);
+  padding: 2px 8px;
+  border-radius: 999px;
+}
+
+.partner-menu-status {
+  font-size: 12px;
+  color: #2563eb;
+  font-weight: 500;
+}
+
+.partner-logout-btn {
+  width: calc(100% - 2 * var(--space-page));
+  margin: var(--space-lg) var(--space-page) 0;
+  padding: 16px;
+  border: 1px solid rgba(166, 29, 36, 0.08);
+  border-radius: var(--radius-md);
+  background: var(--color-card);
+  box-shadow: var(--shadow-card);
+  color: var(--color-heritage-red);
+  font-family: var(--font-headline);
+  font-size: 16px;
+  font-weight: 600;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+}
+
+.partner-logout-btn .material-symbols-outlined {
+  color: var(--color-heritage-red);
+}
+
+.partner-center-footer {
+  text-align: center;
+  opacity: 0.35;
+  padding: 24px 0 8px;
 }
 
 .partner-menu-section {
@@ -2489,14 +2713,28 @@ nav.app-tabbar .app-tabbar-label {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  width: 100%;
   padding: 16px;
+  border: none;
   border-bottom: 1px solid var(--color-surface-container);
+  border-radius: 0;
+  background: transparent;
   color: inherit;
+  font: inherit;
+  text-align: left;
   text-decoration: none;
+  cursor: pointer;
+  box-sizing: border-box;
+  -webkit-appearance: none;
+  appearance: none;
 }
 
 .partner-menu-item:last-child { border-bottom: none; }
 
+.partner-menu-item:active {
+  background: rgba(166, 29, 36, 0.04);
+}
+
 .partner-menu-item-left {
   display: flex;
   align-items: center;
@@ -2514,24 +2752,6 @@ nav.app-tabbar .app-tabbar-label {
   color: var(--color-heritage-red);
 }
 
-.partner-logout-btn {
-  width: calc(100% - 40px);
-  margin: var(--space-lg) var(--space-page);
-  padding: 16px;
-  border: none;
-  border-radius: var(--radius-md);
-  background: var(--color-card);
-  box-shadow: var(--shadow-card);
-  color: var(--color-error);
-  font-size: 16px;
-  font-weight: 500;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-}
-
 /* ── Settlement page ── */
 .partner-settlement-page {
   min-height: 100vh;
@@ -2779,6 +2999,11 @@ nav.app-tabbar .app-tabbar-label {
   color: var(--color-success-green);
 }
 
+.partner-settlement-status--rejected {
+  background: rgba(166, 29, 36, 0.12);
+  color: var(--color-heritage-red);
+}
+
 .partner-settlement-item-meta {
   display: flex;
   align-items: center;
@@ -3067,22 +3292,28 @@ body {
   border-top: 1px dashed rgba(166, 29, 36, 0.15);
 }
 
-.partner-home--flush-top .partner-home-body,
+.partner-warehouse-denied {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  padding: 20px 12px;
+}
+
+.partner-warehouse-denied .material-symbols-outlined {
+  font-size: 36px;
+  font-variation-settings: 'FILL' 0;
+}
+
 .partner-home--flush-top.partner-store-page,
 .partner-home--flush-top.partner-center-page {
-  padding-top: 0;
+  padding-top: 12px;
 }
 
 .partner-home--flush-top .partner-sticky-filter {
   padding-top: 12px;
 }
 
-.partner-leaderboard-row--self {
-  background: rgba(166, 29, 36, 0.08);
-  border: 1px solid rgba(166, 29, 36, 0.18);
-  border-radius: 10px;
-}
-
 .partner-leaderboard-self-tag {
   display: inline-block;
   margin-left: 6px;

apps/mini-user/README.md

@@ -18,7 +18,7 @@ pnpm --filter @dukang/mini-user dev:weapp
 
 | 环节 | 文件 | 说明 |
 |------|------|------|
-| **编译注入** | `config/index.ts` → `defineConstants.TARO_APP_API_ORIGIN` | 默认 `https://dkapi.runxian.top`；可用环境变量 `VITE_API_TARGET` 覆盖 |
+| **编译注入** | `config/index.ts` → `defineConstants.TARO_APP_API_ORIGIN` | 默认 `http://localhost:3000`；连远程设 `VITE_API_TARGET=https://dkapi.runxian.top` |
 | **运行时拼装** | `src/lib/api.ts` → `resolveApiBase()` | `{origin}/api/v1` |
 
 ### 微信登录 `invalid code`
@@ -30,17 +30,25 @@ pnpm --filter @dukang/mini-user dev:weapp
 | 小程序 appid | `project.config.json` → `wxda31c8e8e85051e7` |
 | 后端须配置 | `WX_MINI_APP_ID` / `WX_MINI_APP_SECRET`（与上表一致） |
 
-**本地联调（不接真实微信）**：API 指到本机且开启 Mock：
+**本地联调（不接真实微信）**：保持默认即可（API → `localhost:3000`），并开启 Mock：
 
 ```bash
 # 终端 1
-pnpm dev:api   # server/.env 保持 MOCK_WECHAT=true
+pnpm dev:api   # server/.env 保持 MOCK_SMS=true / MOCK_WECHAT=true
 
 # 终端 2
-$env:VITE_API_TARGET="http://localhost:3000"; pnpm dev:mini-user:weapp
+pnpm dev:mini-user          # H5 预览 :5177
+# 或
+pnpm --filter @dukang/mini-user dev:weapp
 ```
 
-**连远程 API**：在 `dkapi.runxian.top` 所在服务器配置 `WX_MINI_APP_ID=wxda31c8e8e85051e7` 及对应 AppSecret，并部署含 `code2Session` 小程序凭证逻辑的后端。
+**连远程 API**：
+
+```bash
+$env:VITE_API_TARGET="https://dkapi.runxian.top"; pnpm --filter @dukang/mini-user dev
+```
+
+并在 `dkapi.runxian.top` 所在服务器配置 `WX_MINI_APP_ID=wxda31c8e8e85051e7` 及对应 AppSecret。
 
 ## 页面结构（18 页）
 

apps/mini-user/config/index.ts

@@ -2,8 +2,8 @@ import { createRequire } from 'node:module';
 import path from 'node:path';
 import { defineConfig } from '@tarojs/cli';
 
-/** 小程序/H5 请求的后端 origin（不含 /api）；本地联调可用 VITE_API_TARGET 覆盖 */
-const API_ORIGIN = process.env.VITE_API_TARGET ?? 'https://dkapi.runxian.top';
+/** 小程序/H5 请求的后端 origin（不含 /api）；发版/连远程请设 VITE_API_TARGET */
+const API_ORIGIN = process.env.VITE_API_TARGET ?? 'http://localhost:3000';
 
 const requireFromApp = createRequire(path.resolve(__dirname, '../package.json'));
 

apps/mini-user/src/pages/order-confirm/index.tsx

@@ -42,6 +42,9 @@ type OrderPreview = {
   payAmount: number;
   benefitAmount: number;
   city?: { localMinQty: number; crossMinQty: number };
+  quantityOk?: boolean;
+  quantityMessage?: string | null;
+  minQty?: number;
 };
 
 function formatAddress(a: Address) {
@@ -53,7 +56,7 @@ export default function OrderConfirmPage() {
   const checkoutCtx = readCheckoutContext(router.params);
   const productId = checkoutCtx.productId ?? '';
   const forceCross = checkoutCtx.cross === true;
-  const [quantity, setQuantity] = useState(Math.max(2, Number(checkoutCtx.qty || 2)));
+  const [quantity, setQuantity] = useState(Math.max(1, Number(checkoutCtx.qty || 2)));
   const [addresses, setAddresses] = useState<Address[]>([]);
   const [addressId, setAddressId] = useState(checkoutCtx.addressId || '');
   const [preview, setPreview] = useState<OrderPreview | null>(null);
@@ -91,7 +94,7 @@ export default function OrderConfirmPage() {
       .then((data) => {
         if (!cancelled) {
           setPreview(data);
-          setMsg('');
+          setMsg(data.quantityOk === false ? (data.quantityMessage || '') : '');
         }
       })
       .catch((e) => {
@@ -115,18 +118,14 @@ export default function OrderConfirmPage() {
   );
 
   const isCross = forceCross || preview?.deliveryType === 'CROSS_CITY';
-  const minQty = isCross ? (preview?.city?.crossMinQty ?? 6) : (preview?.city?.localMinQty ?? 2);
+  const minQty =
+    preview?.minQty ??
+    (isCross ? (preview?.city?.crossMinQty ?? 6) : (preview?.city?.localMinQty ?? 2));
+  const quantityOk = preview ? preview.quantityOk !== false && quantity >= minQty : false;
+  const canSubmit = !!addressId && !!preview && quantityOk && !loading && !previewLoading;
 
   function updateQuantity(next: number) {
-    if (next < minQty) {
-      setMsg(
-        !isCross
-          ? `同城配送至少购买 ${minQty} 瓶`
-          : `跨城配送至少购买 ${minQty} 瓶（1箱）`,
-      );
-      return;
-    }
-    setMsg('');
+    if (next < 1) return;
     setQuantity(next);
   }
 
@@ -158,8 +157,18 @@ export default function OrderConfirmPage() {
   }
 
   async function submit() {
-    if (!addressId) {
-      setMsg('请选择收货地址');
+    if (!canSubmit) {
+      if (!addressId) {
+        setMsg('请选择收货地址');
+        return;
+      }
+      if (!quantityOk) {
+        setMsg(
+          isCross
+            ? `跨城配送至少购买 ${minQty} 瓶（1箱）`
+            : `同城配送至少购买 ${minQty} 瓶`,
+        );
+      }
       return;
     }
 
@@ -206,6 +215,13 @@ export default function OrderConfirmPage() {
   }
 
   const productImage = preview?.product ? getProductMainImage(preview.product) : '';
+  const submitLabel = loading
+    ? '提交中…'
+    : !addressId
+      ? '请选择地址'
+      : !quantityOk
+        ? `至少购买 ${minQty} 瓶`
+        : '提交订单';
 
   return (
     <PageShell variant="sub" className="order-confirm-page" hasFixedFooter>
@@ -241,7 +257,8 @@ export default function OrderConfirmPage() {
         {isCross ? (
           <View className="order-card">
             <Text className="u-muted">
-              该地址超出同城配送范围，将由总部物流发货，运费到付。
+              该地址超出同城配送范围，将由总部物流发货，运费到付
+              {quantity < minQty ? `；跨城至少购买 ${minQty} 瓶（1箱）` : ''}。
             </Text>
           </View>
         ) : null}
@@ -269,7 +286,7 @@ export default function OrderConfirmPage() {
                 <Text>购买数量</Text>
                 <View className="order-qty-controls">
                   <View
-                    className="order-qty-btn"
+                    className={`order-qty-btn${quantity <= 1 ? ' order-qty-btn--disabled' : ''}`}
                     onClick={() => updateQuantity(quantity - 1)}
                   >
                     <Text>−</Text>
@@ -283,6 +300,13 @@ export default function OrderConfirmPage() {
                   </View>
                 </View>
               </View>
+              {!quantityOk ? (
+                <Text className="order-qty-hint">
+                  {isCross
+                    ? `跨城配送至少购买 ${minQty} 瓶（1箱），请调整数量`
+                    : `同城配送至少购买 ${minQty} 瓶，请调整数量`}
+                </Text>
+              ) : null}
             </View>
 
             <View className="order-card">
@@ -320,10 +344,13 @@ export default function OrderConfirmPage() {
           </Text>
         </View>
         <View
-          className="order-confirm-submit"
-          onClick={() => !loading && void submit()}
+          className={`order-confirm-submit${canSubmit ? '' : ' order-confirm-submit--disabled'}`}
+          onClick={() => {
+            if (!canSubmit) return;
+            void submit();
+          }}
         >
-          <Text>{loading ? '提交中…' : !addressId ? '请选择地址' : '提交订单'}</Text>
+          <Text>{submitLabel}</Text>
         </View>
       </View>
     </PageShell>

apps/mini-user/src/styles/order.css

@@ -93,6 +93,11 @@
   color: var(--color-on-surface);
 }
 
+.order-qty-btn--disabled {
+  opacity: 0.4;
+  pointer-events: none;
+}
+
 .order-qty-value {
   margin: 0 14px;
   font-size: 16px;
@@ -101,6 +106,14 @@
   text-align: center;
 }
 
+.order-qty-hint {
+  display: block;
+  margin-top: 10px;
+  font-size: 13px;
+  color: var(--color-heritage-red);
+  line-height: 1.4;
+}
+
 .order-row {
   display: flex;
   justify-content: space-between;
@@ -180,6 +193,13 @@
   justify-content: center;
 }
 
+.order-confirm-submit--disabled {
+  background: #c9c5c0;
+  color: #fff;
+  opacity: 0.85;
+  pointer-events: none;
+}
+
 .order-tabs {
   display: flex;
   padding: 0 var(--space-page);

packages/shared-types/src/enums.ts

@@ -194,8 +194,8 @@ export const FULFILLMENT_PROVIDER_STATUS_LABELS: Record<FulfillmentProviderStatu
 };
 
 export const WAREHOUSE_FULFILLMENT_MODE_LABELS: Record<WarehouseFulfillmentMode, string> = {
-  [WarehouseFulfillmentMode.API_AUTO]: 'API 自动推单',
-  [WarehouseFulfillmentMode.MANUAL]: '自管手工填单',
+  [WarehouseFulfillmentMode.API_AUTO]: '自动发货',
+  [WarehouseFulfillmentMode.MANUAL]: '关闭（手工填单）',
 };
 
 export enum AccountStatus {

packages/shared-types/src/fulfillment-provider.ts

@@ -1,6 +1,24 @@
 import type { FulfillmentProviderStatus, FulfillmentProviderType } from './enums';
 import type { WarehouseFulfillmentMode } from './enums';
 
+/** 小飞侠仓配凭证（存 FulfillmentProvider.configJson） */
+export interface XiaofeixiaProviderConfig {
+  apiUrl: string;
+  mchId: string;
+  apiKey: string;
+  signType?: 'MD5' | 'HMAC-SHA256';
+  appId?: string;
+}
+
+/** 回显用（不含明文 apiKey） */
+export interface XiaofeixiaProviderConfigPublic {
+  apiUrl: string;
+  mchId: string;
+  signType: 'MD5' | 'HMAC-SHA256';
+  appId?: string;
+  hasApiKey: boolean;
+}
+
 export interface FulfillmentProviderDto {
   id: string;
   code: string;
@@ -14,6 +32,8 @@ export interface FulfillmentProviderDto {
     cancel?: boolean;
   } | null;
   hasConfig: boolean;
+  /** 小飞侠等承运商结构化配置（脱敏） */
+  xiaofeixiaConfig?: XiaofeixiaProviderConfigPublic | null;
   createdAt: string;
   updatedAt: string;
 }
@@ -25,6 +45,8 @@ export interface CreateFulfillmentProviderInput {
   status?: FulfillmentProviderStatus;
   configJson?: string;
   capabilitiesJson?: string;
+  /** 结构化小飞侠配置；有则覆盖写入 configJson */
+  xiaofeixiaConfig?: Partial<XiaofeixiaProviderConfig>;
 }
 
 export interface UpdateFulfillmentProviderInput {
@@ -33,6 +55,7 @@ export interface UpdateFulfillmentProviderInput {
   status?: FulfillmentProviderStatus;
   configJson?: string;
   capabilitiesJson?: string;
+  xiaofeixiaConfig?: Partial<XiaofeixiaProviderConfig>;
 }
 
 export interface ManualShipOrderInput {
@@ -49,3 +72,9 @@ export interface WarehouseFulfillmentConfig {
   lng?: number | null;
   lat?: number | null;
 }
+
+export const XFX_PROVIDER_CODES = ['XFX', 'XIAOFEIXIA'] as const;
+
+export function isXfxProviderCode(code: string): boolean {
+  return (XFX_PROVIDER_CODES as readonly string[]).includes(code.trim().toUpperCase());
+}

packages/shared-types/src/partner-log.ts

@@ -25,7 +25,7 @@ export const PARTNER_LOG_EVENT_CATEGORIES: Record<PartnerLogCategory, readonly s
     'partner_store_audit_rejected',
   ],
   shipping: ['partner_order_ship', 'partner_delivery_advance'],
-  settlement: ['partner_bill_view', 'partner_bill_detail_view'],
+  settlement: ['partner_bill_view', 'partner_bill_detail_view', 'partner_bill_confirm'],
   warehouse_ops: ['partner_warehouse_view', 'partner_warehouse_update'],
 };
 

packages/shared-types/src/partner.ts

@@ -7,12 +7,20 @@ export interface PartnerMe {
   isPrimary: boolean;
   companyName?: string;
   hasWechat?: boolean;
+  /** 微信授权后的昵称 */
+  wxNickname?: string | null;
+  /** 微信授权后的头像 URL */
+  wxAvatarUrl?: string | null;
   staffRole?: PartnerStaffRole;
   permissions?: string[];
   primaryAccountId?: string;
   /** 子账号联系主账号用 */
   primaryPhone?: string;
   primaryName?: string;
+  /** 主账号绑定的管仓 ID（有则本城酒单推送至该仓） */
+  managedWarehouseId?: string | null;
+  /** 是否已配置仓库管理（无则不展示/不推送酒订单） */
+  hasWarehouseAccess?: boolean;
 }
 
 export interface UpdatePartnerMeRequest {

packages/shared-types/src/settlement.ts

@@ -7,21 +7,24 @@ export interface StorePayoutDto {
   paidAt?: string | null;
 }
 
+export type PartnerBillStatus = 'DRAFT' | 'CONFIRMED' | 'PAID' | 'REJECTED';
+
 export interface PartnerBillDto {
   id: string;
   billNo: string;
   orderCommission: number;
   redeemCommission: number;
   totalAmount: number;
-  status: 'DRAFT' | 'CONFIRMED' | 'PAID';
+  status: PartnerBillStatus;
   periodStart: string;
   periodEnd: string;
+  confirmedAt?: string | null;
+  paidAt?: string | null;
+  rejectReason?: string | null;
 }
 
 export interface PartnerBillDetailDto extends PartnerBillDto {
   partnerId: string;
-  confirmedAt?: string | null;
-  paidAt?: string | null;
 }
 
 /** 门店结算默认比例（核销金额 × 比例） */

scripts/dev-mini-user-h5.mjs

@@ -16,7 +16,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const APP_ROOT = path.resolve(__dirname, '../apps/mini-user');
 const DIST = path.resolve(APP_ROOT, 'dist');
 const PORT = Number(process.env.PORT || 5177);
-const API_ORIGIN = (process.env.VITE_API_TARGET ?? 'https://dkapi.runxian.top').replace(/\/$/, '');
+const API_ORIGIN = (process.env.VITE_API_TARGET ?? 'http://localhost:3000').replace(/\/$/, '');
 const TARO_BIN = path.resolve(APP_ROOT, 'node_modules/@tarojs/cli/bin/taro');
 
 const MIME = {

server/dukang-api/prisma/schema.prisma

@@ -183,6 +183,7 @@ enum PartnerBillStatus {
   DRAFT
   CONFIRMED
   PAID
+  REJECTED
 }
 
 enum StoreStatus {
@@ -567,6 +568,8 @@ model PartnerAccount {
   name                 String               @db.VarChar(64)
   wxOpenId             String?              @map("wx_open_id") @db.VarChar(64)
   wxUnionId            String?              @map("wx_union_id") @db.VarChar(64)
+  wxNickname           String?              @map("wx_nickname") @db.VarChar(64)
+  wxAvatarUrl          String?              @map("wx_avatar_url") @db.VarChar(512)
   isPrimary            Int                  @default(0) @map("is_primary") @db.TinyInt
   parentAccountId      BigInt?              @map("parent_account_id") @db.UnsignedBigInt
   staffRole            PartnerStaffRole?    @map("staff_role")
@@ -621,6 +624,7 @@ model PartnerBill {
   status            PartnerBillStatus @default(DRAFT)
   confirmedAt       DateTime?         @map("confirmed_at") @db.DateTime(3)
   paidAt            DateTime?         @map("paid_at") @db.DateTime(3)
+  rejectReason      String?           @map("reject_reason") @db.VarChar(500)
   createdAt         DateTime          @default(now()) @map("created_at") @db.DateTime(3)
 
   partnerAccount PartnerAccount @relation(fields: [partnerAccountId], references: [id], onDelete: Restrict)

server/dukang-api/prisma/seed-v31.ts

@@ -177,7 +177,7 @@ async function main() {
 
 
 
-  const xfxProvider = await prisma.fulfillmentProvider.create({
+  await prisma.fulfillmentProvider.create({
     data: {
       code: 'XFX',
       name: '小飞侠',
@@ -189,6 +189,12 @@ async function main() {
         callback: true,
         cancel: true,
       }),
+      configJson: JSON.stringify({
+        apiUrl: 'https://beta.51xiaoju.cn/app/api/interface.do',
+        mchId: '',
+        apiKey: '',
+        signType: 'MD5',
+      }),
     },
   });
 
@@ -212,9 +218,9 @@ async function main() {
 
       status: 'ACTIVE',
 
-      fulfillmentMode: 'API_AUTO',
+      fulfillmentMode: 'MANUAL',
 
-      fulfillmentProviderId: xfxProvider.id,
+      fulfillmentProviderId: null,
 
       lng: 113.665,
 

server/dukang-api/src/common/hq-operation/hq-operation.constants.ts

@@ -46,6 +46,7 @@ export const HqOperationAction = {
   PARTNER_BILL_GENERATE: 'PARTNER_BILL_GENERATE',
   PARTNER_BILL_CONFIRM: 'PARTNER_BILL_CONFIRM',
   PARTNER_BILL_MARK_PAID: 'PARTNER_BILL_MARK_PAID',
+  PARTNER_BILL_REJECT: 'PARTNER_BILL_REJECT',
   REDEEM_DEBUG_CREATE_TOKEN: 'REDEEM_DEBUG_CREATE_TOKEN',
   REDEEM_DEBUG_CONFIRM: 'REDEEM_DEBUG_CONFIRM',
   PROMO_CODE_CREATE: 'PROMO_CODE_CREATE',
@@ -108,6 +109,7 @@ export const HQ_OPERATION_ACTION_LABELS: Record<string, string> = {
   [HqOperationAction.PARTNER_BILL_GENERATE]: '生成合伙人账单',
   [HqOperationAction.PARTNER_BILL_CONFIRM]: '确认合伙人账单',
   [HqOperationAction.PARTNER_BILL_MARK_PAID]: '合伙人账单结算',
+  [HqOperationAction.PARTNER_BILL_REJECT]: '驳回合伙人打款申请',
   [HqOperationAction.REDEEM_DEBUG_CREATE_TOKEN]: '核销调试-生成码',
   [HqOperationAction.REDEEM_DEBUG_CONFIRM]: '核销调试-确认核销',
   [HqOperationAction.PROMO_CODE_CREATE]: '创建推广码',

server/dukang-api/src/common/system-config/system-config.registry.ts

@@ -6,7 +6,6 @@ export const SYSTEM_CONFIG_GROUPS: SystemConfigGroupMeta[] = [
   { key: 'sms', label: '短信' },
   { key: 'wechat', label: '微信' },
   { key: 'oss', label: '对象存储 OSS' },
-  { key: 'courier', label: '同城配送' },
   { key: 'app', label: '应用链接' },
   { key: 'deploy', label: '发布部署' },
 ];
@@ -16,7 +15,6 @@ const G = {
   sms: 'sms',
   wechat: 'wechat',
   oss: 'oss',
-  courier: 'courier',
   app: 'app',
   deploy: 'deploy',
 } as const;
@@ -79,19 +77,6 @@ export const SYSTEM_CONFIG_FIELDS: SystemConfigFieldMeta[] = [
   { key: 'OSS_UPLOAD_EXPIRE_SECONDS', label: '直传凭证有效期(秒)', group: G.oss, type: 'number', requiresRestart: false },
   { key: 'OSS_MAX_UPLOAD_BYTES', label: '单文件上限(字节)', group: G.oss, type: 'number', requiresRestart: false },
 
-  { key: 'COURIER_PROVIDER', label: '配送服务商', group: G.courier, type: 'string', requiresRestart: true, placeholder: 'xiaofeixia' },
-  { key: 'XIAOFEIXIA_API_URL', label: '小飞侠 API 地址', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'XIAOFEIXIA_MCH_ID', label: '小飞侠商户号', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'XIAOFEIXIA_API_KEY', label: '小飞侠 API Key', group: G.courier, type: 'password', secret: true, requiresRestart: false },
-  { key: 'XIAOFEIXIA_SIGN_TYPE', label: '小飞侠签名类型', group: G.courier, type: 'string', requiresRestart: false, placeholder: 'MD5' },
-  { key: 'XIAOFEIXIA_APP_ID', label: '小飞侠 AppID', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'SHIP_FROM_NAME', label: '默认寄件人', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'SHIP_FROM_MOBILE', label: '默认寄件手机', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'SHIP_FROM_ADDRESS', label: '默认寄件地址', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'SHIP_FROM_ADDRESS_DETAIL', label: '默认寄件门牌', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'SHIP_FROM_LNG', label: '默认寄件经度', group: G.courier, type: 'string', requiresRestart: false },
-  { key: 'SHIP_FROM_LAT', label: '默认寄件纬度', group: G.courier, type: 'string', requiresRestart: false },
-
   { key: 'USER_H5_URL', label: 'C 端 H5 落地页', group: G.app, type: 'string', requiresRestart: false },
   { key: 'TENCENT_LBS_KEY', label: '腾讯位置服务 Key', group: G.app, type: 'password', secret: true, requiresRestart: false },
 

server/dukang-api/src/integrations/courier/courier.service.ts

@@ -2,6 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { COURIER_PROVIDER } from './courier.constants';
 import type {
   BatchShipmentQuery,
+  CourierCallOptions,
   CreateShipmentInput,
   CreateShipmentResult,
   DeliveryCoverageResult,
@@ -24,32 +25,32 @@ export class CourierService {
     return this.provider.code;
   }
 
-  createShipment(input: CreateShipmentInput): Promise<CreateShipmentResult> {
-    return this.provider.createShipment(input);
+  createShipment(input: CreateShipmentInput, options?: CourierCallOptions): Promise<CreateShipmentResult> {
+    return this.provider.createShipment(input, options);
   }
 
-  cancelShipment(query: ShipmentQuery): Promise<void> {
-    return this.provider.cancelShipment(query);
+  cancelShipment(query: ShipmentQuery, options?: CourierCallOptions): Promise<void> {
+    return this.provider.cancelShipment(query, options);
   }
 
-  getShipment(query: ShipmentQuery): Promise<ShipmentDetail> {
-    return this.provider.getShipment(query);
+  getShipment(query: ShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail> {
+    return this.provider.getShipment(query, options);
   }
 
-  batchGetShipments(query: BatchShipmentQuery): Promise<ShipmentDetail[]> {
-    return this.provider.batchGetShipments(query);
+  batchGetShipments(query: BatchShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail[]> {
+    return this.provider.batchGetShipments(query, options);
   }
 
-  getTrack(query: ShipmentQuery): Promise<TrackNode[]> {
-    return this.provider.getTrack(query);
+  getTrack(query: ShipmentQuery, options?: CourierCallOptions): Promise<TrackNode[]> {
+    return this.provider.getTrack(query, options);
   }
 
-  checkDeliveryCoverage(toAddress: string): Promise<DeliveryCoverageResult> {
-    return this.provider.checkDeliveryCoverage(toAddress);
+  checkDeliveryCoverage(toAddress: string, options?: CourierCallOptions): Promise<DeliveryCoverageResult> {
+    return this.provider.checkDeliveryCoverage(toAddress, options);
   }
 
-  estimateFreight(weight: number): Promise<FreightEstimateResult> {
-    return this.provider.estimateFreight(weight);
+  estimateFreight(weight: number, options?: CourierCallOptions): Promise<FreightEstimateResult> {
+    return this.provider.estimateFreight(weight, options);
   }
 
   buildTrackCallbackResponse(success?: boolean): TrackCallbackResponse {

server/dukang-api/src/integrations/courier/courier.types.ts

@@ -1,4 +1,10 @@
 import { CourierProviderCode } from './courier.constants';
+import type { XiaofeixiaConfig } from './courier.config';
+
+/** 调用时覆盖默认 env 配置（仓配管理里维护的凭证） */
+export interface CourierCallOptions {
+  xiaofeixia?: XiaofeixiaConfig;
+}
 
 export interface CourierCoordinate {
   lng: number;
@@ -106,12 +112,12 @@ export interface TrackCallbackResponse {
 export interface ICourierProvider {
   readonly code: CourierProviderCode;
 
-  createShipment(input: CreateShipmentInput): Promise<CreateShipmentResult>;
-  cancelShipment(query: ShipmentQuery): Promise<void>;
-  getShipment(query: ShipmentQuery): Promise<ShipmentDetail>;
-  batchGetShipments(query: BatchShipmentQuery): Promise<ShipmentDetail[]>;
-  getTrack(query: ShipmentQuery): Promise<TrackNode[]>;
-  checkDeliveryCoverage(toAddress: string): Promise<DeliveryCoverageResult>;
-  estimateFreight(weight: number): Promise<FreightEstimateResult>;
+  createShipment(input: CreateShipmentInput, options?: CourierCallOptions): Promise<CreateShipmentResult>;
+  cancelShipment(query: ShipmentQuery, options?: CourierCallOptions): Promise<void>;
+  getShipment(query: ShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail>;
+  batchGetShipments(query: BatchShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail[]>;
+  getTrack(query: ShipmentQuery, options?: CourierCallOptions): Promise<TrackNode[]>;
+  checkDeliveryCoverage(toAddress: string, options?: CourierCallOptions): Promise<DeliveryCoverageResult>;
+  estimateFreight(weight: number, options?: CourierCallOptions): Promise<FreightEstimateResult>;
   buildTrackCallbackResponse(success?: boolean): TrackCallbackResponse;
 }

server/dukang-api/src/integrations/courier/xiaofeixia/xiaofeixia.client.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { CourierApiError } from '../courier.error';
-import { CourierConfigService } from '../courier.config';
+import { CourierConfigService, type XiaofeixiaConfig } from '../courier.config';
 import { PrismaService } from '../../../common/prisma/prisma.module';
 import {
   logCourierCall,
@@ -21,12 +21,12 @@ export class XiaofeixiaClient {
     private readonly prisma: PrismaService,
   ) {}
 
-  async request<T>(cmd: string, bizParams: RequestParams): Promise<T> {
-    const cfg = this.courierConfig.load().xiaofeixia;
+  async request<T>(cmd: string, bizParams: RequestParams, override?: XiaofeixiaConfig): Promise<T> {
+    const cfg = override ?? this.courierConfig.load().xiaofeixia;
     const scene = sceneForXfxCmd(cmd);
     const externalNo = this.pickExternalNo(bizParams);
 
-    if (!cfg.mchId || !cfg.apiKey) {
+    if (!cfg.mchId || !cfg.apiKey || !cfg.apiUrl) {
       await logCourierCall(this.prisma, {
         scene,
         requestUrl: cfg.apiUrl || '(未配置)',
@@ -36,7 +36,7 @@ export class XiaofeixiaClient {
         externalNo,
       });
       throw new CourierApiError(
-        '小飞侠商户配置不完整，请设置 XIAOFEIXIA_MCH_ID 与 XIAOFEIXIA_API_KEY',
+        '小飞侠商户配置不完整，请在仓配管理中填写 API 地址、商户号与 API Key',
         'CONFIG_ERROR',
         'XIAOFEIXIA',
       );

server/dukang-api/src/integrations/courier/xiaofeixia/xiaofeixia.provider.ts

@@ -3,6 +3,7 @@ import { CourierProviderCode } from '../courier.constants';
 import { CourierApiError } from '../courier.error';
 import type {
   BatchShipmentQuery,
+  CourierCallOptions,
   CreateShipmentInput,
   CreateShipmentResult,
   DeliveryCoverageResult,
@@ -29,28 +30,32 @@ export class XiaofeixiaProvider implements ICourierProvider {
 
   constructor(private readonly client: XiaofeixiaClient) {}
 
-  async createShipment(input: CreateShipmentInput): Promise<CreateShipmentResult> {
-    const data = await this.client.request<XiaofeixiaCreateOrderData>(XIAOFEIXIA_CMD.CREATE_ORDER, {
-      customerId: input.customerId,
-      outNumber: input.outNumber,
-      fromAddress: input.from.address,
-      fromAddressDetail: input.from.addressDetail,
-      fromCoordinate: this.formatCoordinate(input.from.coordinate),
-      fromMobile: input.from.mobile,
-      fromName: input.from.name,
-      toAddress: input.to.address,
-      toAddressDetail: input.to.addressDetail,
-      toCoordinate: this.formatCoordinate(input.to.coordinate),
-      toMobile: input.to.mobile,
-      toName: input.to.name,
-      goodsName: input.goodsName,
-      goodsNum: input.goodsNum,
-      weight: input.weight,
-      insuredSumPrice: input.insuredSumPrice,
-      collectionPrice: input.collectionPrice,
-      payMode: input.payMode,
-      remark: input.remark,
-    });
+  async createShipment(input: CreateShipmentInput, options?: CourierCallOptions): Promise<CreateShipmentResult> {
+    const data = await this.client.request<XiaofeixiaCreateOrderData>(
+      XIAOFEIXIA_CMD.CREATE_ORDER,
+      {
+        customerId: input.customerId,
+        outNumber: input.outNumber,
+        fromAddress: input.from.address,
+        fromAddressDetail: input.from.addressDetail,
+        fromCoordinate: this.formatCoordinate(input.from.coordinate),
+        fromMobile: input.from.mobile,
+        fromName: input.from.name,
+        toAddress: input.to.address,
+        toAddressDetail: input.to.addressDetail,
+        toCoordinate: this.formatCoordinate(input.to.coordinate),
+        toMobile: input.to.mobile,
+        toName: input.to.name,
+        goodsName: input.goodsName,
+        goodsNum: input.goodsNum,
+        weight: input.weight,
+        insuredSumPrice: input.insuredSumPrice,
+        collectionPrice: input.collectionPrice,
+        payMode: input.payMode,
+        remark: input.remark,
+      },
+      options?.xiaofeixia,
+    );
 
     return {
       providerShipmentId: data.id,
@@ -58,24 +63,32 @@ export class XiaofeixiaProvider implements ICourierProvider {
     };
   }
 
-  async cancelShipment(query: ShipmentQuery): Promise<void> {
+  async cancelShipment(query: ShipmentQuery, options?: CourierCallOptions): Promise<void> {
     this.assertShipmentQuery(query);
-    await this.client.request(XIAOFEIXIA_CMD.CANCEL_ORDER, {
-      number: query.trackingNumber,
-      outNumber: query.outNumber,
-    });
+    await this.client.request(
+      XIAOFEIXIA_CMD.CANCEL_ORDER,
+      {
+        number: query.trackingNumber,
+        outNumber: query.outNumber,
+      },
+      options?.xiaofeixia,
+    );
   }
 
-  async getShipment(query: ShipmentQuery): Promise<ShipmentDetail> {
+  async getShipment(query: ShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail> {
     this.assertShipmentQuery(query);
-    const data = await this.client.request<XiaofeixiaOrderDetail>(XIAOFEIXIA_CMD.GET_ORDER, {
-      number: query.trackingNumber,
-      outNumber: query.outNumber,
-    });
+    const data = await this.client.request<XiaofeixiaOrderDetail>(
+      XIAOFEIXIA_CMD.GET_ORDER,
+      {
+        number: query.trackingNumber,
+        outNumber: query.outNumber,
+      },
+      options?.xiaofeixia,
+    );
     return this.mapOrderDetail(data);
   }
 
-  async batchGetShipments(query: BatchShipmentQuery): Promise<ShipmentDetail[]> {
+  async batchGetShipments(query: BatchShipmentQuery, options?: CourierCallOptions): Promise<ShipmentDetail[]> {
     const number = query.trackingNumbers?.join(',');
     const outNumber = query.outNumbers?.join(',');
 
@@ -83,27 +96,36 @@ export class XiaofeixiaProvider implements ICourierProvider {
       throw new CourierApiError('运单号与商家单号至少传一个', '300000', this.code);
     }
 
-    const data = await this.client.request<XiaofeixiaOrderDetail[]>(XIAOFEIXIA_CMD.BATCH_GET_ORDER, {
-      number,
-      outNumber,
-    });
+    const data = await this.client.request<XiaofeixiaOrderDetail[]>(
+      XIAOFEIXIA_CMD.BATCH_GET_ORDER,
+      {
+        number,
+        outNumber,
+      },
+      options?.xiaofeixia,
+    );
 
     return (data ?? []).map((item) => this.mapOrderDetail(item));
   }
 
-  async getTrack(query: ShipmentQuery): Promise<TrackNode[]> {
+  async getTrack(query: ShipmentQuery, options?: CourierCallOptions): Promise<TrackNode[]> {
     this.assertShipmentQuery(query);
-    const data = await this.client.request<XiaofeixiaTrackNode[]>(XIAOFEIXIA_CMD.TRACK_ROUTE, {
-      number: query.trackingNumber,
-      outNumber: query.outNumber,
-    });
+    const data = await this.client.request<XiaofeixiaTrackNode[]>(
+      XIAOFEIXIA_CMD.TRACK_ROUTE,
+      {
+        number: query.trackingNumber,
+        outNumber: query.outNumber,
+      },
+      options?.xiaofeixia,
+    );
     return data ?? [];
   }
 
-  async checkDeliveryCoverage(toAddress: string): Promise<DeliveryCoverageResult> {
+  async checkDeliveryCoverage(toAddress: string, options?: CourierCallOptions): Promise<DeliveryCoverageResult> {
     const data = await this.client.request<XiaofeixiaDeliveryCoverageData>(
       XIAOFEIXIA_CMD.DELIVERY_COVERAGE,
       { toAddress },
+      options?.xiaofeixia,
     );
 
     return {
@@ -113,10 +135,11 @@ export class XiaofeixiaProvider implements ICourierProvider {
     };
   }
 
-  async estimateFreight(weight: number): Promise<FreightEstimateResult> {
+  async estimateFreight(weight: number, options?: CourierCallOptions): Promise<FreightEstimateResult> {
     const data = await this.client.request<XiaofeixiaFreightEstimateData>(
       XIAOFEIXIA_CMD.ESTIMATE_FREIGHT,
       { weight },
+      options?.xiaofeixia,
     );
 
     return { freightPrice: data.freightPrice };

server/dukang-api/src/integrations/wechat/wechat.mock.provider.ts

@@ -48,7 +48,7 @@ export class WechatMockProvider implements IWechatProvider {
     return {
       openId,
       nickname: 'Mock微信用户',
-      headImgUrl: undefined,
+      headImgUrl: `https://api.dicebear.com/7.x/avataaars/svg?seed=${encodeURIComponent(openId)}`,
     };
   }
 

server/dukang-api/src/modules/city-scope/partner-city.service.ts

@@ -103,10 +103,16 @@ export class PartnerCityService {
     if (!primary.cityId) return { id: -1n };
 
     const warehouseIds = await this.resolveManagedWarehouseIds(primary.id);
-    if (warehouseIds.length > 0) {
-      return { fulfillmentWarehouseId: { in: warehouseIds } };
+    // 未配置管仓：不推送/不展示酒订单（同城无仓由总部履约）
+    if (warehouseIds.length === 0) {
+      return { id: -1n };
     }
-    return { cityId: primary.cityId };
+    return { fulfillmentWarehouseId: { in: warehouseIds } };
+  }
+
+  async hasManagedWarehouse(partnerAccountId: bigint): Promise<boolean> {
+    const ids = await this.resolveManagedWarehouseIds(partnerAccountId);
+    return ids.length > 0;
   }
 
   /** 合伙人可管仓库：主账号 managedWarehouseId + 绑定为管仓合伙人的仓 */

server/dukang-api/src/modules/fulfillment/fulfillment-provider.service.ts

@@ -1,7 +1,13 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
 import { FulfillmentProviderStatus, FulfillmentProviderType } from '@prisma/client';
+import {
+  isXfxProviderCode,
+  type XiaofeixiaProviderConfig,
+  type XiaofeixiaProviderConfigPublic,
+} from '@dukang/shared-types';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
+import type { XiaofeixiaConfig, XiaofeixiaSignType } from '../../integrations/courier/courier.config';
 
 export type CreateFulfillmentProviderInput = {
   code: string;
@@ -10,6 +16,7 @@ export type CreateFulfillmentProviderInput = {
   status?: FulfillmentProviderStatus;
   configJson?: string;
   capabilitiesJson?: string;
+  xiaofeixiaConfig?: Partial<XiaofeixiaProviderConfig>;
 };
 
 export type UpdateFulfillmentProviderInput = Partial<CreateFulfillmentProviderInput>;
@@ -21,6 +28,8 @@ type Capabilities = {
   cancel?: boolean;
 };
 
+const DEFAULT_XFX_API_URL = 'https://beta.51xiaoju.cn/app/api/interface.do';
+
 @Injectable()
 export class FulfillmentProviderService {
   constructor(private readonly prisma: PrismaService) {}
@@ -46,6 +55,44 @@ export class FulfillmentProviderService {
     return this.toDto(row);
   }
 
+  /** 供推单使用：解析完整小飞侠凭证（含 apiKey） */
+  async resolveXiaofeixiaConfig(providerId: bigint): Promise<XiaofeixiaConfig> {
+    const row = await this.prisma.fulfillmentProvider.findUnique({ where: { id: providerId } });
+    if (!row) throw new NotFoundException('仓配承运商不存在');
+    if (!isXfxProviderCode(row.code)) {
+      throw new BadRequestException('该承运商不是小飞侠');
+    }
+    const cfg = this.parseXiaofeixiaConfig(row.configJson);
+    if (!cfg?.mchId || !cfg?.apiKey || !cfg?.apiUrl) {
+      throw new BadRequestException('小飞侠仓配配置不完整，请在仓配管理中填写 API 地址、商户号与 API Key');
+    }
+    return {
+      apiUrl: cfg.apiUrl,
+      mchId: cfg.mchId,
+      apiKey: cfg.apiKey,
+      signType: this.resolveSignType(cfg.signType),
+      appId: cfg.appId || undefined,
+    };
+  }
+
+  /** 取第一个启用的小飞侠承运商配置（联调/兼容） */
+  async resolveDefaultXiaofeixiaConfig(): Promise<XiaofeixiaConfig | null> {
+    const row = await this.prisma.fulfillmentProvider.findFirst({
+      where: {
+        status: 'ACTIVE',
+        type: 'API',
+        code: { in: ['XFX', 'XIAOFEIXIA'] },
+      },
+      orderBy: { updatedAt: 'desc' },
+    });
+    if (!row?.configJson) return null;
+    try {
+      return await this.resolveXiaofeixiaConfig(row.id);
+    } catch {
+      return null;
+    }
+  }
+
   async create(input: CreateFulfillmentProviderInput) {
     const code = input.code.trim().toUpperCase();
     if (!/^[A-Z0-9_]+$/.test(code)) {
@@ -54,28 +101,54 @@ export class FulfillmentProviderService {
     const existing = await this.prisma.fulfillmentProvider.findUnique({ where: { code } });
     if (existing) throw new BadRequestException('承运商编码已存在');
 
+    const configJson = this.resolveConfigJsonForWrite(code, null, input);
+    if (isXfxProviderCode(code) && input.type === 'API') {
+      this.assertXiaofeixiaConfigComplete(configJson, true);
+    }
+
     const row = await this.prisma.fulfillmentProvider.create({
       data: {
         code,
         name: input.name.trim(),
         type: input.type,
         status: input.status ?? 'ACTIVE',
-        configJson: input.configJson?.trim() || null,
-        capabilitiesJson: input.capabilitiesJson?.trim() || null,
+        configJson,
+        capabilitiesJson:
+          input.capabilitiesJson?.trim() ||
+          (isXfxProviderCode(code)
+            ? JSON.stringify({
+                createShipment: true,
+                getTrack: true,
+                callback: true,
+                cancel: true,
+              })
+            : null),
       },
     });
     return this.toDto(row);
   }
 
   async update(id: bigint, input: UpdateFulfillmentProviderInput) {
-    await this.getById(id);
+    const current = await this.prisma.fulfillmentProvider.findUnique({ where: { id } });
+    if (!current) throw new NotFoundException('仓配承运商不存在');
+
+    const code = current.code;
+    const configJson =
+      input.xiaofeixiaConfig !== undefined || input.configJson !== undefined
+        ? this.resolveConfigJsonForWrite(code, current.configJson, input)
+        : undefined;
+
+    if (configJson !== undefined && isXfxProviderCode(code) && (input.type ?? current.type) === 'API') {
+      this.assertXiaofeixiaConfigComplete(configJson, false);
+    }
+
     const row = await this.prisma.fulfillmentProvider.update({
       where: { id },
       data: {
         ...(input.name !== undefined ? { name: input.name.trim() } : {}),
         ...(input.type !== undefined ? { type: input.type } : {}),
         ...(input.status !== undefined ? { status: input.status } : {}),
-        ...(input.configJson !== undefined ? { configJson: input.configJson?.trim() || null } : {}),
+        ...(configJson !== undefined ? { configJson } : {}),
         ...(input.capabilitiesJson !== undefined
           ? { capabilitiesJson: input.capabilitiesJson?.trim() || null }
           : {}),
@@ -93,6 +166,74 @@ export class FulfillmentProviderService {
     }
   }
 
+  parseXiaofeixiaConfig(raw: string | null): XiaofeixiaProviderConfig | null {
+    if (!raw) return null;
+    try {
+      const parsed = JSON.parse(raw) as Partial<XiaofeixiaProviderConfig>;
+      if (!parsed || typeof parsed !== 'object') return null;
+      return {
+        apiUrl: String(parsed.apiUrl ?? '').trim(),
+        mchId: String(parsed.mchId ?? '').trim(),
+        apiKey: String(parsed.apiKey ?? '').trim(),
+        signType: parsed.signType === 'HMAC-SHA256' ? 'HMAC-SHA256' : 'MD5',
+        appId: parsed.appId ? String(parsed.appId).trim() : undefined,
+      };
+    } catch {
+      return null;
+    }
+  }
+
+  private resolveConfigJsonForWrite(
+    code: string,
+    existingRaw: string | null,
+    input: CreateFulfillmentProviderInput | UpdateFulfillmentProviderInput,
+  ): string | null {
+    if (isXfxProviderCode(code) && input.xiaofeixiaConfig) {
+      const existing = this.parseXiaofeixiaConfig(existingRaw);
+      const next: XiaofeixiaProviderConfig = {
+        apiUrl: (input.xiaofeixiaConfig.apiUrl ?? existing?.apiUrl ?? DEFAULT_XFX_API_URL).trim(),
+        mchId: (input.xiaofeixiaConfig.mchId ?? existing?.mchId ?? '').trim(),
+        apiKey: (input.xiaofeixiaConfig.apiKey || existing?.apiKey || '').trim(),
+        signType:
+          input.xiaofeixiaConfig.signType === 'HMAC-SHA256'
+            ? 'HMAC-SHA256'
+            : input.xiaofeixiaConfig.signType === 'MD5'
+              ? 'MD5'
+              : existing?.signType ?? 'MD5',
+        appId: (input.xiaofeixiaConfig.appId ?? existing?.appId)?.trim() || undefined,
+      };
+      return JSON.stringify(next);
+    }
+    if (input.configJson !== undefined) {
+      return input.configJson?.trim() || null;
+    }
+    return existingRaw;
+  }
+
+  private assertXiaofeixiaConfigComplete(configJson: string | null, requireApiKey: boolean) {
+    const cfg = this.parseXiaofeixiaConfig(configJson);
+    if (!cfg?.apiUrl) throw new BadRequestException('请填写小飞侠 API 地址');
+    if (!cfg.mchId) throw new BadRequestException('请填写小飞侠商户号');
+    if (requireApiKey && !cfg.apiKey) throw new BadRequestException('请填写小飞侠 API Key');
+    if (!requireApiKey && !cfg.apiKey) throw new BadRequestException('小飞侠 API Key 缺失，请重新填写');
+  }
+
+  private toPublicXiaofeixiaConfig(raw: string | null): XiaofeixiaProviderConfigPublic | null {
+    const cfg = this.parseXiaofeixiaConfig(raw);
+    if (!cfg) return null;
+    return {
+      apiUrl: cfg.apiUrl || DEFAULT_XFX_API_URL,
+      mchId: cfg.mchId,
+      signType: cfg.signType === 'HMAC-SHA256' ? 'HMAC-SHA256' : 'MD5',
+      appId: cfg.appId,
+      hasApiKey: Boolean(cfg.apiKey),
+    };
+  }
+
+  private resolveSignType(raw?: string): XiaofeixiaSignType {
+    return raw?.toUpperCase() === 'HMAC-SHA256' ? 'HMAC-SHA256' : 'MD5';
+  }
+
   private toDto(row: {
     id: bigint;
     code: string;
@@ -112,6 +253,9 @@ export class FulfillmentProviderService {
       status: row.status,
       capabilities: this.parseCapabilities(row.capabilitiesJson),
       hasConfig: Boolean(row.configJson),
+      xiaofeixiaConfig: isXfxProviderCode(row.code)
+        ? this.toPublicXiaofeixiaConfig(row.configJson)
+        : null,
       createdAt: row.createdAt.toISOString(),
       updatedAt: row.updatedAt.toISOString(),
     });

server/dukang-api/src/modules/fulfillment/fulfillment.service.ts

@@ -1,10 +1,12 @@
 import { BadRequestException, Injectable, Logger, NotFoundException, Inject, forwardRef } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
 import type { CityWarehouse, FulfillmentProvider, Order } from '@prisma/client';
+import { isXfxProviderCode } from '@dukang/shared-types';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { CourierService } from '../../integrations/courier/courier.service';
 import { CourierPayMode } from '../../integrations/courier/courier.types';
+import type { XiaofeixiaConfig } from '../../integrations/courier/courier.config';
 import { TradeService } from '../trade/trade.service';
+import { FulfillmentProviderService } from './fulfillment-provider.service';
 
 export type ManualShipInput = {
   logisticsCompany: string;
@@ -14,16 +16,14 @@ export type ManualShipInput = {
 
 export type HqLogisticsShipInput = ManualShipInput;
 
-const XFX_CODES = new Set(['XFX', 'XIAOFEIXIA']);
-
 @Injectable()
 export class FulfillmentService {
   private readonly logger = new Logger(FulfillmentService.name);
 
   constructor(
     private readonly prisma: PrismaService,
-    private readonly config: ConfigService,
     private readonly courier: CourierService,
+    private readonly fulfillmentProviderService: FulfillmentProviderService,
     @Inject(forwardRef(() => TradeService))
     private readonly tradeService: TradeService,
   ) {}
@@ -69,38 +69,50 @@ export class FulfillmentService {
   }
 
   async dispatchApiAuto(order: Order, warehouse: CityWarehouse, provider: FulfillmentProvider) {
-    if (!XFX_CODES.has(provider.code)) {
+    if (!isXfxProviderCode(provider.code)) {
       this.logger.warn(`承运商 ${provider.code} 自动推单尚未实现，订单 ${order.orderNo} 保持待发货`);
       await this.ensureDeliveryRecord(order.id, 'MANUAL', provider.id);
       return;
     }
 
-    const defaults = this.getShipDefaults();
-    const fromLng = warehouse.lng != null ? Number(warehouse.lng) : defaults.fromLng;
-    const fromLat = warehouse.lat != null ? Number(warehouse.lat) : defaults.fromLat;
+    let xfxConfig: XiaofeixiaConfig;
+    try {
+      xfxConfig = await this.fulfillmentProviderService.resolveXiaofeixiaConfig(provider.id);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      await this.logDispatchFailure(order, provider, message);
+      await this.ensureDeliveryRecord(order.id, 'MANUAL', provider.id);
+      return;
+    }
+
+    const fromLng = warehouse.lng != null ? Number(warehouse.lng) : 113.665;
+    const fromLat = warehouse.lat != null ? Number(warehouse.lat) : 34.757;
 
     try {
-      const result = await this.courier.createShipment({
-        outNumber: order.orderNo,
-        from: {
-          name: warehouse.contactName,
-          mobile: warehouse.contactPhone,
-          address: warehouse.address,
-          addressDetail: warehouse.name,
-          coordinate: { lng: fromLng, lat: fromLat },
+      const result = await this.courier.createShipment(
+        {
+          outNumber: order.orderNo,
+          from: {
+            name: warehouse.contactName,
+            mobile: warehouse.contactPhone,
+            address: warehouse.address,
+            addressDetail: warehouse.name,
+            coordinate: { lng: fromLng, lat: fromLat },
+          },
+          to: {
+            name: order.receiverName,
+            mobile: order.receiverPhone,
+            address: `${order.receiverProvince}${order.receiverCity}${order.receiverDistrict}`,
+            addressDetail: order.receiverAddress,
+          },
+          goodsName: order.productName,
+          goodsNum: order.quantity,
+          weight: 2,
+          payMode: CourierPayMode.SENDER,
+          remark: `仓配自动发货 ${order.orderNo}`,
         },
-        to: {
-          name: order.receiverName,
-          mobile: order.receiverPhone,
-          address: `${order.receiverProvince}${order.receiverCity}${order.receiverDistrict}`,
-          addressDetail: order.receiverAddress,
-        },
-        goodsName: order.productName,
-        goodsNum: order.quantity,
-        weight: defaults.weight,
-        payMode: defaults.payMode,
-        remark: `仓配自动发货 ${order.orderNo}`,
-      });
+        { xiaofeixia: xfxConfig },
+      );
 
       const now = new Date();
       await this.prisma.$transaction(async (tx) => {
@@ -166,11 +178,7 @@ export class FulfillmentService {
     });
     if (!order) throw new NotFoundException('订单不存在');
 
-    const isHqQueue =
-      order.deliveryType === 'CROSS_CITY' ||
-      (order.deliveryType === 'LOCAL' && !order.fulfillmentWarehouseId);
-
-    if (!isHqQueue) throw new BadRequestException('该订单由仓配履约，请使用仓配发货');
+    // HQ 可对任意待发货单填快递单号（含仓配单手动填单）
     if (!['PENDING_SHIP', 'OUT_WAREHOUSE'].includes(order.status)) {
       throw new BadRequestException('当前订单状态不可发货');
     }
@@ -196,10 +204,20 @@ export class FulfillmentService {
 
     if (order.delivery.provider === 'XFX' && (order.delivery.trackingNo || order.orderNo)) {
       try {
-        const nodes = await this.courier.getTrack({
-          trackingNumber: order.delivery.trackingNo ?? undefined,
-          outNumber: order.orderNo,
-        });
+        const options = order.delivery.fulfillmentProviderId
+          ? {
+              xiaofeixia: await this.fulfillmentProviderService.resolveXiaofeixiaConfig(
+                order.delivery.fulfillmentProviderId,
+              ),
+            }
+          : undefined;
+        const nodes = await this.courier.getTrack(
+          {
+            trackingNumber: order.delivery.trackingNo ?? undefined,
+            outNumber: order.orderNo,
+          },
+          options,
+        );
         return {
           nodes,
           manualQueryUrl: order.delivery.manualQueryUrl,
@@ -208,7 +226,7 @@ export class FulfillmentService {
           logisticsCompany: order.delivery.logisticsCompany,
         };
       } catch {
-        // fall through to manual fields
+        // fall through
       }
     }
 
@@ -294,13 +312,4 @@ export class FulfillmentService {
     if (!tpl) return undefined;
     return tpl.replace(/\{trackingNo\}/g, encodeURIComponent(trackingNo));
   }
-
-  private getShipDefaults() {
-    return {
-      fromLng: Number(this.config.get<string>('SHIP_FROM_LNG') || 113.665),
-      fromLat: Number(this.config.get<string>('SHIP_FROM_LAT') || 34.757),
-      weight: 2,
-      payMode: CourierPayMode.SENDER,
-    };
-  }
 }

server/dukang-api/src/modules/iam/auth.service.ts

@@ -231,6 +231,9 @@ export class AuthService {
       isPrimary: number;
       staffRole: string | null;
       permissions?: unknown;
+      wxOpenId?: string | null;
+      wxNickname?: string | null;
+      wxAvatarUrl?: string | null;
     },
     primary: { id: bigint; companyName: string | null },
   ) {
@@ -243,9 +246,37 @@ export class AuthService {
       staffRole: account.staffRole ?? undefined,
       companyName: primary.companyName ?? undefined,
       permissions: Array.isArray(account.permissions) ? account.permissions : undefined,
+      hasWechat: !!account.wxOpenId,
+      wxNickname: account.wxNickname ?? undefined,
+      wxAvatarUrl: account.wxAvatarUrl ?? undefined,
     };
   }
 
+  /** 公众号 snsapi_userinfo：写入合伙人微信昵称与头像 */
+  private async syncPartnerWechatProfile(
+    partnerAccountId: bigint,
+    accessToken: string | undefined,
+    openId: string,
+  ) {
+    if (!accessToken) return null;
+    try {
+      const info = await this.wechatProvider.fetchOAuthUserInfo(accessToken, openId, {
+        refType: 'PARTNER',
+        refId: partnerAccountId,
+      });
+      const data: { wxNickname?: string; wxAvatarUrl?: string } = {};
+      if (info.nickname?.trim()) data.wxNickname = info.nickname.trim().slice(0, 64);
+      if (info.headImgUrl?.trim()) data.wxAvatarUrl = info.headImgUrl.trim().slice(0, 512);
+      if (!data.wxNickname && !data.wxAvatarUrl) return null;
+      return this.prisma.partnerAccount.update({
+        where: { id: partnerAccountId },
+        data,
+      });
+    } catch {
+      return null;
+    }
+  }
+
   private async assertPartnerAccountByPhone(phone: string) {
     const account = await this.prisma.partnerAccount.findUnique({
       where: { phone },
@@ -1547,7 +1578,7 @@ export class AuthService {
       throw new BadRequestException('该微信已绑定其他合伙人账号');
     }
 
-    const updated = await this.prisma.partnerAccount.update({
+    let updated = await this.prisma.partnerAccount.update({
       where: { id: partnerAccountId },
       data: {
         wxOpenId: session.openId,
@@ -1555,6 +1586,12 @@ export class AuthService {
         lastLoginAt: new Date(),
       },
     });
+    const synced = await this.syncPartnerWechatProfile(
+      updated.id,
+      'accessToken' in session ? session.accessToken : undefined,
+      session.openId,
+    );
+    if (synced) updated = synced;
     const primary = await this.resolvePrimaryAccount(updated.id);
 
     this.trackPartnerEvent(updated.id, primary.id, clientApp, 'partner_wechat_bind', { platform });
@@ -1593,6 +1630,12 @@ export class AuthService {
         lastLoginAt: new Date(),
       },
     });
+    const synced = await this.syncPartnerWechatProfile(
+      account.id,
+      'accessToken' in session ? session.accessToken : undefined,
+      session.openId,
+    );
+    if (synced) account = synced;
     const primary = await this.resolvePrimaryAccount(account.id);
 
     this.trackPartnerEvent(account.id, primary.id, clientApp, 'partner_wechat_login', { platform });

server/dukang-api/src/modules/ops/admin-dashboard.service.ts

@@ -22,6 +22,7 @@ export class AdminDashboardService {
       deliveriesTotal,
       pendingPayouts,
       pendingBills,
+      pendingPartnerDraftBills,
       openTickets,
     ] = await Promise.all([
       this.prisma.user.count({ where: { status: 1, mergedIntoUserId: null } }),
@@ -42,7 +43,8 @@ export class AdminDashboardService {
       this.prisma.redeemRecord.count({ where: { createdAt: { gte: todayStart } } }),
       this.prisma.orderDelivery.count(),
       this.prisma.storePayout.count({ where: { status: 'PENDING' } }),
-      this.prisma.partnerBill.count({ where: { status: { in: ['DRAFT', 'CONFIRMED'] } } }),
+      this.prisma.partnerBill.count({ where: { status: 'CONFIRMED' } }),
+      this.prisma.partnerBill.count({ where: { status: 'DRAFT' } }),
       this.prisma.commonTicket.count({ where: { status: { in: ['PENDING', 'OPEN'] } } }),
     ]);
 
@@ -57,7 +59,9 @@ export class AdminDashboardService {
       redeemToday,
       deliveriesTotal,
       pendingPayouts,
+      /** 合伙人已确认、待总部审核打款 */
       pendingBills,
+      pendingPartnerDraftBills,
       openTickets,
       ordersByStatus: ordersByStatus.map((row) => ({
         status: row.status,

server/dukang-api/src/modules/ops/admin-fulfillment-providers.controller.ts

@@ -39,9 +39,15 @@ export class AdminFulfillmentProvidersController {
       status: dto.status as FulfillmentProviderStatus | undefined,
       configJson: dto.configJson,
       capabilitiesJson: dto.capabilitiesJson,
+      xiaofeixiaConfig: dto.xiaofeixiaConfig,
     });
   }
 
+  @Get(':id')
+  detail(@Param('id') id: string) {
+    return this.service.getById(BigInt(id));
+  }
+
   @Put(':id')
   @HqOperation({
     action: HqOperationAction.WAREHOUSE_UPDATE,
@@ -56,6 +62,7 @@ export class AdminFulfillmentProvidersController {
       status: dto.status as FulfillmentProviderStatus | undefined,
       configJson: dto.configJson,
       capabilitiesJson: dto.capabilitiesJson,
+      xiaofeixiaConfig: dto.xiaofeixiaConfig,
     });
   }
 }

server/dukang-api/src/modules/ops/admin-orders.service.ts

@@ -1,5 +1,4 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
 import { Prisma } from '@prisma/client';
 import { PrismaService } from '../../common/prisma/prisma.module';
 import { serializeBigInt } from '../../common/decorators/current-user.decorator';
@@ -11,6 +10,7 @@ import type { AdminOrdersQueryDto } from './dto/admin-query.dto';
 import type { AdminShipOrderDto, HqLogisticsShipDto } from './dto/admin-mutate.dto';
 import type { XiaofeixiaCreateShipmentDto } from './dto/admin-courier.dto';
 import { FulfillmentService } from '../fulfillment/fulfillment.service';
+import { FulfillmentProviderService } from '../fulfillment/fulfillment-provider.service';
 
 @Injectable()
 export class AdminOrdersService {
@@ -19,7 +19,7 @@ export class AdminOrdersService {
     private readonly tradeService: TradeService,
     private readonly xiaofeixiaService: AdminXiaofeixiaService,
     private readonly fulfillmentService: FulfillmentService,
-    private readonly config: ConfigService,
+    private readonly fulfillmentProviderService: FulfillmentProviderService,
   ) {}
 
   async list(query: AdminOrdersQueryDto) {
@@ -30,6 +30,7 @@ export class AdminOrdersService {
     if (query.orderNo) where.orderNo = { contains: query.orderNo };
     if (query.status) where.status = query.status as Prisma.EnumOrderStatusFilter['equals'];
     if (query.userId) where.userId = BigInt(query.userId);
+    if (query.cityId) where.cityId = BigInt(query.cityId);
     if (query.receiverPhone) where.receiverPhone = { contains: query.receiverPhone };
     if (query.createdFrom || query.createdTo) {
       where.createdAt = {};
@@ -46,6 +47,8 @@ export class AdminOrdersService {
         include: {
           user: { select: { id: true, userNo: true, phone: true, nickname: true } },
           delivery: { select: { provider: true, trackingNo: true, providerOrderNo: true } },
+          city: { select: { id: true, name: true, code: true } },
+          fulfillmentWarehouse: { select: { id: true, name: true } },
         },
       }),
       this.prisma.order.count({ where }),
@@ -75,6 +78,18 @@ export class AdminOrdersService {
         city: { select: { id: true, name: true, code: true } },
         product: { select: { id: true, name: true, skuCode: true, barcode69: true } },
         imageResource: { select: { id: true, url: true } },
+        fulfillmentWarehouse: {
+          select: {
+            id: true,
+            name: true,
+            contactName: true,
+            contactPhone: true,
+            address: true,
+            lng: true,
+            lat: true,
+            fulfillmentMode: true,
+          },
+        },
       },
     });
     if (!order) throw new NotFoundException('订单不存在');
@@ -96,29 +111,17 @@ export class AdminOrdersService {
     return this.detail(id);
   }
 
-  getShipDefaults() {
-    return {
-      provider: 'XFX',
-      providerLabel: '小飞侠',
-      fromName: this.config.get<string>('SHIP_FROM_NAME') || '杜康仓库',
-      fromMobile: this.config.get<string>('SHIP_FROM_MOBILE') || '13800000000',
-      fromAddress: this.config.get<string>('SHIP_FROM_ADDRESS') || '河南省郑州市金水区',
-      fromAddressDetail: this.config.get<string>('SHIP_FROM_ADDRESS_DETAIL') || '杜康酒业仓',
-      fromLng: Number(this.config.get<string>('SHIP_FROM_LNG') || 113.665),
-      fromLat: Number(this.config.get<string>('SHIP_FROM_LAT') || 34.757),
-      weight: 2,
-      payMode: '1',
-    };
-  }
-
   async shipOrder(id: bigint, dto: AdminShipOrderDto) {
     if (dto.provider !== 'XFX') {
       throw new BadRequestException('暂仅支持小飞侠配送');
     }
 
-    const order = await this.prisma.order.findUnique({
+    let order = await this.prisma.order.findUnique({
       where: { id },
-      include: { delivery: true },
+      include: {
+        delivery: true,
+        fulfillmentWarehouse: true,
+      },
     });
     if (!order) throw new NotFoundException('订单不存在');
 
@@ -129,7 +132,46 @@ export class AdminOrdersService {
       throw new BadRequestException('该订单已有运单号，请勿重复发货');
     }
 
-    const defaults = this.getShipDefaults();
+    if (dto.warehouseId) {
+      const warehouseId = BigInt(dto.warehouseId);
+      const warehouseRow = await this.prisma.cityWarehouse.findFirst({
+        where: { id: warehouseId, status: 'ACTIVE' },
+      });
+      if (!warehouseRow) {
+        throw new BadRequestException('仓库不存在或已停用');
+      }
+      if (order.fulfillmentWarehouseId !== warehouseId) {
+        await this.prisma.order.update({
+          where: { id },
+          data: { fulfillmentWarehouseId: warehouseId },
+        });
+        order = await this.prisma.order.findUniqueOrThrow({
+          where: { id },
+          include: { delivery: true, fulfillmentWarehouse: true },
+        });
+      }
+    }
+
+    const warehouse = order.fulfillmentWarehouse;
+    if (!warehouse) {
+      throw new BadRequestException('请先选择履约仓库');
+    }
+    const providerId =
+      order.delivery?.fulfillmentProviderId ??
+      warehouse?.fulfillmentProviderId ??
+      null;
+
+    let xfxConfig;
+    if (providerId) {
+      xfxConfig = await this.fulfillmentProviderService.resolveXiaofeixiaConfig(providerId);
+    } else {
+      xfxConfig = await this.fulfillmentProviderService.resolveDefaultXiaofeixiaConfig();
+      if (!xfxConfig) {
+        throw new BadRequestException('请先在仓配管理中注册并配置小飞侠承运商');
+      }
+    }
+
+    const defaults = this.getShipDefaults(warehouse);
     const shipmentDto: XiaofeixiaCreateShipmentDto = {
       outNumber: order.orderNo,
       fromName: dto.fromName || defaults.fromName,
@@ -149,13 +191,14 @@ export class AdminOrdersService {
       remark: dto.remark || `HQ发货 ${order.orderNo}`,
     };
 
-    const result = await this.xiaofeixiaService.createShipment(shipmentDto);
+    const result = await this.xiaofeixiaService.createShipment(shipmentDto, xfxConfig);
     if (!result.ok || !result.data) {
       throw new BadRequestException(result.error || '小飞侠创建运单失败');
     }
 
     const { providerShipmentId, trackingNumber } = result.data;
     const now = new Date();
+    const resolvedProviderId = providerId;
 
     await this.prisma.$transaction(async (tx) => {
       if (order.delivery) {
@@ -163,6 +206,7 @@ export class AdminOrdersService {
           where: { orderId: id },
           data: {
             provider: 'XFX',
+            fulfillmentProviderId: resolvedProviderId,
             trackingNo: trackingNumber,
             providerOrderNo: String(providerShipmentId),
             shippingAt: now,
@@ -173,6 +217,7 @@ export class AdminOrdersService {
           data: {
             orderId: id,
             provider: 'XFX',
+            fulfillmentProviderId: resolvedProviderId,
             trackingNo: trackingNumber,
             providerOrderNo: String(providerShipmentId),
             shippingAt: now,
@@ -185,6 +230,40 @@ export class AdminOrdersService {
     return this.detail(id);
   }
 
+  getShipDefaults(warehouse?: {
+    contactName: string;
+    contactPhone: string;
+    address: string;
+    name: string;
+    lng: { toNumber?: () => number } | number | null;
+    lat: { toNumber?: () => number } | number | null;
+  } | null) {
+    const lng =
+      warehouse?.lng != null
+        ? typeof warehouse.lng === 'object' && warehouse.lng && 'toNumber' in warehouse.lng
+          ? Number(warehouse.lng)
+          : Number(warehouse.lng)
+        : 113.665;
+    const lat =
+      warehouse?.lat != null
+        ? typeof warehouse.lat === 'object' && warehouse.lat && 'toNumber' in warehouse.lat
+          ? Number(warehouse.lat)
+          : Number(warehouse.lat)
+        : 34.757;
+    return {
+      provider: 'XFX',
+      providerLabel: '小飞侠',
+      fromName: warehouse?.contactName || '杜康仓库',
+      fromMobile: warehouse?.contactPhone || '13800000000',
+      fromAddress: warehouse?.address || '河南省郑州市金水区',
+      fromAddressDetail: warehouse?.name || '杜康酒业仓',
+      fromLng: lng,
+      fromLat: lat,
+      weight: 2,
+      payMode: '1',
+    };
+  }
+
   /** 总部传统快递填单（同城无仓 / 跨城） */
   async shipLogistics(id: bigint, dto: HqLogisticsShipDto) {
     await this.fulfillmentService.shipHqLogistics(id, dto);

server/dukang-api/src/modules/ops/admin-xiaofeixia.service.ts

@@ -1,5 +1,6 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { CourierConfigService } from '../../integrations/courier/courier.config';
+import type { XiaofeixiaConfig } from '../../integrations/courier/courier.config';
 import { CourierApiError } from '../../integrations/courier/courier.error';
 import { CourierService } from '../../integrations/courier/courier.service';
 import { CourierPayMode } from '../../integrations/courier/courier.types';
@@ -8,6 +9,7 @@ import type {
   CreateShipmentInput,
   ShipmentQuery,
 } from '../../integrations/courier/courier.types';
+import { FulfillmentProviderService } from '../fulfillment/fulfillment-provider.service';
 import type {
   XiaofeixiaBatchShipmentQueryDto,
   XiaofeixiaCheckCoverageDto,
@@ -27,48 +29,61 @@ export class AdminXiaofeixiaService {
   constructor(
     private readonly courier: CourierService,
     private readonly courierConfig: CourierConfigService,
+    private readonly fulfillmentProviderService: FulfillmentProviderService,
   ) {}
 
-  getConfig() {
-    const cfg = this.courierConfig.load();
-    const xfx = cfg.xiaofeixia;
+  async getConfig() {
+    const fromDb = await this.fulfillmentProviderService.resolveDefaultXiaofeixiaConfig();
+    const envCfg = this.courierConfig.load().xiaofeixia;
+    const xfx = fromDb ?? envCfg;
     return {
-      provider: cfg.provider,
+      provider: this.courierConfig.load().provider,
       activeProvider: this.courier.activeProvider,
+      source: fromDb ? 'fulfillment_provider' : 'env',
       apiUrl: xfx.apiUrl,
       appId: xfx.appId ?? null,
       mchId: xfx.mchId || null,
       mchIdMasked: xfx.mchId ? maskSecret(xfx.mchId) : null,
       hasApiKey: Boolean(xfx.apiKey),
       signType: xfx.signType,
-      ready: Boolean(xfx.mchId && xfx.apiKey),
+      ready: Boolean(xfx.mchId && xfx.apiKey && xfx.apiUrl),
+      hint: fromDb
+        ? '凭证来自仓配管理中启用的小飞侠承运商'
+        : '未在仓配管理配置，回退到环境变量（请迁移至仓配管理）',
     };
   }
 
   async estimateFreight(dto: XiaofeixiaEstimateFreightDto) {
-    return this.wrap(() => this.courier.estimateFreight(dto.weight));
+    const options = await this.callOptions();
+    return this.wrap(() => this.courier.estimateFreight(dto.weight, options));
   }
 
   async checkCoverage(dto: XiaofeixiaCheckCoverageDto) {
-    return this.wrap(() => this.courier.checkDeliveryCoverage(dto.toAddress));
+    const options = await this.callOptions();
+    return this.wrap(() => this.courier.checkDeliveryCoverage(dto.toAddress, options));
   }
 
-  async createShipment(dto: XiaofeixiaCreateShipmentDto) {
+  async createShipment(dto: XiaofeixiaCreateShipmentDto, xfxOverride?: XiaofeixiaConfig) {
     const input = this.mapCreateInput(dto);
-    return this.wrap(() => this.courier.createShipment(input));
+    const options = xfxOverride
+      ? { xiaofeixia: xfxOverride }
+      : await this.callOptions();
+    return this.wrap(() => this.courier.createShipment(input, options));
   }
 
   async cancelShipment(dto: XiaofeixiaShipmentQueryDto) {
     const query = this.mapShipmentQuery(dto);
+    const options = await this.callOptions();
     return this.wrap(async () => {
-      await this.courier.cancelShipment(query);
+      await this.courier.cancelShipment(query, options);
       return { cancelled: true };
     });
   }
 
   async getShipment(dto: XiaofeixiaShipmentQueryDto) {
     const query = this.mapShipmentQuery(dto);
-    return this.wrap(() => this.courier.getShipment(query));
+    const options = await this.callOptions();
+    return this.wrap(() => this.courier.getShipment(query, options));
   }
 
   async batchGetShipments(dto: XiaofeixiaBatchShipmentQueryDto) {
@@ -76,12 +91,19 @@ export class AdminXiaofeixiaService {
       trackingNumbers: dto.trackingNumbers?.filter(Boolean),
       outNumbers: dto.outNumbers?.filter(Boolean),
     };
-    return this.wrap(() => this.courier.batchGetShipments(query));
+    const options = await this.callOptions();
+    return this.wrap(() => this.courier.batchGetShipments(query, options));
   }
 
   async getTrack(dto: XiaofeixiaShipmentQueryDto) {
     const query = this.mapShipmentQuery(dto);
-    return this.wrap(() => this.courier.getTrack(query));
+    const options = await this.callOptions();
+    return this.wrap(() => this.courier.getTrack(query, options));
+  }
+
+  private async callOptions() {
+    const fromDb = await this.fulfillmentProviderService.resolveDefaultXiaofeixiaConfig();
+    return fromDb ? { xiaofeixia: fromDb } : undefined;
   }
 
   private mapShipmentQuery(dto: XiaofeixiaShipmentQueryDto): ShipmentQuery {

server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts

@@ -583,6 +583,16 @@ export class CreateFulfillmentProviderDto {
   @IsOptional()
   @IsString()
   capabilitiesJson?: string;
+
+  @IsOptional()
+  @IsObject()
+  xiaofeixiaConfig?: {
+    apiUrl?: string;
+    mchId?: string;
+    apiKey?: string;
+    signType?: 'MD5' | 'HMAC-SHA256';
+    appId?: string;
+  };
 }
 
 export class UpdateFulfillmentProviderDto {
@@ -605,6 +615,16 @@ export class UpdateFulfillmentProviderDto {
   @IsOptional()
   @IsString()
   capabilitiesJson?: string;
+
+  @IsOptional()
+  @IsObject()
+  xiaofeixiaConfig?: {
+    apiUrl?: string;
+    mchId?: string;
+    apiKey?: string;
+    signType?: 'MD5' | 'HMAC-SHA256';
+    appId?: string;
+  };
 }
 
 export class ManualShipOrderDto {
@@ -691,6 +711,11 @@ export class AdminShipOrderDto {
   @IsIn(['XFX'])
   provider: string;
 
+  /** 可选：指定/改派履约仓后再推仓配 */
+  @IsOptional()
+  @IsString()
+  warehouseId?: string;
+
   @IsOptional()
   @IsString()
   fromName?: string;

server/dukang-api/src/modules/ops/dto/admin-query.dto.ts

@@ -52,6 +52,10 @@ export class AdminOrdersQueryDto extends PaginationQueryDto {
   @IsString()
   userId?: string;
 
+  @IsOptional()
+  @IsString()
+  cityId?: string;
+
   @IsOptional()
   @IsString()
   receiverPhone?: string;

server/dukang-api/src/modules/settlement/settlement.controller.ts

@@ -9,6 +9,7 @@ import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
 import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
 import { PrismaService } from '../../common/prisma/prisma.module';
+import { PartnerCityService } from '../city-scope/partner-city.service';
 
 class UpdatePartnerMeDto {
   @IsOptional()
@@ -25,6 +26,11 @@ export class SettlementController {
   bills(@CurrentUser() user: AuthUser) {
     return this.settlementService.listPartnerBills(user.actorId);
   }
+
+  @Post('bills/:id/confirm')
+  confirm(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.settlementService.partnerConfirmBill(user.actorId, BigInt(id));
+  }
 }
 
 @Controller('shop/payouts')
@@ -193,6 +199,20 @@ export class AdminPartnerBillController {
   markPaid(@Param('id') id: string, @Body() body: { paymentRef?: string }) {
     return this.settlementService.markPartnerBillPaid(BigInt(id), body);
   }
+
+  @Post(':id/reject')
+  @HqOperation({
+    action: HqOperationAction.PARTNER_BILL_REJECT,
+    refType: 'PARTNER_BILL',
+    refIdParam: 'id',
+    includeBody: true,
+  })
+  reject(@Param('id') id: string, @Body() body: { reason?: string }) {
+    if (!body?.reason?.trim()) {
+      throw new BadRequestException('请填写驳回理由');
+    }
+    return this.settlementService.rejectPartnerBill(BigInt(id), body.reason);
+  }
 }
 
 @Controller('admin/winery-bills')
@@ -224,7 +244,10 @@ export class AdminWineryBillController {
 @Controller('partner/me')
 @UseGuards(JwtAuthGuard)
 export class PartnerMeController {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly partnerCityService: PartnerCityService,
+  ) {}
 
   @Get()
   async me(@CurrentUser() user: AuthUser) {
@@ -255,6 +278,7 @@ export class PartnerMeController {
         where: { id: account.parentAccountId },
       });
     }
+    const hasWarehouseAccess = await this.partnerCityService.hasManagedWarehouse(primary.id);
     return {
       id: account.id.toString(),
       name: account.name,
@@ -267,6 +291,10 @@ export class PartnerMeController {
       primaryName: primary.name,
       companyName: primary.companyName ?? undefined,
       hasWechat: !!account.wxOpenId,
+      wxNickname: account.wxNickname ?? undefined,
+      wxAvatarUrl: account.wxAvatarUrl ?? undefined,
+      managedWarehouseId: primary.managedWarehouseId?.toString() ?? null,
+      hasWarehouseAccess,
     };
   }
 }

server/dukang-api/src/modules/settlement/settlement.service.ts

@@ -529,11 +529,70 @@ export class SettlementService {
   async confirmPartnerBill(id: bigint) {
     const bill = await this.prisma.partnerBill.findUnique({ where: { id } });
     if (!bill) throw new NotFoundException('账单不存在');
-    if (bill.status !== 'DRAFT') throw new BadRequestException('仅草稿可确认');
+    if (bill.status !== 'DRAFT' && bill.status !== 'REJECTED') {
+      throw new BadRequestException('仅待确认或已驳回账单可确认');
+    }
 
     const updated = await this.prisma.partnerBill.update({
       where: { id },
-      data: { status: 'CONFIRMED', confirmedAt: new Date() },
+      data: {
+        status: 'CONFIRMED',
+        confirmedAt: new Date(),
+        rejectReason: null,
+      },
+    });
+
+    return serializeBigInt(updated);
+  }
+
+  /** 合伙人端：确认账单并申请打款（DRAFT/REJECTED → CONFIRMED） */
+  async partnerConfirmBill(partnerAccountId: bigint, billId: bigint) {
+    const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
+    const bill = await this.prisma.partnerBill.findUnique({ where: { id: billId } });
+    if (!bill || bill.partnerAccountId !== primary.id) {
+      throw new NotFoundException('账单不存在');
+    }
+    if (bill.status !== 'DRAFT' && bill.status !== 'REJECTED') {
+      throw new BadRequestException('当前账单不可再次申请打款');
+    }
+
+    const updated = await this.prisma.partnerBill.update({
+      where: { id: billId },
+      data: {
+        status: 'CONFIRMED',
+        confirmedAt: new Date(),
+        rejectReason: null,
+      },
+    });
+
+    this.analyticsService.trackPartnerOneSafe(partnerAccountId, 'PARTNER_H5', {
+      partnerAccountId: primary.id,
+      eventName: 'partner_bill_confirm',
+      refType: 'PARTNER_BILL',
+      refId: billId,
+      extraJson: { billNo: bill.billNo },
+    });
+
+    return serializeBigInt(updated);
+  }
+
+  async rejectPartnerBill(id: bigint, reason: string) {
+    const rejectReason = reason.trim();
+    if (!rejectReason) throw new BadRequestException('请填写驳回理由');
+    if (rejectReason.length > 500) throw new BadRequestException('驳回理由不能超过 500 字');
+
+    const bill = await this.prisma.partnerBill.findUnique({ where: { id } });
+    if (!bill) throw new NotFoundException('账单不存在');
+    if (bill.status !== 'CONFIRMED') {
+      throw new BadRequestException('仅待打款审核的账单可驳回');
+    }
+
+    const updated = await this.prisma.partnerBill.update({
+      where: { id },
+      data: {
+        status: 'REJECTED',
+        rejectReason,
+      },
     });
 
     return serializeBigInt(updated);
@@ -542,11 +601,11 @@ export class SettlementService {
   async markPartnerBillPaid(id: bigint, dto: { paymentRef?: string }) {
     const bill = await this.prisma.partnerBill.findUnique({ where: { id } });
     if (!bill) throw new NotFoundException('账单不存在');
-    if (bill.status !== 'CONFIRMED') throw new BadRequestException('仅已确认账单可标记打款');
+    if (bill.status !== 'CONFIRMED') throw new BadRequestException('仅待打款审核的账单可标记打款');
 
     const updated = await this.prisma.partnerBill.update({
       where: { id },
-      data: { status: 'PAID', paidAt: new Date() },
+      data: { status: 'PAID', paidAt: new Date(), rejectReason: null },
     });
 
     return serializeBigInt(updated);
@@ -577,6 +636,7 @@ export class SettlementService {
       '状态',
       '确认时间',
       '打款时间',
+      '驳回理由',
     ].join(',');
     const rows = bills.map((b) =>
       [
@@ -591,6 +651,7 @@ export class SettlementService {
         b.status,
         b.confirmedAt ? b.confirmedAt.toISOString().slice(0, 10) : '',
         b.paidAt ? b.paidAt.toISOString().slice(0, 10) : '',
+        csvEscape(b.rejectReason ?? ''),
       ].join(','),
     );
     return { csv: `\uFEFF${[header, ...rows].join('\n')}`, count: bills.length };

server/dukang-api/src/modules/trade/trade.service.ts

@@ -75,7 +75,6 @@ export class TradeService {
       city.localMinQty,
       city.crossMinQty,
     );
-    if (!check.ok) throw new BadRequestException(check.message);
 
     const unitPrice = Number(product.price);
     const productAmount = unitPrice * body.quantity;
@@ -96,6 +95,10 @@ export class TradeService {
       payAmount: productAmount,
       benefitAmount: benefitPerUnit * body.quantity,
       city: serializeBigInt(city),
+      /** 起购未满足时仍返回预览，供确认页改数量；下单接口仍会硬校验 */
+      quantityOk: check.ok,
+      quantityMessage: check.ok ? null : (check.message ?? null),
+      minQty: deliveryType === 'LOCAL' ? city.localMinQty : city.crossMinQty,
     };
   }
 
@@ -110,6 +113,9 @@ export class TradeService {
     req: Request,
   ) {
     const preview = await this.preview(userId, body);
+    if (preview.quantityOk === false) {
+      throw new BadRequestException(preview.quantityMessage || '购买数量不满足起购要求');
+    }
     const address = await this.prisma.userAddress.findFirst({
       where: { id: BigInt(body.addressId), userId },
     });
@@ -509,6 +515,7 @@ export class TradeService {
 
   async listPartnerOrders(partnerAccountId: bigint, page = 1, pageSize = 20) {
     const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
+    const hasWarehouseAccess = await this.partnerCityService.hasManagedWarehouse(primary.id);
     const where = await this.partnerCityService.buildPartnerOrderWhere(primary.id);
     const [list, total] = await Promise.all([
       this.prisma.order.findMany({
@@ -520,7 +527,14 @@ export class TradeService {
       }),
       this.prisma.order.count({ where }),
     ]);
-    return { list: serializeBigInt(list.map(mapOrderCompat)), total, page, pageSize };
+    return {
+      list: serializeBigInt(list.map(mapOrderCompat)),
+      total,
+      page,
+      pageSize,
+      hasWarehouseAccess,
+      message: hasWarehouseAccess ? undefined : '未配置仓库管理权限，购酒订单由总部履约',
+    };
   }
 
   async getPartnerOrder(partnerAccountId: bigint, orderId: bigint) {