Merge pull request 'v3.5.4' (#33) from dev into main

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/33

apps/admin-web/src/components/ProductSpecsEditor.tsx

@@ -1,11 +1,10 @@
 import { useMemo, useState } from 'react';
 import {
-  Button, Image, Input, InputNumber, Modal, Radio, Select, Space, Switch, Table, Typography, message,
+  Button, Input, InputNumber, Radio, Select, Space, Switch, Table, Typography, message,
 } from 'antd';
-import { EditOutlined, MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { request } from '../lib/api';
 import { PRODUCT_STATUS_LABELS } from '../lib/constants';
-import OssUpload from './OssUpload';
 
 type SpecValue = { id?: string; name: string; sortOrder?: number };
 type SpecAttr = { id?: string; name: string; sortOrder?: number; values: SpecValue[] };
@@ -25,7 +24,6 @@ type SkuRow = {
   isDefault: boolean;
   sortOrder?: number;
   specText?: string;
-  imageUrl?: string | null;
 };
 
 function cartesian(attrs: SpecAttr[]): string[][] {
@@ -75,7 +73,6 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
           saleUnit: s.saleUnit === 'BOX' ? 'BOX' : 'BOTTLE',
           bottlesPerUnit: s.bottlesPerUnit || (s.saleUnit === 'BOX' ? 6 : 1),
           isDefault: !!s.isDefault,
-          imageUrl: s.imageUrl ?? '',
         }))
       : [
           {
@@ -89,12 +86,10 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
             saleUnit: 'BOTTLE',
             bottlesPerUnit: 1,
             isDefault: true,
-            imageUrl: '',
           },
         ],
   );
   const [saving, setSaving] = useState(false);
-  const [editIndex, setEditIndex] = useState<number | null>(null);
 
   const combos = useMemo(() => cartesian(attrs.filter((a) => a.name.trim() && a.values.some((v) => v.name.trim()))), [attrs]);
 
@@ -116,21 +111,12 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
         bottlesPerUnit: 1,
         isDefault: i === 0,
         sortOrder: i,
-        imageUrl: '',
       };
     });
     if (next.length && !next.some((s) => s.isDefault)) next[0].isDefault = true;
     setSkus(next.length ? next : skus);
   }
 
