@pisell/pisellos 0.0.568 → 0.0.570

package/dist/solution/ScanOrder/types.d.ts

@@ -10,8 +10,8 @@ export declare enum ScanOrderHooks {
     onRefresh = "scanOrder:onRefresh",
     onCartValidationChanged = "scanOrder:onCartValidationChanged"
 }
-export type ScanOrderStatus = 'idle' | 'initializing' | 'ready' | 'error';
-export type ScanOrderEntryContext = {
+export declare type ScanOrderStatus = 'idle' | 'initializing' | 'ready' | 'error';
+export declare type ScanOrderEntryContext = {
     biz: string;
     mode: 'scan' | 'append';
     resourceId?: string;
@@ -31,15 +31,20 @@ export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     identity_key?: string;
+    unique_identification_number?: string;
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
-    product_option_item?: any[];
+    product_sku?: ScanOrderProductSku;
     product_bundle?: any[];
     shop_id?: number | string;
 }
+export interface ScanOrderProductSku {
+    option: any[];
+    [key: string]: any;
+}
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
-    product_option_item: any[];
+    product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
      *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
@@ -61,6 +66,8 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     is_charge_tax: number;
     discount_list: any[];
     product_bundle: any[];
+    /** 关联 booking.metadata.unique_identification_number */
+    booking_uid?: string;
     /**
      * 行级扩展 metadata。价格相关的权威字段：
      *
@@ -76,19 +83,19 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     metadata: Record<string, any>;
     /** 商品行备注（如顾客对单品的特殊要求） */
     note?: string;
+    /** @deprecated UI/SDK 运行态数据迁移到 tempOrder._extend */
     _origin?: Record<string, any>;
 }
 /**
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 export interface ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
     /**
@@ -109,6 +116,7 @@ export interface ScanOrderSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {
@@ -118,6 +126,9 @@ export interface ScanOrderSummary {
     };
     expect_amount: string;
     total_amount: string;
+    total_refund_amount: string;
+    customer_paid_amount: string;
+    order_paid_amount: string;
     amount_gap: string;
     rounding_amount: string;
     pay_service_charge_amount: string;
@@ -130,11 +141,15 @@ export interface ScanOrderSummary {
  */
 export interface ScanOrderTempOrder {
     order_id: number | null;
+    /** @deprecated 资源运行态迁移到 ScanOrder store；仅旧缓存兼容 */
     relation_id?: string;
+    /** @deprecated 资源运行态迁移到 ScanOrder store；仅旧缓存兼容 */
     table_form_id?: string;
+    /** @deprecated 资源运行态迁移到 ScanOrder store；仅旧缓存兼容 */
     resource_id?: string;
     order_number: string;
     shop_order_number: string;
+    shop_full_order_number: string;
     type: string;
     business_code: string;
     platform: string;
@@ -164,6 +179,7 @@ export interface ScanOrderTempOrder {
     table_number?: Record<string, any>;
     schedule_date: string;
     created_at: string;
+    request_unique_idempotency_token?: string;
     products: ScanOrderOrderProduct[];
     bookings: any[];
     payments: any[];
@@ -171,14 +187,20 @@ export interface ScanOrderTempOrder {
     discount_list: any[];
     relation_forms: any[];
     contacts: any[];
-    contacts_info: any[];
+    contacts_info: Record<string, any> | null;
     holder: Record<string, any> | null;
-    summary: ScanOrderSummary;
     metadata: Record<string, any>;
+    _extend?: {
+        productsByUid?: Record<string, Record<string, any>>;
+        [key: string]: any;
+    };
+    /** @deprecated summary 是 OrderState 派生状态，不属于可提交 tempOrder */
+    summary?: ScanOrderSummary;
+    /** @deprecated lastOrderInfo 迁移到 OrderState 同层级 */
     lastOrderInfo?: Record<string, any>;
 }
-export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at' | 'summary' | 'surcharges'> {
-    platform: 'H5' | 'PC';
+export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'summary' | 'surcharges'> {
+    platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
         form_id: number | string;
@@ -186,7 +208,7 @@ export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platfo
     }>;
     products: ScanOrderSubmitProduct[];
 }
-export type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
+export declare type ScanOrderAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'multiple_orders' | 'additional_order_with_code' | 'additional_order';
 export interface ScanOrderTableFormRecord {
     policy?: string | null;
     partyroom_booking?: string | null;
@@ -245,7 +267,7 @@ export interface ScanOrderResourceOccupyDetailApiResponse {
         occupy_details?: ScanOrderResourceOccupyDetail[] | null;
     } | null;
 }
-export type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
+export declare type ScanOrderResourceSelectType = 'single' | 'multiple' | 'capacity';
 export interface ScanOrderReservationResourceSelectInfo {
     resourceSelectType?: ScanOrderResourceSelectType;
     isSingleReservation: boolean;
@@ -255,7 +277,7 @@ export interface ScanOrderReservationResourceSelectInfo {
 export interface ScanOrderAllowAddItemsInfo {
     enabled: boolean;
 }
-export type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
+export declare type ScanOrderSyncAdditionalOrderReason = 'missing_resource_id' | 'no_order' | 'multiple_orders' | 'add_items_disabled' | 'invalid_order_id';
 export interface ScanOrderSyncAdditionalOrderResult {
     matched: boolean;
     order_id?: string;

package/dist/solution/ScanOrder/types.js

@@ -14,13 +14,12 @@ export var ScanOrderHooks = /*#__PURE__*/function (ScanOrderHooks) {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 
 /**

package/dist/solution/ScanOrder/utils.d.ts

@@ -2,6 +2,7 @@ import { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderResource
 import type { CartItemSummary, ItemRuleBusinessData, PaxInfo, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 import type { ProductData } from '../../modules/Product/types';
+import type { OrderSubmitProduct } from '../../modules/Order/types';
 /**
  * 构建金额全为 0 的空 summary。
  * 作为尚未计算金额时的兜底默认值，避免下游因 undefined 报错。
@@ -42,6 +43,8 @@ export declare function toNonNegativeNumber(value: unknown): number;
 export declare function toNonNegativeInt(value: unknown): number;
 export declare function toPriceString(value: unknown, fallback?: string): string;
 export declare function buildProductKey(productId: number, productVariantId: number): string;
+/** 加餐接口只提交本次新增商品，过滤掉首单预约占位规则行。 */
+export declare function filterProductsForScanOrderMore<T extends OrderSubmitProduct>(products?: T[]): T[];
 export declare function getTopLevelProductId(product: Record<string, any>): number | null;
 export declare function getTopLevelVariantId(product: Record<string, any>): number | null;
 export declare function buildQuantityLimitIndex(limits: QuantityLimitResult[]): {
@@ -88,7 +91,7 @@ export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T
 export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
 /**

package/dist/solution/ScanOrder/utils.js

@@ -13,7 +13,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
-import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, ensureProductSku, getBundleSellingMagnitude, getProductSkuOptions, normalizeProductSkuOptions, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -30,10 +31,14 @@ export function createEmptySummary() {
     shipping_tax_fee: '0.00',
     tax_fee: '0.00',
     surcharge_fee: '0.00',
+    surcharges: [],
     discount_amount: '0.00',
     deposit_amount: '0.00',
     expect_amount: '0.00',
     total_amount: '0.00',
+    total_refund_amount: '0.00',
+    customer_paid_amount: '0.00',
+    order_paid_amount: '0.00',
     amount_gap: '0.00',
     rounding_amount: '0.00',
     pay_service_charge_amount: '0.00'
@@ -149,6 +154,15 @@ export function toPriceString(value) {
 export function buildProductKey(productId, productVariantId) {
   return "".concat(productId, "_").concat(productVariantId);
 }
+
+/** 加餐接口只提交本次新增商品，过滤掉首单预约占位规则行。 */
+export function filterProductsForScanOrderMore() {
+  var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return products.filter(function (product) {
+    var _product$metadata;
+    return ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.is_rule) !== true;
+  });
+}
 export function getTopLevelProductId(product) {
   var _product$product_id;
   var rawProductId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product.id;
@@ -376,16 +390,16 @@ export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
 export function buildProductLineFingerprint(productOptionItem, productBundle) {
   var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
   var normalizedOpts = optArr.map(function (item) {
-    var _item$price;
+    var _ref, _item$add_price;
     return {
-      product_option_item_id: Number(item === null || item === void 0 ? void 0 : item.product_option_item_id) || 0,
+      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
       option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
+      price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
     };
   }).sort(function (p, q) {
-    if (p.product_option_item_id !== q.product_option_item_id) {
-      return p.product_option_item_id - q.product_option_item_id;
+    if (p.option_group_item_id !== q.option_group_item_id) {
+      return p.option_group_item_id - q.option_group_item_id;
     }
     if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
     if (p.num !== q.num) return p.num - q.num;
@@ -393,9 +407,9 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
   });
   var bundleArr = Array.isArray(productBundle) ? productBundle : [];
   var normalizedBundles = bundleArr.map(function (item) {
-    var _ref, _item$bundle_id;
+    var _ref2, _item$bundle_id;
     return {
-      bundle_id: Number((_ref = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref !== void 0 ? _ref : 0) || 0,
+      bundle_id: Number((_ref2 = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref2 !== void 0 ? _ref2 : 0) || 0,
       product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
     };
@@ -409,15 +423,15 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
 
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export function isSkuOnlyDeleteIdentity(x) {
-  if (x.identity_key) return false;
-  return !('product_option_item' in x) && !('product_bundle' in x);
+  if (x.unique_identification_number || x.identity_key) return false;
+  return !('product_sku' in x) && !('product_bundle' in x);
 }
 function fingerprintForIdentityWithOptionKeys(x) {
   var row = x;
-  var opts = 'product_option_item' in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  var opts = 'product_sku' in row ? getProductSkuOptions(row) : [];
   var buds = 'product_bundle' in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
   return buildProductLineFingerprint(opts, buds);
 }
@@ -433,10 +447,13 @@ function fingerprintForIdentityWithOptionKeys(x) {
  *   忽略线侧 identity_key，按内容语义匹配。这给「行已 opaque、调用方却想按 SKU 通配 / 选项指纹删除」留兼容入口。
  */
 export function isIdentityMatch(a, b) {
+  var _ref3, _metadata$unique_iden, _metadata2, _ref4, _metadata$unique_iden2, _metadata3;
   if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id) return false;
-  var aHasKey = typeof a.identity_key === 'string' && a.identity_key.length > 0;
-  var bHasKey = typeof b.identity_key === 'string' && b.identity_key.length > 0;
-  if (aHasKey && bHasKey) return a.identity_key === b.identity_key;
+  var aUid = (_ref3 = (_metadata$unique_iden = (_metadata2 = a.metadata) === null || _metadata2 === void 0 ? void 0 : _metadata2.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : a.unique_identification_number) !== null && _ref3 !== void 0 ? _ref3 : a.identity_key;
+  var bUid = (_ref4 = (_metadata$unique_iden2 = (_metadata3 = b.metadata) === null || _metadata3 === void 0 ? void 0 : _metadata3.unique_identification_number) !== null && _metadata$unique_iden2 !== void 0 ? _metadata$unique_iden2 : b.unique_identification_number) !== null && _ref4 !== void 0 ? _ref4 : b.identity_key;
+  var aHasKey = typeof aUid === 'string' && aUid.length > 0;
+  var bHasKey = typeof bUid === 'string' && bUid.length > 0;
+  if (aHasKey && bHasKey) return aUid === bUid;
   if (isSkuOnlyDeleteIdentity(a) || isSkuOnlyDeleteIdentity(b)) return true;
   return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
 }
@@ -474,23 +491,67 @@ export function getProductIdentityIndex(products, identity) {
  * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export function normalizeOrderProduct(product) {
-  var _metadata$origin, _variantList$find, _product$is_charge_ta;
+  var _product$metadata2, _metadata$origin, _product$product_sku, _metadata$origin2, _variantList$find, _product$is_charge_ta;
   var metadata = _objectSpread({}, product.metadata || {});
   // 不透明 identity 契约：每条订单行必须带 identity_key。
   // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
-  var resolvedIdentityKey = product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : createUuidV4();
-  if (!metadata.unique_identification_number) {
-    metadata.unique_identification_number = resolvedIdentityKey;
+  var resolvedIdentityKey = (_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.unique_identification_number ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : createUuidV4();
+  metadata.unique_identification_number = resolvedIdentityKey;
+  var priceOverride = metadata.price_override;
+  var originOtherBundle = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin.other) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.bundle;
+  var bundleInput = product.product_bundle || [];
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    var priceById = new Map();
+    originOtherBundle.forEach(function (item) {
+      var _item$price;
+      if ((item === null || item === void 0 ? void 0 : item.id) == null) return;
+      var unit = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : item.bundle_selling_price;
+      if (unit === undefined || unit === null) return;
+      priceById.set(String(item.id), String(unit));
+    });
+    var base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
+    bundleInput = base.map(function (item) {
+      var unit = priceById.get(String(item === null || item === void 0 ? void 0 : item.id));
+      if (unit === undefined) return item;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        price: unit,
+        bundle_selling_price: unit
+      });
+    });
   }
-  var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref2, _item$bundle_selling_;
-    return _objectSpread(_objectSpread({}, item), {}, {
-      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00'
-      // custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? '0.00',
+  var normalizedBundle = bundleInput.map(function (item) {
+    var _item$price2, _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref5, _ref6, _item$price3, _ref7, _item$price_type, _ref8, _item$price_type_ext;
+    var magnitudeSource = _objectSpread(_objectSpread({}, item), {}, {
+      // 计算 markdown 净额时，只把真实毛价交给 helper；若只有 bundle_selling_price，
+      // helper 会按历史净额兜底，避免 option 二次扣减。
+      price: (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price
+    });
+    var normalizedItem = _objectSpread(_objectSpread({}, item), {}, {
+      bundle_id: (_item$bundle_id2 = item.bundle_id) !== null && _item$bundle_id2 !== void 0 ? _item$bundle_id2 : item.id,
+      bundle_product_id: (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id,
+      bundle_group_id: (_item$bundle_group_id = item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item.group_id,
+      // price 保留毛价（markdown 仍为 5），由 price_type 决定符号。
+      price: (_ref5 = (_ref6 = (_item$price3 = item.price) !== null && _item$price3 !== void 0 ? _item$price3 : item.custom_price) !== null && _ref6 !== void 0 ? _ref6 : item.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : '0.00',
+      price_type: (_ref7 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref7 !== void 0 ? _ref7 : '',
+      price_type_ext: (_ref8 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref8 !== void 0 ? _ref8 : ''
     });
+    // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
+    normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);
+    if (normalizedItem.price_type === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      var _normalizedItem$custo;
+      normalizedItem.custom_price = (_normalizedItem$custo = normalizedItem.custom_price) !== null && _normalizedItem$custo !== void 0 ? _normalizedItem$custo : normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    if ((normalizedItem.price_type === 'markdown' || normalizedItem.price_type === 'markup') && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      delete normalizedItem.original_total;
+    }
+    return normalizedItem;
   });
-  var normalizedOptions = product.product_option_item || [];
+  var normalizedOptions = normalizeProductSkuOptions((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option);
   var optionSum = sumOptionUnitPrice(normalizedOptions);
+  var productSku = _objectSpread(_objectSpread({}, ensureProductSku(product)), {}, {
+    option: normalizedOptions
+  });
 
   // 1) 解析 source_product_price。
   // 优先级：
@@ -502,11 +563,11 @@ export function normalizeOrderProduct(product) {
   //   6) 入参 selling_price（最末兜底，新添加路径 caller 只给 selling_price）
   var isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
   var variantId = Number(product.product_variant_id || 0);
-  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.variant : null;
+  var variantList = variantId ? metadata === null || metadata === void 0 || (_metadata$origin2 = metadata.origin) === null || _metadata$origin2 === void 0 ? void 0 : _metadata$origin2.variant : null;
   var variantPrice = Array.isArray(variantList) ? (_variantList$find = variantList.find(function (v) {
     return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
   })) === null || _variantList$find === void 0 ? void 0 : _variantList$find.price : undefined;
-  var resolvedSource = function (_product$_origin, _product$_origin2, _ref3, _product$original_pri) {
+  var resolvedSource = function (_product$_origin, _product$_origin2, _ref9, _product$original_pri) {
     if (metadata.source_product_price !== undefined) {
       return String(metadata.source_product_price);
     }
@@ -524,7 +585,7 @@ export function normalizeOrderProduct(product) {
     if (!isV2 && metadata.main_product_original_price !== undefined) {
       return String(metadata.main_product_original_price);
     }
-    return (_ref3 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref3 !== void 0 ? _ref3 : '0.00';
+    return (_ref9 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref9 !== void 0 ? _ref9 : '0.00';
   }();
 
   // 2) 派生 main_product_original_price（含 option、不含折扣）
@@ -572,22 +633,36 @@ export function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
+  var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
+    num: product.num,
+    metadata: metadata,
+    lineOriginalPrice: product.original_price
+  }, composedOriginalPrice);
+  var hasManualProductDiscount = (product.discount_list || []).some(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === 'product';
+  });
+  var manualOriginalPrice = hasManualProductDiscount && product.original_price != null ? String(product.original_price) : finalOriginalPrice;
+  var discountList = ensureManualProductDiscountList({
+    discountList: product.discount_list,
+    metadata: metadata,
+    originalPrice: manualOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    identity_key: resolvedIdentityKey,
-    product_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
-    original_price: composedOriginalPrice,
+    original_price: manualOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata: metadata,
-    note: product.note != null ? String(product.note) : '',
-    _origin: product._origin
+    note: product.note != null ? String(product.note) : ''
   };
 }
 

package/dist/solution/ShopDiscount/index.js

@@ -529,7 +529,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
-              if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
+              if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1))) {
                 _context6.next = 25;
                 break;
               }
@@ -795,7 +795,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfig, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -816,8 +816,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 order_id: orderId
               } : {}));
             case 5:
-              prepareConfig = _context10.sent;
-              goodPassList = (prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.discountList) || [];
+              prepareConfigResult = _context10.sent;
+              goodPassList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList) || [];
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除

package/dist/solution/ShopDiscount/types.d.ts

@@ -11,7 +11,7 @@ export declare enum ShopDiscountHooks {
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"
 }
-export type Customer = {
+export declare type Customer = {
     id: string | number;
     name: string;
     email: string;

package/dist/solution/ShopDiscount/utils.d.ts

@@ -21,13 +21,13 @@ export declare const isAllNormalProduct: (items: any[]) => boolean;
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
-export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => Discount;
 /**
  * 获取折扣金额 计算每个折扣的金额
  * @param discount
  * @returns
  */
-export declare const getDiscountListAmount: (discount: Discount[]) => any;
+export declare const getDiscountListAmount: (discount: Discount[]) => Discount;
 export interface ScheduleItem {
     id: number;
     name: string | {