-  function patchSku(index: number, patch: Partial<SkuRow>) {
-    setSkus((prev) => {
-      const next = [...prev];
-      next[index] = { ...next[index], ...patch };
-      return next;
-    });
-  }
-
   async function handleSave() {
     setSaving(true);
     try {
@@ -171,7 +157,8 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
       const payloadSkus = skus.map((s, i) => ({
         id: s.id,
         specValueIds: resolveIds(s.specValueIds ?? []),
-        barcode69: s.barcode69.trim(),
+        skuCode: s.skuCode,
+        barcode69: s.barcode69,
         price: s.price,
         benefitAmount: s.benefitAmount,
         status: s.status,
@@ -182,13 +169,10 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
         bottlesPerUnit: s.saleUnit === 'BOX' ? s.bottlesPerUnit || 6 : 1,
         isDefault: !!s.isDefault,
         sortOrder: i,
-        imageUrl: s.imageUrl?.trim() || null,
       }));
 
-      const barcodes = payloadSkus.map((row) => row.barcode69);
+      for (const row of payloadSkus) {
-      if (barcodes.some((b) => !b)) throw new Error('每个规格须填写独立 69 码');
+        if (!row.barcode69?.trim()) throw new Error('请填写全部 SKU 的 69 码');
-      if (new Set(barcodes).size !== barcodes.length) {
-        throw new Error('同一商品内 69 码不可重复，每个规格请填写不同 69 码');
       }
 
       await request(`/admin/products/${productId}/skus`, {
@@ -204,13 +188,10 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
     }
   }
 
-  const editing = editIndex != null ? skus[editIndex] : null;
-
   return (
     <div>
       <Typography.Paragraph type="secondary">
-        SKU 码由系统自动生成（DK 开头），无需填写。每个规格必须填写<strong>互不相同</strong>的 69 码，并可单独上传主图。
+        先配置销售规格轴（如「包装」），再生成 SKU 矩阵。未配置规格时仅保留默认一行 SKU，与基础信息价/码同步。
-        点「填写」在弹窗中编辑。先配置销售规格轴（如「包装」），再生成 SKU 矩阵。
       </Typography.Paragraph>
 
       <Typography.Title level={5}>规格轴</Typography.Title>
@@ -291,7 +272,7 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
         size="small"
         rowKey={(_, i) => String(i)}
         pagination={false}
-        scroll={{ x: 1240 }}
+        scroll={{ x: 1100 }}
         dataSource={skus}
         columns={[
           {
@@ -300,20 +281,10 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
             render: (_, row) => row.specText || (row.specValueIds?.length ? row.specValueIds.join(',') : '默认'),
           },
           {
-            title: 'SKU',
+            title: '69码',
-            width: 110,
+            width: 140,
-            render: (_, row) => (
-              <Typography.Text type="secondary">
-                {row.skuCode || '保存后自动生成'}
-              </Typography.Text>
-            ),
-          },
-          {
-            title: <span>69码 <Typography.Text type="danger">*</Typography.Text></span>,
-            width: 180,
             render: (_, row, index) => (
               <Input
-                placeholder="本规格独立 69 码"
                 value={row.barcode69}
                 onChange={(e) => {
                   const next = [...skus];
@@ -463,154 +434,12 @@ export default function ProductSpecsEditor({ productId, initialAttrs, initialSku
               />
             ),
           },
-          {
-            title: '主图',
-            width: 72,
-            render: (_, row) =>
-              row.imageUrl ? (
-                <Image src={row.imageUrl} width={40} height={40} style={{ objectFit: 'cover', borderRadius: 4 }} />
-              ) : (
-                <Typography.Text type="secondary">无</Typography.Text>
-              ),
-          },
-          {
-            title: '编辑',
-            width: 80,
-            fixed: 'right',
-            render: (_, row, index) => (
-              <Button type="link" size="small" icon={<EditOutlined />} onClick={() => setEditIndex(index)}>
-                填写
-              </Button>
-            ),
-          },
         ]}
       />
 
       <Button type="primary" loading={saving} style={{ marginTop: 16 }} onClick={() => void handleSave()}>
         保存规格与 SKU
       </Button>
-
-      <Modal
-        title={`编辑规格${editing?.specText ? ` · ${editing.specText}` : editing?.skuCode ? ` · ${editing.skuCode}` : ''}`}
-        open={editIndex != null}
-        onCancel={() => setEditIndex(null)}
-        onOk={() => setEditIndex(null)}
-        okText="完成"
-        width={560}
-        destroyOnClose
-      >
-        {editing && editIndex != null ? (
-          <Space direction="vertical" size={14} style={{ width: '100%' }}>
-            <div>
-              <Typography.Text type="secondary">SKU</Typography.Text>
-              <div>{editing.skuCode || '保存后自动生成'}</div>
-            </div>
-            <div>
-              <Typography.Text>69 码 <Typography.Text type="danger">*</Typography.Text></Typography.Text>
-              <Input
-                placeholder="本规格独立 69 码"
-                value={editing.barcode69}
-                onChange={(e) => patchSku(editIndex, { barcode69: e.target.value })}
-              />
-            </div>
-            <div>
-              <Typography.Text>主图</Typography.Text>
-              <OssUpload
-                bizType="COVER"
-                value={editing.imageUrl || ''}
-                onChange={(url) => patchSku(editIndex, { imageUrl: url })}
-              />
-            </div>
-            <Space>
-              <div>
-                <Typography.Text>售价</Typography.Text>
-                <InputNumber
-                  min={0}
-                  style={{ width: 140 }}
-                  value={editing.price}
-                  onChange={(v) => patchSku(editIndex, { price: Number(v) || 0 })}
-                />
-              </div>
-              <div>
-                <Typography.Text>权益</Typography.Text>
-                <InputNumber
-                  min={0}
-                  style={{ width: 140 }}
-                  value={editing.benefitAmount}
-                  onChange={(v) => patchSku(editIndex, { benefitAmount: v == null ? undefined : Number(v) })}
-                />
-              </div>
-            </Space>
-            <div>
-              <Typography.Text>状态</Typography.Text>
-              <Select
-                style={{ width: '100%' }}
-                value={editing.status}
-                options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))}
-                onChange={(status) => patchSku(editIndex, { status })}
-              />
-            </div>
-            <Space>
-              <Select
-                style={{ width: 100 }}
-                value={editing.saleUnit}
-                options={[
-                  { value: 'BOTTLE', label: '瓶' },
-                  { value: 'BOX', label: '箱' },
-                ]}
-                onChange={(saleUnit) =>
-                  patchSku(editIndex, {
-                    saleUnit,
-                    bottlesPerUnit: saleUnit === 'BOX' ? editing.bottlesPerUnit || 6 : 1,
-                  })
-                }
-              />
-              {editing.saleUnit === 'BOX' ? (
-                <InputNumber
-                  min={1}
-                  value={editing.bottlesPerUnit}
-                  onChange={(v) => patchSku(editIndex, { bottlesPerUnit: Number(v) || 6 })}
-                />
-              ) : null}
-            </Space>
-            <Space>
-              <Switch
-                checkedChildren="线上"
-                unCheckedChildren="线上"
-                checked={editing.allowOnlinePurchase}
-                onChange={(checked) =>
-                  patchSku(editIndex, {
-                    allowOnlinePurchase: checked,
-                    allowCrossCityDelivery: checked ? editing.allowCrossCityDelivery : false,
-                  })
-                }
-              />
-              <Switch
-                checkedChildren="跨城"
-                unCheckedChildren="跨城"
-                disabled={!editing.allowOnlinePurchase}
-                checked={editing.allowCrossCityDelivery}
-                onChange={(checked) => patchSku(editIndex, { allowCrossCityDelivery: checked })}
-              />
-              <Switch
-                checkedChildren="现场"
-                unCheckedChildren="现场"
-                checked={editing.allowOnSitePickup}
-                onChange={(checked) => patchSku(editIndex, { allowOnSitePickup: checked })}
-              />
-              <Switch
-                checkedChildren="默认"
-                unCheckedChildren="默认"
-                checked={editing.isDefault}
-                onChange={(checked) => {
-                  if (!checked) return;
-                  setSkus((prev) => prev.map((s, i) => ({ ...s, isDefault: i === editIndex })));
-                }}
-              />
-            </Space>
-          </Space>
-        ) : null}
-      </Modal>
     </div>
   );
 }

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

@@ -17,11 +17,9 @@ import {
 } from 'antd';
 import type { ColumnsType } from 'antd/es/table';
 import {
-  INVOICE_CATEGORY_LABELS,
   INVOICE_KIND_LABELS,
   INVOICE_STATUS_LABELS,
   INVOICE_TITLE_TYPE_LABELS,
-  type InvoiceCategory,
   type InvoiceKind,
   type InvoiceStatus,
   type InvoiceTitleType,
@@ -37,7 +35,6 @@ type Row = {
   orderNo?: string;
   titleType: InvoiceTitleType;
   invoiceKind: InvoiceKind;
-  invoiceCategory?: InvoiceCategory;
   titleName: string;
   status: InvoiceStatus;
   overdue?: boolean;
@@ -57,7 +54,6 @@ type CreateFormValues = {
   orderNo: string;
   titleType: InvoiceTitleType;
   invoiceKind: InvoiceKind;
-  invoiceCategory?: InvoiceCategory;
   titleName: string;
   taxNo?: string;
   addressPhone?: string;
@@ -160,7 +156,6 @@ export default function InvoicesPage() {
           orderNo: values.orderNo.trim(),
           titleType: values.titleType,
           invoiceKind: values.invoiceKind,
-          invoiceCategory: values.invoiceCategory,
           titleName: values.titleName.trim(),
           taxNo: values.taxNo?.trim() || undefined,
           addressPhone: values.addressPhone?.trim() || undefined,
@@ -191,17 +186,9 @@ export default function InvoicesPage() {
     },
     {
       title: '票种',
-      width: 140,
+      width: 120,
       render: (_, r) => INVOICE_KIND_LABELS[r.invoiceKind] ?? r.invoiceKind,
     },
-    {
-      title: '类型',
-      width: 88,
-      render: (_, r) =>
-        r.invoiceCategory
-          ? INVOICE_CATEGORY_LABELS[r.invoiceCategory] ?? r.invoiceCategory
-          : '—',
-    },
     { title: '名称', dataIndex: 'titleName', ellipsis: true },
     {
       title: '状态',
@@ -246,7 +233,6 @@ export default function InvoicesPage() {
             createForm.setFieldsValue({
               titleType: 'PERSONAL',
               invoiceKind: 'NORMAL',
-              invoiceCategory: 'LIQUOR',
             });
             setCreateOpen(true);
           }}
@@ -338,11 +324,6 @@ export default function InvoicesPage() {
             <Descriptions.Item label="发票类型">
               {INVOICE_KIND_LABELS[detail.invoiceKind]}
             </Descriptions.Item>
-            <Descriptions.Item label="类型">
-              {detail.invoiceCategory
-                ? INVOICE_CATEGORY_LABELS[detail.invoiceCategory]
-                : '—'}
-            </Descriptions.Item>
             <Descriptions.Item label="抬头名称">{detail.titleName}</Descriptions.Item>
             <Descriptions.Item label="税号">{detail.taxNo ?? '—'}</Descriptions.Item>
             <Descriptions.Item label="地址电话">{detail.addressPhone ?? '—'}</Descriptions.Item>
@@ -401,18 +382,6 @@ export default function InvoicesPage() {
               }}
             />
           </Form.Item>
-          <Form.Item
-            name="invoiceCategory"
-            label="类型"
-            rules={[{ required: true, message: '请选择类型' }]}
-          >
-            <Select
-              options={(Object.keys(INVOICE_CATEGORY_LABELS) as InvoiceCategory[]).map((k) => ({
-                value: k,
-                label: INVOICE_CATEGORY_LABELS[k],
-              }))}
-            />
-          </Form.Item>
           <Form.Item
             name="titleType"
             label="抬头类型"

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

@@ -21,22 +21,6 @@ type ProductDetailContentDto = {
   features?: Array<{ icon: string; title: string; desc: string }>;
 };
 
-type SkuListRow = {
-  id: string;
-  skuCode: string;
-  barcode69: string;
-  specText: string;
-  price: number;
-  benefitAmount: number;
-  status: string;
-  isDefault?: boolean;
-  allowOnSitePickup?: boolean;
-  allowOnlinePurchase?: boolean;
-  allowCrossCityDelivery?: boolean;
-  soldBottles?: number;
-  virtual?: boolean;
-};
-
 type Row = {
   id: string;
   skuCode: string;
@@ -46,15 +30,9 @@ type Row = {
   aromaType: string;
   spec: string;
   price: number;
-  priceMin?: number;
-  priceMax?: number;
-  soldBottles?: number;
   benefitAmount: number;
   status: string;
   sortOrder: number;
-  skuCount?: number;
-  specEnabled?: boolean;
-  skus?: SkuListRow[];
   allowOnSitePickup?: boolean;
   allowOnlinePurchase?: boolean;
   allowCrossCityDelivery?: boolean;
@@ -236,33 +214,7 @@ function VisibilityWhitelistFields({ form }: { form: FormInstance }) {
   );
 }
 
-function FulfillmentTags(row: {
+function BaseInfoFields({ mode, form }: { mode: 'create' | 'edit'; form: FormInstance }) {
-  allowOnlinePurchase?: boolean;
-  allowCrossCityDelivery?: boolean;
-  allowOnSitePickup?: boolean;
-}) {
-  return (
-    <Space size={[0, 4]} wrap>
-      {row.allowOnlinePurchase !== false ? <Tag color="blue">线上</Tag> : null}
-      {row.allowOnlinePurchase !== false && row.allowCrossCityDelivery !== false ? (
-        <Tag color="cyan">跨城</Tag>
-      ) : null}
-      {row.allowOnSitePickup ? <Tag color="green">现场</Tag> : null}
-      {row.allowOnlinePurchase === false && !row.allowOnSitePickup ? <Tag>无</Tag> : null}
-    </Space>
-  );
-}
-
-function BaseInfoFields({
-  mode,
-  form,
-  hideFulfillment,
-}: {
-  mode: 'create' | 'edit';
-  form: FormInstance;
-  /** 多规格商品：履约只在规格 SKU 上编辑 */
-  hideFulfillment?: boolean;
-}) {
   return (
     <>
       {mode === 'create' && (
@@ -270,13 +222,8 @@ function BaseInfoFields({
           <Form.Item label="SKU">
             <Input disabled placeholder="保存后自动生成" />
           </Form.Item>
-          <Form.Item
+          <Form.Item name="barcode69" label="69码" rules={[{ required: true }]}>
-            name="barcode69"
+            <Input />
-            label="69码"
-            rules={[{ required: true, message: '请填写默认规格 69 码' }]}
-            extra="默认规格的 69 码；若有多种规格，保存后请到「规格与 SKU」为每个规格分别填写不同 69 码"
-          >
-            <Input placeholder="默认规格 69 码" />
           </Form.Item>
           <Form.Item name="aromaType" label="香型" rules={[{ required: true }]}>
             <Select options={Object.entries(AROMA_TYPE_LABELS).map(([value, label]) => ({ value, label }))} />
@@ -304,12 +251,6 @@ function BaseInfoFields({
       <Form.Item name="sortOrder" label="排序">
         <InputNumber min={0} style={{ width: '100%' }} />
       </Form.Item>
-      {hideFulfillment ? (
-        <Typography.Paragraph type="secondary" style={{ marginBottom: 16 }}>
-          该商品有多种规格，履约（线上 / 跨城 / 现场）请到「规格与 SKU」中按规格设置。
-        </Typography.Paragraph>
-      ) : (
-        <>
       <Form.Item
         name="allowOnlinePurchase"
         label="允许线上购买"
@@ -343,8 +284,6 @@ function BaseInfoFields({
       <Form.Item name="allowOnSitePickup" label="允许现场取货" valuePropName="checked">
         <Switch checkedChildren="开" unCheckedChildren="关" />
       </Form.Item>
-        </>
-      )}
       <VisibilityWhitelistFields form={form} />
       <Form.Item name="coverUrl" label="封面">
         <OssUpload bizType="COVER" mediaType="IMAGE" />
@@ -388,35 +327,12 @@ export default function ProductsPage() {
   }
 
   const columns: ColumnsType<Row> = useMemo(() => [
+    { title: 'SKU', dataIndex: 'skuCode', width: 90 },
+    { title: '商品名', dataIndex: 'name', width: 180, ellipsis: true },
     { title: '香型', dataIndex: 'aromaType', width: 80, render: (v) => AROMA_TYPE_LABELS[v] || v },
-    { title: '品名', dataIndex: 'name', width: 200, ellipsis: true },
+    { title: '规格', dataIndex: 'spec', width: 120, ellipsis: true },
-    {
+    { title: '售价', dataIndex: 'price', width: 80, render: (v) => `¥${v}` },
-      title: '累计销售',
+    { title: '权益额', dataIndex: 'benefitAmount', width: 80, render: (v) => `¥${v}` },
-      dataIndex: 'soldBottles',
-      width: 110,
-      render: (v: number | undefined) => `累计 ${v ?? 0} 瓶`,
-    },
-    {
-      title: '售价',
-      key: 'priceRange',
-      width: 120,
-      render: (_, row) => {
-        const min = row.priceMin ?? row.price;
-        const max = row.priceMax ?? row.price;
-        if (min === max) return `¥${min}`;
-        return `¥${min} ~ ¥${max}`;
-      },
-    },
-    {
-      title: '规格数',
-      dataIndex: 'skuCount',
-      width: 80,
-      render: (v: number | undefined, row) => {
-        const real = v ?? 0;
-        if (real > 0) return real;
-        return row.skus?.some((s) => s.virtual) ? 1 : 0;
-      },
-    },
     { title: '状态', dataIndex: 'status', width: 80, render: (s) => (
       <Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
     ) },
@@ -427,7 +343,23 @@ export default function ProductsPage() {
       render: (v: boolean) =>
         v ? <Tag color="orange">限测</Tag> : <Tag>公开</Tag>,
     },
+    {
+      title: '履约',
+      key: 'fulfillment',
+      width: 160,
+      render: (_, row) => (
+        <Space size={[0, 4]} wrap>
+          {row.allowOnlinePurchase !== false ? <Tag color="blue">线上</Tag> : null}
+          {row.allowOnlinePurchase !== false && row.allowCrossCityDelivery !== false ? (
+            <Tag color="cyan">跨城</Tag>
+          ) : null}
+          {row.allowOnSitePickup ? <Tag color="green">现场</Tag> : null}
+          {row.allowOnlinePurchase === false && !row.allowOnSitePickup ? <Tag>无</Tag> : null}
+        </Space>
+      ),
+    },
     { title: '排序', dataIndex: 'sortOrder', width: 60 },
+    { title: '创建', dataIndex: 'createdAt', width: 160, render: fmtTime },
     {
       title: '操作', width: 120,
       render: (_, row) => (
@@ -440,7 +372,7 @@ export default function ProductsPage() {
           }}>编辑</Button>
           <Popconfirm
             title="确认删除该商品？"
-            description={`将永久删除「${row.name}」，此操作不可恢复。`}
+            description={`将永久删除「${row.name}」（${row.skuCode}），此操作不可恢复。`}
             okText="确认删除"
             cancelText="取消"
             okButtonProps={{ danger: true }}
@@ -453,46 +385,6 @@ export default function ProductsPage() {
     },
   ], [detail, editForm]);
 
-  const skuColumns: ColumnsType<SkuListRow> = useMemo(() => [
-    {
-      title: '规格',
-      dataIndex: 'specText',
-      width: 140,
-      ellipsis: true,
-      render: (v: string, row) => (
-        <Space size={4}>
-          <span>{v || '默认'}</span>
-          {row.isDefault ? <Tag color="blue">默认</Tag> : null}
-          {row.virtual ? <Tag>未建SKU</Tag> : null}
-        </Space>
-      ),
-    },
-    { title: 'SKU', dataIndex: 'skuCode', width: 110 },
-    { title: '69码', dataIndex: 'barcode69', width: 160, ellipsis: true },
-    { title: '售价', dataIndex: 'price', width: 90, render: (v) => `¥${v}` },
-    { title: '权益额', dataIndex: 'benefitAmount', width: 90, render: (v) => `¥${v}` },
-    {
-      title: '累计销售',
-      dataIndex: 'soldBottles',
-      width: 100,
-      render: (v: number | undefined) => `${v ?? 0} 瓶`,
-    },
-    {
-      title: '履约',
-      key: 'fulfillment',
-      width: 160,
-      render: (_, row) => <FulfillmentTags {...row} />,
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 90,
-      render: (s) => (
-        <Tag color={s === 'ON_SALE' ? 'green' : undefined}>{PRODUCT_STATUS_LABELS[s] || s}</Tag>
-      ),
-    },
-  ], []);
-
   return (
     <div>
       <Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
@@ -500,9 +392,7 @@ export default function ProductsPage() {
         <Button type="primary" onClick={() => setCreateOpen(true)}>新建商品</Button>
       </Space>
       <Form form={form} layout="inline" style={{ marginBottom: 16 }} onFinish={(v) => { setFilters(v); setPage(1); }}>
-        <Form.Item name="name" label="名称">
+        <Form.Item name="name" label="名称"><Input allowClear /></Form.Item>
-          <Input allowClear placeholder="名称 / SKU / 69 码" style={{ width: 200 }} />
-        </Form.Item>
         <Form.Item name="status" label="状态">
           <Select allowClear style={{ width: 110 }} options={Object.entries(PRODUCT_STATUS_LABELS).map(([value, label]) => ({ value, label }))} />
         </Form.Item>
@@ -511,46 +401,17 @@ export default function ProductsPage() {
         </Form.Item>
         <Form.Item><Button type="primary" htmlType="submit">查询</Button></Form.Item>
       </Form>
-      <Table
+      <Table rowKey="id" className="admin-table-nowrap" loading={loading} columns={columns} dataSource={data?.items ?? []} scroll={{ x: 1320 }}
-        rowKey="id"
+        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }} />
-        className="admin-table-nowrap"
+      <Drawer title="编辑商品" width={720} open={drawerOpen} onClose={() => setDrawerOpen(false)}
-        loading={loading}
-        columns={columns}
-        dataSource={data?.items ?? []}
-        scroll={{ x: 1080 }}
-        expandable={{
-          rowExpandable: () => true,
-          expandedRowRender: (row) => (
-            <div style={{ margin: '-8px -8px -8px 24px', padding: 12, background: '#f5f5f5', borderRadius: 6 }}>
-              <Table
-                size="small"
-                rowKey="id"
-                pagination={false}
-                columns={skuColumns}
-                dataSource={row.skus ?? []}
-                scroll={{ x: 980 }}
-                style={{ background: 'transparent' }}
-              />
-            </div>
-          ),
-        }}
-        pagination={{ current: page, pageSize, total: data?.total ?? 0, showSizeChanger: true, onChange: (p, ps) => { setPage(p); setPageSize(ps); } }}
-      />
-      <Drawer title="编辑商品" width={1100} open={drawerOpen} onClose={() => setDrawerOpen(false)}
         extra={detail && (
           <Button type="primary" onClick={async () => {
             const v = await editForm.validateFields();
-            const multiSku = Array.isArray(detail.skus) && (detail.skus as unknown[]).length > 1;
+            if (!v.allowOnlinePurchase && !v.allowOnSitePickup) {
-            if (!multiSku && !v.allowOnlinePurchase && !v.allowOnSitePickup) {
               message.error('请至少勾选「允许线上购买」或「允许现场取货」之一');
               return;
             }
             const payload = buildProductPayload(v);
-            if (multiSku) {
-              delete (payload as { allowOnlinePurchase?: boolean }).allowOnlinePurchase;
-              delete (payload as { allowCrossCityDelivery?: boolean }).allowCrossCityDelivery;
-              delete (payload as { allowOnSitePickup?: boolean }).allowOnSitePickup;
-            }
             await request(`/admin/products/${detail.id}`, { method: 'PUT', body: JSON.stringify(payload) });
             message.success('已保存');
             setDrawerOpen(false);
@@ -560,24 +421,13 @@ export default function ProductsPage() {
         {detail && (
           <>
             <Descriptions column={1} bordered size="small" style={{ marginBottom: 16 }}>
-              <Descriptions.Item label="默认 SKU">{String(detail.skuCode)}（系统生成）</Descriptions.Item>
+              <Descriptions.Item label="SKU">{String(detail.skuCode)}</Descriptions.Item>
-              <Descriptions.Item label="默认 69 码">{String(detail.barcode69)}</Descriptions.Item>
+              <Descriptions.Item label="69码">{String(detail.barcode69)}</Descriptions.Item>
               <Descriptions.Item label="香型">{AROMA_TYPE_LABELS[String(detail.aromaType)] || String(detail.aromaType)}</Descriptions.Item>
-              <Descriptions.Item label="创建时间">{fmtTime(String(detail.createdAt ?? ''))}</Descriptions.Item>
             </Descriptions>
             <Form form={editForm} layout="vertical">
               <Tabs items={[
-                {
+                { key: 'base', label: '基础信息', children: <BaseInfoFields mode="edit" form={editForm} /> },
-                  key: 'base',
-                  label: '基础信息',
-                  children: (
-                    <BaseInfoFields
-                      mode="edit"
-                      form={editForm}
-                      hideFulfillment={Array.isArray(detail.skus) && (detail.skus as unknown[]).length > 1}
-                    />
-                  ),
-                },
                 {
                   key: 'detail',
                   label: '详情页',

apps/mini-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dukang/mini-user",
-  "version": "3.5.4",
+  "version": "3.4.15",
   "private": true,
   "description": "杜康好客 · C 端用户微信小程序（Taro）",
   "scripts": {

apps/mini-user/src/lib/client-version.ts

@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro';
 import { fetchClientConfig } from './pay-wechat';
 
 /** 与 package.json version 同步，供服务端 minClientVersion 比对 */
-export const APP_VERSION = '3.5.4';
+export const APP_VERSION = '3.4.15';
 
 export const APP_VERSION_LABEL = `v${APP_VERSION}`;
 

apps/mini-user/src/pages/invoice-apply/index.tsx

@@ -7,9 +7,9 @@ import SubPageHeader from '../../components/SubPageHeader';
 import { request, toast } from '../../lib/api';
 import { usePageView } from '../../lib/usePageView';
 import {
-  INVOICE_CATEGORY_LABELS,
+  INVOICE_KIND_LABELS,
   INVOICE_TITLE_TYPE_LABELS,
-  type InvoiceCategory,
+  type InvoiceKind,
   type UserInvoiceTitleDto,
 } from '@dukang/shared-types';
 
@@ -42,8 +42,7 @@ export default function InvoiceApplyPage() {
 
   const [titles, setTitles] = useState<UserInvoiceTitleDto[]>([]);
   const [selectedId, setSelectedId] = useState('');
-  const [invoiceCategory, setInvoiceCategory] = useState<InvoiceCategory>('LIQUOR');
+  const [invoiceKind, setInvoiceKind] = useState<InvoiceKind>('NORMAL');
-  const [remark, setRemark] = useState('');
   const [emailOverride, setEmailOverride] = useState('');
   const [phoneOverride, setPhoneOverride] = useState('');
   const [loading, setLoading] = useState(true);
@@ -104,17 +103,19 @@ export default function InvoiceApplyPage() {
       toast('请填写联系电话');
       return;
     }
+    if (invoiceKind === 'SPECIAL' && selected.titleType !== 'ENTERPRISE') {
+      toast('专用发票仅支持企业抬头');
+      return;
+    }
     setSubmitting(true);
     try {
       await request(`/trade/orders/${orderId}/invoices`, {
         method: 'POST',
         data: {
           titleId: selectedId,
-          invoiceKind: 'NORMAL',
+          invoiceKind,
-          invoiceCategory,
           email,
           phone,
-          remark: remark.trim() || undefined,
         },
       });
       toast('发票申请已提交', 'success');
@@ -191,26 +192,20 @@ export default function InvoiceApplyPage() {
         ) : null}
 
         {canApply ? (
-          <>
           <View className="invoice-title-field" style={{ marginBottom: 16 }}>
             <Text className="invoice-title-label">发票类型</Text>
-              <Text className="invoice-kind-static">增值税普通发票</Text>
-            </View>
-            <View className="invoice-title-field" style={{ marginBottom: 16 }}>
-              <Text className="invoice-title-label">类型</Text>
             <View className="invoice-title-type-row">
-                {(['LIQUOR', 'CATERING'] as InvoiceCategory[]).map((k) => (
+              {(['NORMAL', 'SPECIAL'] as InvoiceKind[]).map((k) => (
                 <Text
                   key={k}
-                    className={`invoice-title-type-chip${invoiceCategory === k ? ' active' : ''}`}
+                  className={`invoice-title-type-chip${invoiceKind === k ? ' active' : ''}`}
-                    onClick={() => setInvoiceCategory(k)}
+                  onClick={() => setInvoiceKind(k)}
                 >
-                    {INVOICE_CATEGORY_LABELS[k]}
+                  {INVOICE_KIND_LABELS[k]}
                 </Text>
               ))}
             </View>
           </View>
-          </>
         ) : null}
 
         {canApply ? (
@@ -263,11 +258,7 @@ export default function InvoiceApplyPage() {
 
         {canApply && selected && !selected.email ? (
           <View className="invoice-title-field" style={{ marginTop: 16 }}>
-            <Text className="invoice-title-label">
+            <Text className="invoice-title-label">接收邮箱</Text>
-              <Text className="invoice-title-star">*</Text>
-              接收邮箱
-              <Text className="invoice-title-label-hint">必填</Text>
-            </Text>
             <Input
               className="invoice-title-input"
               placeholder="电子发票将发送至此邮箱"
@@ -288,19 +279,6 @@ export default function InvoiceApplyPage() {
             />
           </View>
         ) : null}
-
-        {canApply ? (
-          <View className="invoice-title-field" style={{ marginTop: 16 }}>
-            <Text className="invoice-title-label">备注</Text>
-            <Input
-              className="invoice-title-input"
-              maxlength={200}
-              placeholder="选填，将显示在发票申请备注中"
-              value={remark}
-              onInput={(e) => setRemark(e.detail.value)}
-            />
-          </View>
-        ) : null}
       </View>
 
       {canApply && titles.length > 0 ? (

apps/mini-user/src/pages/invoice-titles/index.tsx

@@ -26,24 +26,6 @@ const ACTION_ICONS = {
 
 type EditDraft = UpsertInvoiceTitleRequest & { id?: string };
 
-function FieldLabel({
-  children,
-  required,
-  hint,
-}: {
-  children: string;
-  required?: boolean;
-  hint?: string;
-}) {
-  return (
-    <Text className="invoice-title-label">
-      {required ? <Text className="invoice-title-star">*</Text> : null}
-      {children}
-      {hint ? <Text className="invoice-title-label-hint">{hint}</Text> : null}
-    </Text>
-  );
-}
-
 function TitleActionIcon({
   kind,
   label,
@@ -138,15 +120,6 @@ export default function InvoiceTitlesPage() {
       toast('企业抬头须填写税号');
       return;
     }
-    const email = draft.email?.trim() || '';
-    if (!email) {
-      toast('请填写接收邮箱（必填）');
-      return;
-    }
-    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-      toast('邮箱格式不正确');
-      return;
-    }
     setSaving(true);
     try {
       const payload: UpsertInvoiceTitleRequest = {
@@ -179,10 +152,6 @@ export default function InvoiceTitlesPage() {
   }
 
   async function setDefault(t: UserInvoiceTitleDto) {
-    if (!t.email?.trim()) {
-      toast('请先补全接收邮箱后再设为默认');
-      return;
-    }
     try {
       await request(`/trade/invoice-titles/${t.id}`, {
         method: 'PUT',
@@ -272,7 +241,7 @@ export default function InvoiceTitlesPage() {
             </Text>
 
             <View className="invoice-title-field">
-              <FieldLabel required>抬头类型</FieldLabel>
+              <Text className="invoice-title-label">抬头类型</Text>
               <View className="invoice-title-type-row">
                 {(['PERSONAL', 'ENTERPRISE'] as InvoiceTitleType[]).map((tp) => (
                   <Text
@@ -289,7 +258,7 @@ export default function InvoiceTitlesPage() {
             </View>
 
             <View className="invoice-title-field">
-              <FieldLabel required>抬头名称</FieldLabel>
+              <Text className="invoice-title-label">抬头名称</Text>
               <Input
                 className="invoice-title-input"
                 maxlength={128}
@@ -301,7 +270,7 @@ export default function InvoiceTitlesPage() {
 
             {draft.titleType === 'ENTERPRISE' ? (
               <View className="invoice-title-field">
-                <FieldLabel required>税号</FieldLabel>
+                <Text className="invoice-title-label">税号</Text>
                 <Input
                   className="invoice-title-input"
                   maxlength={32}
@@ -313,13 +282,11 @@ export default function InvoiceTitlesPage() {
             ) : null}
 
             <View className="invoice-title-field">
-              <FieldLabel required hint="必填，电子发票将发送至此">
+              <Text className="invoice-title-label">接收邮箱</Text>
-                接收邮箱
-              </FieldLabel>
               <Input
                 className="invoice-title-input"
                 maxlength={128}
-                placeholder="请填写邮箱（必填）"
+                placeholder="电子发票将发送至此邮箱"
                 value={draft.email || ''}
                 onInput={(e) => setDraft({ ...draft, email: e.detail.value })}
               />
@@ -344,7 +311,7 @@ export default function InvoiceTitlesPage() {
                   <Input
                     className="invoice-title-input"
                     maxlength={256}
-                    placeholder="选填"
+                    placeholder="专用发票需要，选填"
                     value={draft.addressPhone || ''}
                     onInput={(e) => setDraft({ ...draft, addressPhone: e.detail.value })}
                   />
@@ -354,7 +321,7 @@ export default function InvoiceTitlesPage() {
                   <Input
                     className="invoice-title-input"
                     maxlength={256}
-                    placeholder="选填"
+                    placeholder="专用发票需要，选填"
                     value={draft.bankAccount || ''}
                     onInput={(e) => setDraft({ ...draft, bankAccount: e.detail.value })}
                   />

apps/mini-user/src/pages/pay/index.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import { View, Text, Image } from '@tarojs/components';
+import { View, Text } from '@tarojs/components';
 import '../../styles/order.css';
 import Taro, { useDidShow, useRouter } from '@tarojs/taro';
 import PageShell from '../../components/PageShell';
@@ -19,13 +19,13 @@ import { applyWechatLoginResult } from '../../lib/wechat-auth';
 import { isWechatEnv } from '../../lib/weixin';
 import { goLogin } from '../../lib/auth-nav';
 import { request, toast } from '../../lib/api';
-import payLogo from '../../assets/logo2.png';
 
 export default function PayPage() {
   const router = useRouter();
   const orderId = router.params.orderId ?? '';
   const [loading, setLoading] = useState(false);
   const [authLoading, setAuthLoading] = useState(false);
+  const [mockMode, setMockMode] = useState(true);
   const [needsWechatAuth, setNeedsWechatAuth] = useState(false);
   const [msg, setMsg] = useState('');
   const [orderNo, setOrderNo] = useState('');
@@ -39,6 +39,7 @@ export default function PayPage() {
   const refreshPayReadiness = useCallback(async () => {
     try {
       const [config, profile] = await Promise.all([fetchClientConfig(), fetchUserProfile()]);
+      setMockMode(config.mockPay);
       setNeedsWechatAuth(needsWechatAuthForPay(config, profile));
       return profile;
     } catch {
@@ -173,7 +174,7 @@ export default function PayPage() {
       <View className="sub-page-body">
         <View className="pay-status">
           <View className="pay-status-icon">
-            <Image className="pay-status-brand" src={payLogo} mode="aspectFit" />
+            <Text>¥</Text>
           </View>
           <Text className="pay-status-title">
             {needsWechatAuth ? '需完成微信授权' : '待支付'}
@@ -203,6 +204,12 @@ export default function PayPage() {
             <Text className="order-row-label">支付方式</Text>
             <Text className="order-row-value">微信支付</Text>
           </View>
+          <View className="order-row">
+            <Text className="order-row-label">说明</Text>
+            <Text className="order-row-value">
+              {mockMode ? 'Mock 模式由服务端直接标记已付款' : '将调起微信收银台'}
+            </Text>
+          </View>
         </View>
         {msg ? (
           <Text className="pay-wechat-auth-msg" style={{ marginTop: 12 }}>

apps/mini-user/src/pages/product-detail/index.tsx

@@ -165,12 +165,6 @@ export default function ProductDetailPage() {
         allowOnSitePickup: activeSku.allowOnSitePickup,
       }
     : product;
-  const carouselImages = (() => {
-    const base = getProductCarouselImages(product);
-    const skuImg = activeSku?.imageUrl?.trim();
-    if (!skuImg) return base;
-    return [skuImg, ...base.filter((url) => url !== skuImg)];
-  })();
 
   const sharePayload = useMemo(
     () =>
@@ -178,9 +172,9 @@ export default function ProductDetailPage() {
         path: `/pages/product-detail/index?id=${productId}`,
         dynamicTitle: product?.name,
         dynamicDesc: product?.subtitle,
-        dynamicImageUrl: (activeSku?.imageUrl?.trim() || (product ? getProductMainImage(product) : undefined)),
+        dynamicImageUrl: product ? getProductMainImage(product) : undefined,
       }),
-    [product, productId, activeSku],
+    [product, productId],
   );
 
   useShareAppMessage(() => toWeappShareMessage(sharePayload));
@@ -255,6 +249,7 @@ export default function ProductDetailPage() {
 
   const allowOnline = canBuyOnline(fulfillment ?? {});
   const allowOnSite = canPickupOnSite(fulfillment ?? {});
+  const carouselImages = getProductCarouselImages(product);
   const detailImages = getProductDetailImages(product);
   const detail = product.detailContent ?? {};
   const features = detail.features ?? [];

apps/mini-user/src/pages/store-detail/index.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { View, Text, Image, ScrollView } from '@tarojs/components';
+import { View, Text, Image } from '@tarojs/components';
 import '../../styles/store-detail.css';
 import Taro, {
   useDidShow,
@@ -444,19 +444,17 @@ export default function StoreDetailPage() {
         </View>
       ) : null}
 
-      {benefitRule ? (
-        <View className="store-detail-section">
-          <Text className="store-detail-section-title store-detail-section-title--rule">使用规则</Text>
-          <Text className="store-detail-intro">{benefitRule}</Text>
-        </View>
-      ) : null}
-
       {intro ? (
         <View className="store-detail-section">
           <Text className="store-detail-section-title">门店详情</Text>
-          <ScrollView className="store-detail-intro-scroll" scrollY showScrollbar>
           <Text className="store-detail-intro">{intro}</Text>
-          </ScrollView>
+        </View>
+      ) : null}
+
+      {benefitRule ? (
+        <View className="store-detail-section">
+          <Text className="store-detail-section-title">好客权益使用规则</Text>
+          <Text className="store-detail-intro">{benefitRule}</Text>
         </View>
       ) : null}
 

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

@@ -153,30 +153,6 @@
   margin-bottom: 6px;
 }
 
-.invoice-title-star {
-  color: #c62828;
-  margin-right: 2px;
-  font-weight: 600;
-}
-
-.invoice-title-label-hint {
-  margin-left: 6px;
-  font-size: 12px;
-  color: #c62828;
-  font-weight: 500;
-}
-
-.invoice-kind-static {
-  display: block;
-  font-size: 15px;
-  color: var(--color-on-surface, #1a1a1a);
-  line-height: 44px;
-  padding: 0 12px;
-  background: var(--color-surface, #fafafa);
-  border: 1px solid var(--color-outline, #ddd);
-  border-radius: 8px;
-}
-
 .invoice-title-input {
   width: 100%;
   height: 44px;

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

@@ -488,20 +488,16 @@
 }
 
 .pay-status-icon {
-  width: 88px;
+  width: 72px;
-  height: 88px;
+  height: 72px;
   border-radius: 50%;
-  background: #f7f4ee;
+  background: rgba(166, 29, 36, 0.08);
+  color: var(--color-heritage-red);
+  font-size: 36px;
   display: flex;
   align-items: center;
   justify-content: center;
   margin: 0 auto 16px;
-  overflow: hidden;
-}
-
-.pay-status-brand {
-  width: 72px;
-  height: 72px;
 }
 
 .pay-status-title {

apps/mini-user/src/styles/product-detail.css

@@ -130,7 +130,6 @@
 
 .product-detail-promo {
   position: relative;
-  margin-top: 8px;
   padding: 16px;
   border-radius: var(--radius-lg);
   background: linear-gradient(135deg, #fff9e6 0%, #fff0c2 100%);
@@ -378,7 +377,7 @@
 }
 
 .product-detail-specs {
-  margin: 16px 0 28px;
+  margin: 12px 0 4px;
   display: flex;
   flex-direction: column;
   gap: 12px;

apps/mini-user/src/styles/store-detail.css

@@ -211,17 +211,6 @@
   color: var(--color-on-surface);
 }
 
-.store-detail-section-title--rule {
-  color: var(--color-heritage-red, #a61d24);
-}
-
-.store-detail-intro-scroll {
-  max-height: 168px;
-  height: 168px;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
-}
-
 .store-detail-env-grid {
   display: flex;
   flex-direction: column;

docs/杜康好客-v3.5.4-开发文档.md

@@ -10,51 +10,26 @@
 | 1 | 数据模型 | `common_product_item` 升级为 SPU；新增 `spec_attr` / `spec_value` / `sku` / `sku_spec`；订单快照 `sku_id` / `sale_unit` / `bottles_per_unit` |
 | 2 | 存量迁移 | 每商品 1 个默认瓶装 SKU；SQL：`prisma/migrate-product-sku-v354.sql`；脚本：`prisma/backfill-product-skus.ts` |
 | 3 | Catalog | 列表附加 `specEnabled`/`saleUnit`；详情附加 `specAttrs`/`skus`/`defaultSkuId`；旧字段拍平保留 |
-| 4 | Trade | preview/create 可选 `skuId`；无 SKU 回落 SPU；有可售 SKU 用默认/唯一 |
+| 4 | Trade | preview/create 可选 `skuId`；单可售 SKU 自动回落；起购按瓶当量 |
-| 5 | Admin | `PUT /admin/products/:id/specs`、`PUT .../skus`；商品抽屉加宽；规格弹窗填写；每规格主图 |
+| 5 | Admin | `PUT /admin/products/:id/specs`、`PUT .../skus`；商品抽屉「规格与 SKU」 |
-| 6 | mini-user | 详情规格 chips；选规格切主图；确认页带 `skuId`；箱装数量文案 |
+| 6 | mini-user | 详情规格 chips；确认页带 `skuId`；箱装数量文案 |
 | 7 | 代下单 | HQ / 合伙人可选规格 SKU |
 | 8 | 权益文案 | 「好客权益券」→「好客权益」；首页角标「享{amount}好客权益」（去掉门店 icon） |
-| 9 | SKU 码 | 系统生成 `DK` + 6 位数字，后台不可填；每规格独立 69 码 |
-| 10 | 规格主图 | `common_product_sku.image_url` 可选；空则 C 端回落商品封面 |
 
-**不做**：库存、把现有酒祖 10/15/20 合并为一个 SPU。
+**不做**：SKU 规格图、库存、把现有酒祖 10/15/20 合并为一个 SPU。
 
 ## 兼容规则（线上）
 
 - 不改 `/api/v1` 前缀；**只增字段，不删旧字段语义**。
-- 旧客户端不传 `skuId`：
+- 旧客户端不传 `skuId`：若该 SPU **恰好 1 个可售 SKU** → 自动使用（现网行为）；多个可售 → `400 请选择规格`。
-  - 有 ≥1 个可售 SKU → 用默认（或第一个）可售 SKU
+- 旧 admin `PUT /admin/products/:id` 不传规格时：仅同步**唯一**默认 SKU（多规格时不同步，防误改）。
-  - **没有任何可售 SKU（未回填）→ 回落 SPU 字段，照常下单**（禁止再报「商品暂无可售规格」）
-- 传入 `skuId`（新客户端选规格）→ 按该 SKU 校验。
-- 旧 admin `PUT /admin/products/:id` 不传规格时：仅同步**唯一**默认 SKU（多规格时不同步，防误改）；不同步覆盖已生成的 DK 码。
 - SPU 上 `sku_code` / `barcode_69` 去掉唯一约束，唯一下沉到 `common_product_sku`；SPU 列保留为默认 SKU 冗余。
-- 订单 `sku_id` 可空；无规格快照走商品 69 码 / 价格。
 
-## 发版一并执行
+## 发版顺序
 
-按顺序在**目标环境库**执行（先测试后生产）。本机 `npx ts-node …` 只改本地 `.env` 库，不会自动打线上。
+1. API + DB 迁移（每商品仅默认 SKU）。**此时不要给任何商品加第二 SKU。**
-
+2. 发布新 mini-user + admin 规格页 + 代下单 SKU 选择。
-1. **规格表** `server/dukang-api/prisma/migrate-product-sku-v354.sql`  
+3. 运营再配置「单瓶 / 整箱」等第二规格。
-   建 spec/sku 表，订单加 `sku_id` / `sale_unit` / `bottles_per_unit`。
-2. **回填默认 SKU**  
-   `cd server/dukang-api && npx ts-node prisma/backfill-product-skus.ts`  
-   尚无 SKU 的商品各建 1 条默认瓶装 SKU（码用 DK）。
-3. **SKU 主图列** `server/dukang-api/prisma/migrate-sku-image.sql`  
-   ```sql
-   ALTER TABLE `common_product_sku`
-     ADD COLUMN `image_url` VARCHAR(512) NULL AFTER `sort_order`;
-   ```
-4. **SKU 码改 DK**（生产须在服务器用 `.env.production` 的 `DATABASE_URL`）  
-   `npx dotenv -e .env.production -- npx ts-node prisma/rewrite-sku-codes-dk.ts`  
-   已是 `DK`+数字的不动；`JZ-10` / `QX-001` 等会改。**不改 69 码、订单、价格。**
-5. **发票品类列**（同批次）`server/dukang-api/prisma/migrate-invoice-category.sql`  
-   ```sql
-   ALTER TABLE `user_invoice`
-     ADD COLUMN `invoice_category` VARCHAR(16) NOT NULL DEFAULT 'LIQUOR' AFTER `invoice_kind`;
-   ```
-6. 发布 API + mini-user + admin-web。  
-   **此时不要给商品加第二规格**，等新小程序上线后再配「单瓶 / 整箱」。
 
 ## 起购与物流
 
@@ -65,37 +40,23 @@
 ## 关键表摘要
 
 - `common_product_spec_attr` / `common_product_spec_value`
-- `common_product_sku`（`sale_unit`=`BOTTLE|BOX`，`bottles_per_unit`，`image_url` 可选）
+- `common_product_sku`（`sale_unit`=`BOTTLE|BOX`，`bottles_per_unit`）
 - `common_product_sku_spec`
 - `user_order.sku_id` / `sale_unit` / `bottles_per_unit`
-- `user_invoice.invoice_category`：`LIQUOR` 酒水类 / `CATERING` 餐饮类；票种 C 端固定增值税普通发票
 
-## SKU 码与 69 码
+## 权益文案（mini-user）
-
-- SKU 码：服务端生成 `DK000001` 起，后台只展示。
-- 每个规格必须填写**互不相同**的 69 码（全局不可与其它商品 SKU 冲突）。
-- 总部「规格与 SKU」点「填写」弹窗编辑 69 码 / 价 / 履约 / 主图。
-
-## 权益与小程序 UI（同批次）
 
 | 位置 | 变更 |
 |------|------|
-| 门店详情等 | 「好客权益券」→「好客权益」 |
+| 门店详情等 | 「好客权益券」→「好客权益」（如「好客权益使用规则」） |
-| 首页商品角标 `CouponBadge` | 纯文案 **「享{amount}好客权益」**，无门店 icon |
+| 首页商品角标 `CouponBadge` | 由「享 + 门店 icon + 金额 + 好客权益」改为纯文案 **「享{amount}好客权益」** |
-| 商品详情 | 规格区与「好客权益」说明之间加大间距 |
-| 待支付 / 收银台 | 顶部 logo 使用 `public/images/logo2.png`（杜康印章） |
-| 门店详情 | 「使用规则」四字红色，放在「门店详情」**上面**；门店详情正文限高，超出上下滚动 |
-| 发票申请 | 票种写死增值税普通发票；类型选酒水类/餐饮类；申请备注；抬头邮箱必填打 `*` |
 
 其它页 `BenefitFigure`（我的/权益/核销等）仍保留门店核销图标，仅首页角标去 icon。
 
 ## 验收
 
-- [ ] 未配规格：旧小程序/H5/代下单路径与现网一致（无 SKU 也能下单）
+- [ ] 未配规格：旧小程序/H5/代下单路径与现网一致
-- [ ] 多规格：详情选规格后价格/权益/履约/主图变化
+- [ ] 多规格：详情选规格后价格/权益/履约变化；漏选下单 400
 - [ ] 整箱 SKU：数量 1 过起购；订单快照 `bottles_per_unit=6`
 - [ ] `GET /catalog/products/:id` 仍含 `id/name/price/spec/skuCode/...`
 - [ ] 小程序无「好客权益券」字样；首页角标为「享{金额}好客权益」且无门店 icon
-- [ ] 后台 SKU 码为 DK 开头且不可手填；每规格独立 69 码与主图
-- [ ] 门店详情「使用规则」红色且在门店详情上方；门店详情超长可滚动
-- [ ] 待支付页顶部为 logo2 印章

packages/shared-types/src/catalog.ts

@@ -35,8 +35,6 @@ export interface ProductSkuDto {
   saleUnit: ProductSaleUnit;
   bottlesPerUnit: number;
   isDefault: boolean;
-  /** 规格主图；无则详情页回落商品封面/轮播 */
-  imageUrl?: string | null;
 }
 
 export interface ProductDto {
@@ -131,7 +129,6 @@ export interface AdminProductSkuInput {
   id?: string;
   /** 规格值 id；无规格时为空数组 */
   specValueIds?: string[];
-  /** 忽略；服务端自动生成 DK 码 */
   skuCode?: string;
   barcode69: string;
   price: number;
@@ -144,5 +141,4 @@ export interface AdminProductSkuInput {
   bottlesPerUnit?: number;
   isDefault?: boolean;
   sortOrder?: number;
-  imageUrl?: string | null;
 }

packages/shared-types/src/invoice.ts

@@ -1,7 +1,5 @@
 export type InvoiceTitleType = 'PERSONAL' | 'ENTERPRISE';
 export type InvoiceKind = 'NORMAL' | 'SPECIAL';
-/** C 端开票品类：酒水类 / 餐饮类（票种固定增值税普通发票） */
-export type InvoiceCategory = 'LIQUOR' | 'CATERING';
 export type InvoiceStatus = 'PENDING' | 'ISSUED' | 'REJECTED';
 
 export const INVOICE_TITLE_TYPE_LABELS: Record<InvoiceTitleType, string> = {
@@ -14,11 +12,6 @@ export const INVOICE_KIND_LABELS: Record<InvoiceKind, string> = {
   SPECIAL: '增值税专用发票',
 };
 
-export const INVOICE_CATEGORY_LABELS: Record<InvoiceCategory, string> = {
-  LIQUOR: '酒水类',
-  CATERING: '餐饮类',
-};
-
 export const INVOICE_STATUS_LABELS: Record<InvoiceStatus, string> = {
   PENDING: '待开票',
   ISSUED: '已开票',
@@ -28,7 +21,6 @@ export const INVOICE_STATUS_LABELS: Record<InvoiceStatus, string> = {
 export interface CreateInvoiceRequest {
   titleType: InvoiceTitleType;
   invoiceKind: InvoiceKind;
-  invoiceCategory?: InvoiceCategory;
   titleName: string;
   taxNo?: string;
   addressPhone?: string;
@@ -45,7 +37,6 @@ export interface InvoiceDto {
   userId: string;
   titleType: InvoiceTitleType;
   invoiceKind: InvoiceKind;
-  invoiceCategory?: InvoiceCategory;
   titleName: string;
   taxNo?: string | null;
   addressPhone?: string | null;

server/dukang-api/prisma/backfill-product-skus.ts

@@ -5,30 +5,6 @@
 import { PrismaClient } from '@prisma/client';
 
 const prisma = new PrismaClient();
-const PREFIX = 'DK';
-const PAD = 6;
-const RE = /^DK(\d+)$/;
-
-async function nextDkCode() {
-  const [items, skus] = await Promise.all([
-    prisma.commonProductItem.findMany({
-      where: { skuCode: { startsWith: PREFIX } },
-      select: { skuCode: true },
-    }),
-    prisma.commonProductSku.findMany({
-      where: { skuCode: { startsWith: PREFIX } },
-      select: { skuCode: true },
-    }),
-  ]);
-  let maxSeq = 0;
-  for (const row of [...items, ...skus]) {
-    const m = RE.exec(row.skuCode);
-    if (!m) continue;
-    const n = Number(m[1]);
-    if (Number.isFinite(n) && n > maxSeq) maxSeq = n;
-  }
-  return `${PREFIX}${String(maxSeq + 1).padStart(PAD, '0')}`;
-}
 
 async function main() {
   const products = await prisma.commonProductItem.findMany({
@@ -37,11 +13,10 @@ async function main() {
   let created = 0;
   for (const p of products) {
     if (p.skus.length > 0) continue;
-    const skuCode = RE.test(p.skuCode) ? p.skuCode : await nextDkCode();
     await prisma.commonProductSku.create({
       data: {
         productId: p.id,
-        skuCode,
+        skuCode: p.skuCode,
         barcode69: p.barcode69,
         specKey: '',
         specText: p.spec,
@@ -57,14 +32,8 @@ async function main() {
         sortOrder: 0,
       },
     });
-    if (p.skuCode !== skuCode) {
-      await prisma.commonProductItem.update({
-        where: { id: p.id },
-        data: { skuCode },
-      });
-    }
     created += 1;
-    console.log(`created default sku for product ${p.id} ${skuCode}`);
+    console.log(`created default sku for product ${p.id} ${p.skuCode}`);
   }
   console.log(`done, created=${created}, scanned=${products.length}`);
 }

server/dukang-api/prisma/migrate-invoice-category.sql

@@ -1,5 +0,0 @@
--- 发票开票品类：酒水类 / 餐饮类（票种仍为增值税普通发票）
--- 存量申请默认酒水类，与 Prisma InvoiceCategory 默认值一致
-
-ALTER TABLE `user_invoice`
-  ADD COLUMN `invoice_category` VARCHAR(16) NOT NULL DEFAULT 'LIQUOR' AFTER `invoice_kind`;

server/dukang-api/prisma/migrate-sku-image.sql

@@ -1,3 +0,0 @@
--- SKU 规格主图（可选；空则 C 端回落商品封面）
-ALTER TABLE `common_product_sku`
-  ADD COLUMN `image_url` VARCHAR(512) NULL AFTER `sort_order`;

server/dukang-api/prisma/rewrite-sku-codes-dk.ts

@@ -1,147 +0,0 @@
-/**
- * 将存量商品 / SKU 的 sku_code 全部改成 DK + 6 位数字。
- * 已是 DK 数字码的保持不变；其余先写临时码再分配，避免唯一约束冲突。
- *
- * 用法：cd server/dukang-api && npx ts-node prisma/rewrite-sku-codes-dk.ts
- */
-import { PrismaClient } from '@prisma/client';
-
-const prisma = new PrismaClient();
-const PREFIX = 'DK';
-const PAD = 6;
-const RE = /^DK(\d+)$/;
-
-function isDk(code: string) {
-  return RE.test(code);
-}
-
-function formatCode(seq: number) {
-  return `${PREFIX}${String(seq).padStart(PAD, '0')}`;
-}
-
-async function maxExistingSeq(): Promise<number> {
-  const [items, skus] = await Promise.all([
-    prisma.commonProductItem.findMany({
-      where: { skuCode: { startsWith: PREFIX } },
-      select: { skuCode: true },
-    }),
-    prisma.commonProductSku.findMany({
-      where: { skuCode: { startsWith: PREFIX } },
-      select: { skuCode: true },
-    }),
-  ]);
-  let maxSeq = 0;
-  for (const row of [...items, ...skus]) {
-    const m = RE.exec(row.skuCode);
-    if (!m) continue;
-    const n = Number(m[1]);
-    if (Number.isFinite(n) && n > maxSeq) maxSeq = n;
-  }
-  return maxSeq;
-}
-
-async function main() {
-  const skus = await prisma.commonProductSku.findMany({
-    orderBy: [{ productId: 'asc' }, { id: 'asc' }],
-    select: { id: true, productId: true, skuCode: true, isDefault: true },
-  });
-  const products = await prisma.commonProductItem.findMany({
-    select: { id: true, skuCode: true },
-  });
-
-  const skuNeed = skus.filter((s) => !isDk(s.skuCode));
-  const productNeed = products.filter((p) => !isDk(p.skuCode));
-  console.log(`sku total=${skus.length} rewrite=${skuNeed.length}`);
-  console.log(`product total=${products.length} rewrite=${productNeed.length}`);
-
-  await prisma.$transaction(async (tx) => {
-    for (const s of skuNeed) {
-      await tx.commonProductSku.update({
-        where: { id: s.id },
-        data: { skuCode: `TMP${s.id.toString()}` },
-      });
-    }
-    for (const p of productNeed) {
-      await tx.commonProductItem.update({
-        where: { id: p.id },
-        data: { skuCode: `TMPP${p.id.toString()}` },
-      });
-    }
-
-    const seqStart = await (async () => {
-      const [items, skuRows] = await Promise.all([
-        tx.commonProductItem.findMany({
-          where: { skuCode: { startsWith: PREFIX } },
-          select: { skuCode: true },
-        }),
-        tx.commonProductSku.findMany({
-          where: { skuCode: { startsWith: PREFIX } },
-          select: { skuCode: true },
-        }),
-      ]);
-      let maxSeq = 0;
-      for (const row of [...items, ...skuRows]) {
-        const m = RE.exec(row.skuCode);
-        if (!m) continue;
-        const n = Number(m[1]);
-        if (Number.isFinite(n) && n > maxSeq) maxSeq = n;
-      }
-      return maxSeq;
-    })();
-
-    let seq = seqStart;
-    const defaultSkuCodeByProduct = new Map<string, string>();
-
-    for (const s of skuNeed) {
-      seq += 1;
-      const code = formatCode(seq);
-      await tx.commonProductSku.update({
-        where: { id: s.id },
-        data: { skuCode: code },
-      });
-      if (s.isDefault) defaultSkuCodeByProduct.set(s.productId.toString(), code);
-      console.log(`sku ${s.id} ${s.skuCode} -> ${code}`);
-    }
-
-    for (const p of productNeed) {
-      const fromDefault = defaultSkuCodeByProduct.get(p.id.toString());
-      let code = fromDefault;
-      if (!code) {
-        seq += 1;
-        code = formatCode(seq);
-      }
-      await tx.commonProductItem.update({
-        where: { id: p.id },
-        data: { skuCode: code },
-      });
-      console.log(`product ${p.id} ${p.skuCode} -> ${code}`);
-    }
-
-    const stillDefault = await tx.commonProductSku.findMany({
-      where: { isDefault: true },
-      select: { productId: true, skuCode: true },
-    });
-    for (const s of stillDefault) {
-      if (!isDk(s.skuCode)) continue;
-      await tx.commonProductItem.updateMany({
-        where: { id: s.productId, NOT: { skuCode: s.skuCode } },
-        data: { skuCode: s.skuCode },
-      });
-    }
-  });
-
-  const leftoverSku = await prisma.commonProductSku.count({
-    where: { NOT: { skuCode: { startsWith: PREFIX } } },
-  });
-  const leftoverProduct = await prisma.commonProductItem.count({
-    where: { NOT: { skuCode: { startsWith: PREFIX } } },
-  });
-  console.log(`done leftoverSku=${leftoverSku} leftoverProduct=${leftoverProduct} maxWas=${await maxExistingSeq()}`);
-}
-
-main()
-  .catch((e) => {
-    console.error(e);
-    process.exit(1);
-  })
-  .finally(() => prisma.$disconnect());

server/dukang-api/prisma/schema.prisma

@@ -146,12 +146,6 @@ enum InvoiceKind {
   SPECIAL
 }
 
-/// C 端开票品类（增值税票种固定普通发票）
-enum InvoiceCategory {
-  LIQUOR
-  CATERING
-}
-
 enum InvoiceStatus {
   PENDING
   ISSUED
@@ -894,8 +888,6 @@ model CommonProductSku {
   bottlesPerUnit         Int             @default(1) @map("bottles_per_unit")
   isDefault              Boolean         @default(false) @map("is_default")
   sortOrder              Int             @default(0) @map("sort_order")
-  /// 规格主图；空则回落商品封面
-  imageUrl               String?         @map("image_url") @db.VarChar(512)
   createdAt              DateTime        @default(now()) @map("created_at") @db.DateTime(3)
   updatedAt              DateTime        @updatedAt @map("updated_at") @db.DateTime(3)
 
@@ -1686,8 +1678,6 @@ model UserInvoice {
   userId        BigInt           @map("user_id") @db.UnsignedBigInt
   titleType     InvoiceTitleType @map("title_type")
   invoiceKind   InvoiceKind      @map("invoice_kind")
-  /// 酒水类 / 餐饮类；历史单默认酒水类
-  invoiceCategory InvoiceCategory @default(LIQUOR) @map("invoice_category")
   titleName     String           @map("title_name") @db.VarChar(128)
   taxNo         String?          @map("tax_no") @db.VarChar(32)
   addressPhone  String?          @map("address_phone") @db.VarChar(256)

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

@@ -12,7 +12,7 @@ import {
   mapSkuDto,
   mapSpecAttrsDto,
   pickDisplaySku,
-  resolveOrderSale,
+  resolveOrderSku,
 } from './product-sku.util';
 
 export type CatalogViewer = {
@@ -204,7 +204,7 @@ export class CatalogService {
     });
   }
 
-  /** 下单前校验：白名单商品仅全局测试白名单手机号可买；无 SKU 时回落 SPU 字段 */
+  /** 下单前校验：白名单商品仅全局测试白名单手机号可买；返回 SPU + 解析后的 SKU */
   async assertPurchasable(
     productId: bigint,
     viewerPhone?: string | null,
@@ -224,8 +224,8 @@ export class CatalogService {
         throw new BadRequestException('该商品暂不对当前账号开放');
       }
     }
-    const sale = resolveOrderSale(product, product.skus ?? [], skuId);
+    const sku = resolveOrderSku(product.skus, skuId);
-    return { product, sale };
+    return { product, sku };
   }
 
   async resolveUserPhone(userId: bigint): Promise<string | null> {

server/dukang-api/src/modules/catalog/product-sku.util.ts

@@ -37,79 +37,23 @@ export function buildSpecText(
     .join(' / ');
 }
 
-/** 下单用销售快照：有可售 SKU 则用 SKU，否则回落 SPU（旧客户端 / 未回填） */
-export type OrderSaleSnapshot = {
-  skuId: bigint | null;
-  skuCode: string;
-  barcode69: string;
-  specText: string;
-  price: CommonProductSku['price'];
-  benefitAmount: CommonProductSku['benefitAmount'];
-  allowOnSitePickup: boolean;
-  allowOnlinePurchase: boolean;
-  allowCrossCityDelivery: boolean;
-  saleUnit: ProductSaleUnit;
-  bottlesPerUnit: number;
-};
-
-export function saleSnapshotFromProduct(product: CommonProductItem): OrderSaleSnapshot {
-  return {
-    skuId: null,
-    skuCode: product.skuCode,
-    barcode69: product.barcode69,
-    specText: product.spec,
-    price: product.price,
-    benefitAmount: product.benefitAmount,
-    allowOnSitePickup: product.allowOnSitePickup,
-    allowOnlinePurchase: product.allowOnlinePurchase,
-    allowCrossCityDelivery: product.allowCrossCityDelivery,
-    saleUnit: 'BOTTLE',
-    bottlesPerUnit: 1,
-  };
-}
-
-export function saleSnapshotFromSku(
-  sku: CommonProductSku,
-  product: CommonProductItem,
-): OrderSaleSnapshot {
-  return {
-    skuId: sku.id,
-    skuCode: sku.skuCode,
-    barcode69: sku.barcode69,
-    specText: sku.specText || product.spec,
-    price: sku.price,
-    benefitAmount: sku.benefitAmount,
-    allowOnSitePickup: sku.allowOnSitePickup,
-    allowOnlinePurchase: sku.allowOnlinePurchase,
-    allowCrossCityDelivery: sku.allowCrossCityDelivery,
-    saleUnit: sku.saleUnit,
-    bottlesPerUnit: sku.bottlesPerUnit > 0 ? sku.bottlesPerUnit : sku.saleUnit === 'BOX' ? BOTTLES_PER_BOX : 1,
-  };
-}
-
 /**
- * 现网兼容：
+ * 解析下单 SKU：显式 skuId，或单可售自动回落；多可售且未传则 400。
- * - 不传 skuId：有可售 SKU 用默认/唯一可售；一个都没有则回落 SPU 字段（未回填也能下单）
- * - 传入 skuId：按 SKU 校验（新客户端选规格）
- * 不在旧接口上因「无 SKU」或「多规格未选」打断现网下单。
  */
-export function resolveOrderSale(
+export function resolveOrderSku(
-  product: CommonProductItem,
   skus: CommonProductSku[],
   skuId?: string | null,
-): OrderSaleSnapshot {
+): CommonProductSku {
+  const onSale = skus.filter(isSkuOnSale);
   if (skuId) {
     const found = skus.find((s) => s.id.toString() === String(skuId));
     if (!found) throw new BadRequestException('规格不存在');
     if (!isSkuOnSale(found)) throw new BadRequestException('该规格暂不可购买');
-    return saleSnapshotFromSku(found, product);
+    return found;
   }
-  const onSale = skus.filter(isSkuOnSale);
+  if (onSale.length === 1) return onSale[0];
-  if (onSale.length >= 1) {
+  if (onSale.length === 0) throw new BadRequestException('商品暂无可售规格');
-    const picked = onSale.find((s) => s.isDefault) ?? onSale[0];
+  throw new BadRequestException('请选择规格');
-    return saleSnapshotFromSku(picked, product);
-  }
-  return saleSnapshotFromProduct(product);
 }
 
 /** 列表/拍平：优先默认可售 → 最低价可售 → 默认任意 → 任意 */
@@ -188,7 +132,6 @@ export function mapSkuDto(sku: SkuWithSpecs) {
     isDefault: sku.isDefault,
     skuCode: sku.skuCode,
     barcode69: sku.barcode69,
-    imageUrl: (sku as { imageUrl?: string | null }).imageUrl || undefined,
     sortOrder: sku.sortOrder,
   };
 }

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

@@ -39,11 +39,6 @@ function normalizePhones(phones?: string[]): string[] {
 
 const SKU_AUTO_PREFIX = 'DK';
 const SKU_AUTO_PAD = 6;
-const SKU_AUTO_RE = /^DK(\d+)$/;
-
-function isDkSkuCode(code: string | null | undefined): boolean {
-  return !!code && SKU_AUTO_RE.test(code);
-}
 const MAX_SPEC_ATTRS = 3;
 const MAX_SPEC_VALUES = 10;
 
@@ -86,19 +81,7 @@ export class AdminProductsService {
     const page = query.page ?? 1;
     const pageSize = query.pageSize ?? 20;
     const where: Prisma.CommonProductItemWhereInput = {};
-    if (query.name?.trim()) {
+    if (query.name) where.name = { contains: query.name };
-      const kw = query.name.trim();
-      where.OR = [
-        { name: { contains: kw } },
-        {
-          skus: {
-            some: {
-              OR: [{ skuCode: { contains: kw } }, { barcode69: { contains: kw } }],
-            },
-          },
-        },
-      ];
-    }
     if (query.status) where.status = query.status as Prisma.EnumProductStatusFilter['equals'];
     if (query.aromaType) where.aromaType = query.aromaType as Prisma.EnumAromaTypeFilter['equals'];
 
@@ -111,25 +94,7 @@ export class AdminProductsService {
         include: {
           coverResource: true,
           visibilityPhones: { select: { phone: true }, orderBy: { phone: 'asc' } },
-          skus: {
+          skus: { select: { id: true }, take: 2 },
-            orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }],
-            select: {
-              id: true,
-              skuCode: true,
-              barcode69: true,
-              specText: true,
-              price: true,
-              benefitAmount: true,
-              status: true,
-              isDefault: true,
-              sortOrder: true,
-              allowOnSitePickup: true,
-              allowOnlinePurchase: true,
-              allowCrossCityDelivery: true,
-              saleUnit: true,
-              bottlesPerUnit: true,
-            },
-          },
           specAttrs: { select: { id: true } },
         },
       }),
@@ -150,101 +115,13 @@ export class AdminProductsService {
       : [];
     const resourceMap = groupResourcesByProductId(resources);
 
-    /** productId → skuIdKey → bottles；skuIdKey 用 '' 表示历史无 sku */
-    const soldByProductSku = new Map<string, Map<string, number>>();
-    if (productIds.length) {
-      const saleOrders = await this.prisma.order.findMany({
-        where: {
-          productId: { in: productIds },
-          payStatus: 'PAID',
-          isTest: false,
-          status: { notIn: ['PENDING_PAY', 'CANCELLED', 'REFUNDED'] },
-        },
-        select: {
-          productId: true,
-          skuId: true,
-          quantity: true,
-          bottlesPerUnit: true,
-        },
-      });
-      for (const o of saleOrders) {
-        const pid = o.productId.toString();
-        const sid = o.skuId?.toString() ?? '';
-        const bottles = o.quantity * (o.bottlesPerUnit > 0 ? o.bottlesPerUnit : 1);
-        let bySku = soldByProductSku.get(pid);
-        if (!bySku) {
-          bySku = new Map();
-          soldByProductSku.set(pid, bySku);
-        }
-        bySku.set(sid, (bySku.get(sid) ?? 0) + bottles);
-      }
-    }
-
     return serializeBigInt({
       items: items.map((p) => {
         const { skus, specAttrs, ...rest } = p;
-        const formatted = this.formatProduct(rest as never, resourceMap.get(p.id.toString()) ?? []);
-        const prices = skus.length
-          ? skus.map((s) => Number(s.price))
-          : [Number(p.price)];
-        const priceMin = Math.min(...prices);
-        const priceMax = Math.max(...prices);
-        const pid = p.id.toString();
-        const bySku = soldByProductSku.get(pid);
-        let soldBottles = 0;
-        if (bySku) {
-          for (const n of bySku.values()) soldBottles += n;
-        }
-
-        const skuRows =
-          skus.length > 0
-            ? skus.map((s) => ({
-                id: s.id.toString(),
-                skuCode: s.skuCode,
-                barcode69: s.barcode69,
-                specText: s.specText,
-                price: Number(s.price),
-                benefitAmount: Number(s.benefitAmount ?? s.price),
-                status: s.status,
-                isDefault: s.isDefault,
-                sortOrder: s.sortOrder,
-                allowOnSitePickup: s.allowOnSitePickup,
-                allowOnlinePurchase: s.allowOnlinePurchase,
-                allowCrossCityDelivery: s.allowCrossCityDelivery,
-                saleUnit: s.saleUnit,
-                bottlesPerUnit: s.bottlesPerUnit,
-                soldBottles: bySku?.get(s.id.toString()) ?? 0,
-                virtual: false,
-              }))
-            : [
-                {
-                  id: `virtual-${pid}`,
-                  skuCode: p.skuCode,
-                  barcode69: p.barcode69,
-                  specText: p.spec,
-                  price: Number(p.price),
-                  benefitAmount: Number(p.benefitAmount ?? p.price),
-                  status: p.status,
-                  isDefault: true,
-                  sortOrder: 0,
-                  allowOnSitePickup: p.allowOnSitePickup,
-                  allowOnlinePurchase: p.allowOnlinePurchase,
-                  allowCrossCityDelivery: p.allowCrossCityDelivery,
-                  saleUnit: 'BOTTLE' as const,
-                  bottlesPerUnit: 1,
-                  soldBottles,
-                  virtual: true,
-                },
-              ];
-
         return {
-          ...formatted,
+          ...this.formatProduct(rest as never, resourceMap.get(p.id.toString()) ?? []),
           specEnabled: specAttrs.length > 0 || skus.length > 1,
           skuCount: skus.length,
-          priceMin,
-          priceMax,
-          soldBottles,
-          skus: skuRows,
         };
       }),
       total,
@@ -364,14 +241,10 @@ export class AdminProductsService {
     const existing = await this.prisma.commonProductItem.findUnique({ where: { id } });
     if (!existing) throw new NotFoundException('商品不存在');
 
-    const skuCount = await this.prisma.commonProductSku.count({ where: { productId: id } });
-    /** 多规格时履约只在规格 SKU 上改；忽略基础信息里的履约字段，避免误覆盖默认 SKU 冗余 */
-    const applyFulfillment = skuCount <= 1;
     const fulfillmentTouched =
-      applyFulfillment &&
+      dto.allowOnlinePurchase !== undefined ||
-      (dto.allowOnlinePurchase !== undefined ||
       dto.allowCrossCityDelivery !== undefined ||
-        dto.allowOnSitePickup !== undefined);
+      dto.allowOnSitePickup !== undefined;
     const flags = fulfillmentTouched
       ? resolveFulfillmentFlags({
           allowOnlinePurchase: dto.allowOnlinePurchase,
@@ -592,31 +465,14 @@ export class AdminProductsService {
       throw new BadRequestException('请且仅指定一个默认 SKU');
     }
 
-    const barcodes = rows.map((r) => r.barcode69.trim()).filter(Boolean);
+    const barcodes = rows.map((r) => r.barcode69.trim());
-    if (barcodes.length !== rows.length) {
-      throw new BadRequestException('每个规格须填写 69 码');
-    }
     if (new Set(barcodes).size !== barcodes.length) {
-      throw new BadRequestException('同一商品内 69 码不可重复，每个规格须使用不同 69 码');
+      throw new BadRequestException('69 码不可重复');
-    }
-    const barcodeTaken = await this.prisma.commonProductSku.findFirst({
-      where: { barcode69: { in: barcodes }, productId: { not: productId } },
-      select: { barcode69: true },
-    });
-    if (barcodeTaken) {
-      throw new BadRequestException(`69 码已存在：${barcodeTaken.barcode69}`);
     }
 
     await this.prisma.$transaction(async (tx) => {
       const existing = await tx.commonProductSku.findMany({ where: { productId } });
       const keepIds = new Set(rows.map((r) => r.id).filter(Boolean) as string[]);
-      const needGenerate = rows.filter((row) => {
-        if (!row.id) return true;
-        const old = existing.find((s) => s.id.toString() === row.id);
-        return !old || !isDkSkuCode(old.skuCode);
-      }).length;
-      const generatedCodes = await this.allocateAutoSkuCodesTx(tx, needGenerate);
-      let genIdx = 0;
 
       for (const old of existing) {
         if (keepIds.has(old.id.toString())) continue;
@@ -652,12 +508,7 @@ export class AdminProductsService {
               ? BOTTLES_PER_BOX
               : 1;
         const status = (row.status ?? 'DRAFT') as 'DRAFT' | 'ON_SALE' | 'OFF_SALE';
-        const old = row.id ? existing.find((s) => s.id.toString() === row.id) : undefined;
+        const skuCode = row.skuCode?.trim() || (await this.nextAutoSkuCodeTx(tx));
-        const skuCode =
-          old && isDkSkuCode(old.skuCode) ? old.skuCode : generatedCodes[genIdx++];
-        if (!skuCode) {
-          throw new BadRequestException('SKU 码生成失败，请重试');
-        }
 
         let skuId: bigint;
         if (row.id) {
@@ -677,8 +528,7 @@ export class AdminProductsService {
               bottlesPerUnit,
               isDefault: !!row.isDefault,
               sortOrder: row.sortOrder ?? i,
-              imageUrl: row.imageUrl?.trim() || null,
+            },
-            } as never,
           });
           await tx.commonProductSkuSpec.deleteMany({ where: { skuId } });
         } else {
@@ -697,8 +547,7 @@ export class AdminProductsService {
               bottlesPerUnit,
               isDefault: !!row.isDefault,
               sortOrder: row.sortOrder ?? i,
-              imageUrl: row.imageUrl?.trim() || null,
+            },
-            } as never,
           });
           skuId = created.id;
         }
@@ -760,7 +609,7 @@ export class AdminProductsService {
       await this.prisma.commonProductSku.create({
         data: {
           productId,
-          skuCode: await this.nextAutoSkuCode(),
+          skuCode: product.skuCode,
           barcode69: product.barcode69,
           specKey: '',
           specText: product.spec,
@@ -786,6 +635,7 @@ export class AdminProductsService {
     await this.prisma.commonProductSku.update({
       where: { id: defaultSku.id },
       data: {
+        skuCode: product.skuCode,
         barcode69: product.barcode69,
         specText: product.spec,
         price: product.price,
@@ -801,22 +651,12 @@ export class AdminProductsService {
 
   /** 生成 DK + 6 位自增 SKU，冲突重试 */
   private async nextAutoSkuCode(): Promise<string> {
-    const [code] = await this.allocateAutoSkuCodesTx(this.prisma, 1);
+    return this.nextAutoSkuCodeTx(this.prisma);
-    return code;
   }
 
   private async nextAutoSkuCodeTx(
     db: Prisma.TransactionClient | PrismaService,
   ): Promise<string> {
-    const [code] = await this.allocateAutoSkuCodesTx(db, 1);
-    return code;
-  }
-
-  private async allocateAutoSkuCodesTx(
-    db: Prisma.TransactionClient | PrismaService,
-    count: number,
-  ): Promise<string[]> {
-    if (count <= 0) return [];
     const [fromItem, fromSku] = await Promise.all([
       db.commonProductItem.findMany({
         where: { skuCode: { startsWith: SKU_AUTO_PREFIX } },
@@ -828,15 +668,14 @@ export class AdminProductsService {
       }),
     ]);
     let maxSeq = 0;
+    const re = new RegExp(`^${SKU_AUTO_PREFIX}(\\d+)$`);
     for (const row of [...fromItem, ...fromSku]) {
-      const m = SKU_AUTO_RE.exec(row.skuCode);
+      const m = re.exec(row.skuCode);
       if (!m) continue;
       const n = Number(m[1]);
       if (Number.isFinite(n) && n > maxSeq) maxSeq = n;
     }
-    return Array.from({ length: count }, (_, i) => {
+    return `${SKU_AUTO_PREFIX}${String(maxSeq + 1).padStart(SKU_AUTO_PAD, '0')}`;
-      return `${SKU_AUTO_PREFIX}${String(maxSeq + 1 + i).padStart(SKU_AUTO_PAD, '0')}`;
-    });
   }
 
   private async createWithGeneratedSku(

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

@@ -9,7 +9,6 @@ import {
   IsObject,
   IsOptional,
   IsString,
-  MaxLength,
   Min,
   Max,
   MinLength,
@@ -1354,7 +1353,6 @@ class AdminSkuRowDto {
   @IsString({ each: true })
   specValueIds?: string[];
 
-  /** 忽略；服务端自动生成 DK 码 */
   @IsOptional()
   @IsString()
   skuCode?: string;
@@ -1401,12 +1399,6 @@ class AdminSkuRowDto {
   @IsOptional()
   @IsNumber()
   sortOrder?: number;
-
-  /** 规格主图 URL；空则回落商品封面 */
-  @IsOptional()
-  @IsString()
-  @MaxLength(512)
-  imageUrl?: string | null;
 }
 
 export class SaveProductSkusDto {

server/dukang-api/src/modules/trade/dto/after-sale.dto.ts

@@ -53,12 +53,6 @@ export class CreateInvoiceDto {
   @IsIn(['NORMAL', 'SPECIAL'])
   invoiceKind?: string;
 
-  /** 酒水类 / 餐饮类；缺省酒水类。C 端票种固定普通发票 */
-  @IsOptional()
-  @IsString()
-  @IsIn(['LIQUOR', 'CATERING'])
-  invoiceCategory?: string;
-
   @ValidateIf((o: CreateInvoiceDto) => !o.titleId)
   @IsString()
   @IsNotEmpty()

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

@@ -40,7 +40,7 @@ export class InvoiceTitleService {
         titleType: body.titleType,
         titleName: body.titleName.trim(),
         taxNo: body.taxNo?.trim() || null,
-        email: body.email!.trim(),
+        email: body.email?.trim() || null,
         phone: body.phone?.trim() || null,
         addressPhone: body.addressPhone?.trim() || null,
         bankAccount: body.bankAccount?.trim() || null,
@@ -73,7 +73,7 @@ export class InvoiceTitleService {
         titleType: body.titleType,
         titleName: body.titleName.trim(),
         taxNo: body.taxNo?.trim() || null,
-        email: body.email!.trim(),
+        email: body.email?.trim() || null,
         phone: body.phone?.trim() || null,
         addressPhone: body.addressPhone?.trim() || null,
         bankAccount: body.bankAccount?.trim() || null,
@@ -101,13 +101,6 @@ export class InvoiceTitleService {
     if (body.titleType === 'ENTERPRISE' && !body.taxNo?.trim()) {
       throw new BadRequestException('企业抬头须填写税号');
     }
-    const email = body.email?.trim() || '';
-    if (!email) {
-      throw new BadRequestException('请填写接收邮箱');
-    }
-    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-      throw new BadRequestException('邮箱格式不正确');
-    }
     if (isUpdate && body.titleType === undefined) {
       throw new BadRequestException('titleType 必填');
     }

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

@@ -38,7 +38,7 @@ import { AlertService } from '../../common/alert/alert.service';
 import { PayRedeemAnomalyService } from '../../common/alert/pay-redeem-anomaly.service';
 import { WecomMessagePushService } from '../../integrations/wecom/wecom-message-push.service';
 import type { Request } from 'express';
-import type { ProductSaleUnit } from '@prisma/client';
+import type { CommonProductSku } from '@prisma/client';
 
 @Injectable()
 export class TradeService {
@@ -64,34 +64,23 @@ export class TradeService {
 
   private readonly logger = new Logger(TradeService.name);
 
-  private overlayProductWithSale(
+  private overlayProductWithSku(
     productDto: Record<string, unknown>,
-    sale: {
+    sku: CommonProductSku,
-      skuId: bigint | null;
-      skuCode: string;
-      specText: string;
-      price: unknown;
-      benefitAmount: unknown;
-      allowOnSitePickup: boolean;
-      allowOnlinePurchase: boolean;
-      allowCrossCityDelivery: boolean;
-      saleUnit: ProductSaleUnit;
-      bottlesPerUnit: number;
-    },
   ): Record<string, unknown> {
     return {
       ...productDto,
-      skuCode: sale.skuCode,
+      skuCode: sku.skuCode,
-      spec: sale.specText || productDto.spec,
+      spec: sku.specText || productDto.spec,
-      price: Number(sale.price),
+      price: Number(sku.price),
-      benefitAmount: Number(sale.benefitAmount ?? sale.price),
+      benefitAmount: Number(sku.benefitAmount ?? sku.price),
-      benefitDisplay: Number(sale.benefitAmount ?? sale.price),
+      benefitDisplay: Number(sku.benefitAmount ?? sku.price),
-      allowOnSitePickup: sale.allowOnSitePickup,
+      allowOnSitePickup: sku.allowOnSitePickup,
-      allowOnlinePurchase: sale.allowOnlinePurchase,
+      allowOnlinePurchase: sku.allowOnlinePurchase,
-      allowCrossCityDelivery: sale.allowCrossCityDelivery,
+      allowCrossCityDelivery: sku.allowCrossCityDelivery,
-      saleUnit: sale.saleUnit,
+      saleUnit: sku.saleUnit,
-      bottlesPerUnit: sale.bottlesPerUnit,
+      bottlesPerUnit: sku.bottlesPerUnit,
-      ...(sale.skuId ? { selectedSkuId: sale.skuId.toString() } : {}),
+      selectedSkuId: sku.id.toString(),
     };
   }
 
@@ -106,7 +95,7 @@ export class TradeService {
     },
   ) {
     const viewerPhone = await this.catalogService.resolveUserPhone(userId);
-    const { product: spu, sale } = await this.catalogService.assertPurchasable(
+    const { product: spu, sku } = await this.catalogService.assertPurchasable(
       BigInt(body.productId),
       viewerPhone,
       body.skuId,
@@ -115,13 +104,13 @@ export class TradeService {
     if (!productDto || productDto.status !== 'ON_SALE') {
       throw new BadRequestException('商品不可购买');
     }
-    const product = this.overlayProductWithSale(productDto as Record<string, unknown>, sale);
+    const product = this.overlayProductWithSku(productDto as Record<string, unknown>, sku);
 
     const city = await this.prisma.commonCity.findFirst({ where: { status: 'ACTIVE' } });
     if (!city) throw new BadRequestException('暂无开城城市');
 
     const onSitePickup = !!body.onSitePickup;
-    if (onSitePickup && !sale.allowOnSitePickup) {
+    if (onSitePickup && !sku.allowOnSitePickup) {
       throw new BadRequestException('该规格不支持现场取货');
     }
 
@@ -140,8 +129,8 @@ export class TradeService {
     let addressOk = true;
     let addressMessage: string | null = null;
     if (!onSitePickup) {
-      const allowOnline = sale.allowOnlinePurchase !== false;
+      const allowOnline = sku.allowOnlinePurchase !== false;
-      const allowCross = sale.allowCrossCityDelivery !== false;
+      const allowCross = sku.allowCrossCityDelivery !== false;
       if (deliveryType === 'LOCAL' && !allowOnline) {
         addressOk = false;
         addressMessage = '该规格不支持线上购买';
@@ -156,20 +145,20 @@ export class TradeService {
       }
     }
 
-    const bottlesPerUnit = sale.bottlesPerUnit > 0 ? sale.bottlesPerUnit : 1;
+    const bottlesPerUnit = sku.bottlesPerUnit > 0 ? sku.bottlesPerUnit : 1;
     const check = validateMinPurchase(
       deliveryType,
       body.quantity,
       city.localMinQty,
       city.crossMinQty,
-      { bottlesPerUnit, saleUnit: sale.saleUnit },
+      { bottlesPerUnit, saleUnit: sku.saleUnit },
     );
 
-    const unitPrice = Number(sale.price);
+    const unitPrice = Number(sku.price);
     const productAmount = unitPrice * body.quantity;
     const benefitPerUnit = calcBenefitAmount({
       price: unitPrice,
-      benefitAmount: sale.benefitAmount != null ? Number(sale.benefitAmount) : null,
+      benefitAmount: sku.benefitAmount != null ? Number(sku.benefitAmount) : null,
     });
 
     const freightPayType: FreightPayType | null = deliveryType === 'CROSS_CITY' ? 'COD' : null;
@@ -197,13 +186,10 @@ export class TradeService {
       addressMessage,
       minQty,
       onSitePickup,
-      allowCrossCityDelivery: sale.allowCrossCityDelivery !== false,
+      allowCrossCityDelivery: sku.allowCrossCityDelivery !== false,
-      allowOnlinePurchase: sale.allowOnlinePurchase !== false,
+      allowOnlinePurchase: sku.allowOnlinePurchase !== false,
-      skuId: sale.skuId?.toString(),
+      skuId: sku.id.toString(),
-      barcode69: sale.barcode69,
+      saleUnit: sku.saleUnit,
-      productSpec: sale.specText,
-      unitPrice,
-      saleUnit: sale.saleUnit,
       bottlesPerUnit,
       bottleQuantity: body.quantity * bottlesPerUnit,
     };
@@ -261,6 +247,9 @@ export class TradeService {
     const product = await this.prisma.commonProductItem.findUniqueOrThrow({
       where: { id: BigInt(body.productId) },
     });
+    const sku = await this.prisma.commonProductSku.findUniqueOrThrow({
+      where: { id: BigInt(preview.skuId) },
+    });
     const city = await this.prisma.commonCity.findFirstOrThrow({ where: { status: 'ACTIVE' } });
     const orderNo = generateOrderNo();
     const payExpireAt = new Date(Date.now() + 30 * 60 * 1000);
@@ -293,15 +282,15 @@ export class TradeService {
           payStatus: 'UNPAID',
           deliveryType: preview.deliveryType as 'LOCAL' | 'CROSS_CITY' | 'ON_SITE_PICKUP',
           productId: product.id,
-          skuId: preview.skuId ? BigInt(preview.skuId) : null,
+          skuId: sku.id,
-          barcode69: preview.barcode69 || product.barcode69,
+          barcode69: sku.barcode69,
           productName: product.name,
-          productSpec: preview.productSpec || product.spec,
+          productSpec: sku.specText || product.spec,
           imageResourceId: product.coverResourceId,
           quantity: body.quantity,
-          saleUnit: preview.saleUnit,
+          saleUnit: sku.saleUnit,
           bottlesPerUnit: preview.bottlesPerUnit,
-          listUnitPrice: preview.unitPrice,
+          listUnitPrice: sku.price,
           listAmount: preview.productAmount,
           productAmount: preview.productAmount,
           receiverName,
@@ -357,7 +346,7 @@ export class TradeService {
       extraJson: {
         orderId: order.id.toString(),
         productId: body.productId,
-        skuId: preview.skuId,
+        skuId: sku.id.toString(),
         quantity: body.quantity,
         onSitePickup,
       },
@@ -1091,7 +1080,6 @@ export class TradeService {
       titleId?: string;
       titleType?: string;
       invoiceKind?: string;
-      invoiceCategory?: string;
       titleName?: string;
       taxNo?: string | null;
       addressPhone?: string | null;
@@ -1100,7 +1088,6 @@ export class TradeService {
       phone?: string;
       remark?: string;
     },
-    opts?: { allowSpecialKind?: boolean },
   ) {
     const order = await this.prisma.order.findFirst({ where: { id: orderId, userId } });
     if (!order) throw new NotFoundException('订单不存在');
@@ -1150,8 +1137,7 @@ export class TradeService {
     if (resolved.titleType === 'ENTERPRISE' && !resolved.taxNo?.trim()) {
       throw new BadRequestException('企业抬头须填写税号');
     }
-    const invoiceKind =
+    const invoiceKind = body.invoiceKind || 'NORMAL';
-      opts?.allowSpecialKind && body.invoiceKind === 'SPECIAL' ? 'SPECIAL' : 'NORMAL';
     if (invoiceKind === 'SPECIAL') {
       if (resolved.titleType !== 'ENTERPRISE') {
         throw new BadRequestException('专用发票仅支持企业抬头');
@@ -1160,7 +1146,6 @@ export class TradeService {
         throw new BadRequestException('专用发票须填写税号、地址电话与开户行账号');
       }
     }
-    const invoiceCategory = body.invoiceCategory === 'CATERING' ? 'CATERING' : 'LIQUOR';
 
     const invoice = await this.prisma.userInvoice.create({
       data: {
@@ -1169,7 +1154,6 @@ export class TradeService {
         userId,
         titleType: resolved.titleType as never,
         invoiceKind: invoiceKind as never,
-        invoiceCategory: invoiceCategory as never,
         titleName: resolved.titleName.trim(),
         taxNo: resolved.taxNo?.trim() || null,
         addressPhone: resolved.addressPhone?.trim() || null,
@@ -1177,7 +1161,7 @@ export class TradeService {
         email: resolved.email.trim(),
         phone: resolved.phone.trim(),
         remark: body.remark?.trim() || null,
-      } as never,
+      },
     });
 
     if (!order.isTest) {
@@ -1270,7 +1254,6 @@ export class TradeService {
       titleId?: string;
       titleType?: string;
       invoiceKind?: string;
-      invoiceCategory?: string;
       titleName?: string;
       taxNo?: string;
       addressPhone?: string;
@@ -1284,7 +1267,7 @@ export class TradeService {
     if (!orderNo) throw new BadRequestException('请填写订单号');
     const order = await this.prisma.order.findFirst({ where: { orderNo } });
     if (!order) throw new NotFoundException('订单不存在');
-    return this.createInvoice(order.userId, order.id, body, { allowSpecialKind: true });
+    return this.createInvoice(order.userId, order.id, body);
   }
 
   async adminListInvoices(query: {
@@ -1615,7 +1598,7 @@ export class TradeService {
     },
     viewer?: { phone?: string | null; bypassWhitelist?: boolean },
   ) {
-    const { product: spu, sale } = await this.catalogService.assertPurchasable(
+    const { product: spu, sku } = await this.catalogService.assertPurchasable(
       BigInt(body.productId),
       viewer?.phone,
       body.skuId,
@@ -1637,7 +1620,7 @@ export class TradeService {
     let deliveryType: 'LOCAL' | 'CROSS_CITY' | 'ON_SITE_PICKUP' = 'LOCAL';
 
     if (deliveryMode === 'ON_SITE_PICKUP') {
-      if (!sale.allowOnSitePickup) {
+      if (!sku.allowOnSitePickup) {
         throw new BadRequestException('该规格不支持现场提货');
       }
       deliveryType = 'ON_SITE_PICKUP';
@@ -1646,8 +1629,8 @@ export class TradeService {
       if (receiverCity && receiverCity !== city.name && receiverCity !== '郑州市') {
         deliveryType = 'CROSS_CITY';
       }
-      const allowOnline = sale.allowOnlinePurchase !== false;
+      const allowOnline = sku.allowOnlinePurchase !== false;
-      const allowCross = sale.allowCrossCityDelivery !== false;
+      const allowCross = sku.allowCrossCityDelivery !== false;
       if (deliveryType === 'LOCAL' && !allowOnline) {
         throw new BadRequestException('该规格不支持线上购买');
       }
@@ -1661,21 +1644,21 @@ export class TradeService {
       }
     }
 
-    const bottlesPerUnit = sale.bottlesPerUnit > 0 ? sale.bottlesPerUnit : 1;
+    const bottlesPerUnit = sku.bottlesPerUnit > 0 ? sku.bottlesPerUnit : 1;
     const check = validateMinPurchase(
       deliveryType === 'CROSS_CITY' ? 'CROSS_CITY' : deliveryType === 'ON_SITE_PICKUP' ? 'ON_SITE_PICKUP' : 'LOCAL',
       body.quantity,
       city.localMinQty,
       city.crossMinQty,
-      { bottlesPerUnit, saleUnit: sale.saleUnit },
+      { bottlesPerUnit, saleUnit: sku.saleUnit },
     );
     if (!check.ok) throw new BadRequestException(check.message);
 
-    const unitPrice = Number(sale.price);
+    const unitPrice = Number(sku.price);
     const productAmount = unitPrice * body.quantity;
     const benefitPerUnit = calcBenefitAmount({
       price: unitPrice,
-      benefitAmount: sale.benefitAmount != null ? Number(sale.benefitAmount) : null,
+      benefitAmount: sku.benefitAmount != null ? Number(sku.benefitAmount) : null,
     });
 
     return {
@@ -1684,10 +1667,8 @@ export class TradeService {
       benefitAmount: benefitPerUnit * body.quantity,
       deliveryType,
       unitPrice,
-      skuId: sale.skuId?.toString(),
+      skuId: sku.id.toString(),
-      barcode69: sale.barcode69,
+      saleUnit: sku.saleUnit,
-      productSpec: sale.specText,
-      saleUnit: sale.saleUnit,
       bottlesPerUnit,
       bottleQuantity: body.quantity * bottlesPerUnit,
       minQuantity: toMinSaleQuantity(
@@ -1774,6 +1755,9 @@ export class TradeService {
     const product = await this.prisma.commonProductItem.findUniqueOrThrow({
       where: { id: BigInt(body.productId) },
     });
+    const sku = await this.prisma.commonProductSku.findUniqueOrThrow({
+      where: { id: BigInt(preview.skuId) },
+    });
     const city = await this.prisma.commonCity.findFirstOrThrow({ where: { status: 'ACTIVE' } });
 
     let receiverName = body.receiverName?.trim() || `用户${normalizedPhone.slice(-4)}`;
@@ -1831,15 +1815,15 @@ export class TradeService {
           channelSource: 'PROXY_ONLINE',
           promoCodeId,
           productId: product.id,
-          skuId: preview.skuId ? BigInt(preview.skuId) : null,
+          skuId: sku.id,
-          barcode69: preview.barcode69 || product.barcode69,
+          barcode69: sku.barcode69,
           productName: product.name,
-          productSpec: preview.productSpec || product.spec,
+          productSpec: sku.specText || product.spec,
           imageResourceId: product.coverResourceId,
           quantity: body.quantity,
-          saleUnit: preview.saleUnit,
+          saleUnit: sku.saleUnit,
           bottlesPerUnit: preview.bottlesPerUnit,
-          listUnitPrice: preview.unitPrice,
+          listUnitPrice: sku.price,
           listAmount: preview.productAmount,
           productAmount: preview.productAmount,
           payAmount: preview.payAmount,
@@ -2187,6 +2171,9 @@ export class TradeService {
     const product = await this.prisma.commonProductItem.findUniqueOrThrow({
       where: { id: BigInt(body.productId) },
     });
+    const sku = await this.prisma.commonProductSku.findUniqueOrThrow({
+      where: { id: BigInt(preview.skuId) },
+    });
     const city = await this.prisma.commonCity.findFirstOrThrow({ where: { status: 'ACTIVE' } });
 
     let receiverName = body.receiverName?.trim() || `用户${normalizedPhone.slice(-4)}`;
@@ -2244,15 +2231,15 @@ export class TradeService {
           channelSource: 'PROXY_ONLINE',
           promoCodeId,
           productId: product.id,
-          skuId: preview.skuId ? BigInt(preview.skuId) : null,
+          skuId: sku.id,
-          barcode69: preview.barcode69 || product.barcode69,
+          barcode69: sku.barcode69,
           productName: product.name,
-          productSpec: preview.productSpec || product.spec,
+          productSpec: sku.specText || product.spec,
           imageResourceId: product.coverResourceId,
           quantity: body.quantity,
-          saleUnit: preview.saleUnit,
+          saleUnit: sku.saleUnit,
           bottlesPerUnit: preview.bottlesPerUnit,
-          listUnitPrice: preview.unitPrice,
+          listUnitPrice: sku.price,
           listAmount: preview.productAmount,
           productAmount: preview.productAmount,
           payAmount: preview.payAmount,