@pisell/pisellos 2.2.189 → 2.2.191

package/lib/modules/Order/index.js

@@ -109,7 +109,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       if ((_a = product.metadata) == null ? void 0 : _a.is_manual_discount)
         return product;
       const totalPerUnitDiscount = (0, import_utils.resolveEffectivePerUnitDiscount)(product);
-      const optionSum = (0, import_utils.sumOptionUnitPrice)(product.product_option_item);
+      const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
       const sourcePrice = ((_b = product.metadata) == null ? void 0 : _b.source_product_price) ?? (((_c = product.metadata) == null ? void 0 : _c.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
       const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
       const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -1445,12 +1445,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── TempOrder: 商品 CRUD ───
   async addProductToOrder(product, booking) {
     var _a;
-    debugger;
     const tempOrder = this.ensureTempOrder();
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
-      productToAdd.product_option_item,
+      (0, import_utils.getProductSkuOptions)(productToAdd),
       productToAdd.product_bundle
     );
     const normalizedIncoming = (0, import_utils.mergeOrderProductDisplayFields)(
@@ -1472,14 +1471,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       if (item.product_variant_id !== productToAdd.product_variant_id)
         return false;
       const existedFingerprint2 = (0, import_utils3.buildProductLineFingerprint)(
-        item.product_option_item,
+        (0, import_utils.getProductSkuOptions)(item),
         item.product_bundle
       );
       return existedFingerprint2 === incomingFingerprint;
     });
     const matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
     const existedFingerprint = matchedProduct ? (0, import_utils3.buildProductLineFingerprint)(
-      matchedProduct.product_option_item,
+      (0, import_utils.getProductSkuOptions)(matchedProduct),
       matchedProduct.product_bundle
     ) : "";
     const shouldMerge = matchedProduct ? await this.shouldMergeProductToOrder({
@@ -1530,6 +1529,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           ...normalizedProduct.metadata || {},
           unique_identification_number: targetUid
         },
+        product_sku: {
+          ...targetProduct.product_sku || { option: [] },
+          ...normalizedProduct.product_sku || { option: [] },
+          option: (0, import_utils.getProductSkuOptions)(normalizedProduct)
+        },
         note: targetProduct.note,
         order_detail_id: targetProduct.order_detail_id,
         num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num)
@@ -1569,14 +1573,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
   }
   async updateOrderProduct(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const {
       product_id,
       product_variant_id,
       updates,
       unique_identification_number,
       identity_key,
-      product_option_item,
+      product_sku,
       product_bundle,
       booking
     } = params;
@@ -1594,8 +1598,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (identity_key !== void 0) {
       identityLookup.identity_key = identity_key;
     }
-    if (product_option_item !== void 0)
-      identityLookup.product_option_item = product_option_item;
+    if (product_sku !== void 0)
+      identityLookup.product_sku = product_sku;
     if (product_bundle !== void 0)
       identityLookup.product_bundle = product_bundle;
     let productIndex = -1;
@@ -1624,23 +1628,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...targetProduct.metadata || {},
         ...(updates == null ? void 0 : updates.metadata) || {},
         unique_identification_number: ((_a = targetProduct.metadata) == null ? void 0 : _a.unique_identification_number) || unique_identification_number
+      },
+      product_sku: {
+        ...targetProduct.product_sku || { option: [] },
+        ...(updates == null ? void 0 : updates.product_sku) && typeof updates.product_sku === "object" ? updates.product_sku : {},
+        option: Array.isArray((_b = updates == null ? void 0 : updates.product_sku) == null ? void 0 : _b.option) ? updates.product_sku.option : (0, import_utils.getProductSkuOptions)(targetProduct)
       }
     };
     nextProduct.num = (0, import_utils3.getSafeProductNum)(nextProduct.num);
     const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
-    const callerUpdatesMainMeta = ((_b = updates == null ? void 0 : updates.metadata) == null ? void 0 : _b.main_product_selling_price) !== void 0 || ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.main_product_original_price) !== void 0 || ((_d = updates == null ? void 0 : updates.metadata) == null ? void 0 : _d.source_product_price) !== void 0;
+    const callerUpdatesMainMeta = ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.main_product_selling_price) !== void 0 || ((_d = updates == null ? void 0 : updates.metadata) == null ? void 0 : _d.main_product_original_price) !== void 0 || ((_e = updates == null ? void 0 : updates.metadata) == null ? void 0 : _e.source_product_price) !== void 0;
     const isPersistedOrderLine = targetProduct.order_detail_id !== void 0 && targetProduct.order_detail_id !== null;
-    const callerUpdatesManualPrice = ((_e = updates == null ? void 0 : updates.metadata) == null ? void 0 : _e.price_override) !== void 0 || ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.is_manual_discount) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.product_discount_reason) !== void 0 || Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0;
+    const callerUpdatesManualPrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.price_override) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.is_manual_discount) !== void 0 || ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.product_discount_reason) !== void 0 || Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0;
     if (isPersistedOrderLine && !callerUpdatesManualPrice) {
       nextProduct.selling_price = targetProduct.selling_price;
       nextProduct.original_price = targetProduct.original_price;
       nextProduct.payment_price = targetProduct.payment_price;
       nextProduct.metadata = {
         ...nextProduct.metadata || {},
-        source_product_price: (_h = targetProduct.metadata) == null ? void 0 : _h.source_product_price,
-        main_product_selling_price: (_i = targetProduct.metadata) == null ? void 0 : _i.main_product_selling_price,
-        main_product_original_price: (_j = targetProduct.metadata) == null ? void 0 : _j.main_product_original_price,
-        price_schema_version: (_k = targetProduct.metadata) == null ? void 0 : _k.price_schema_version
+        source_product_price: (_i = targetProduct.metadata) == null ? void 0 : _i.source_product_price,
+        main_product_selling_price: (_j = targetProduct.metadata) == null ? void 0 : _j.main_product_selling_price,
+        main_product_original_price: (_k = targetProduct.metadata) == null ? void 0 : _k.main_product_original_price,
+        price_schema_version: (_l = targetProduct.metadata) == null ? void 0 : _l.price_schema_version
       };
     } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       const existedMeta = nextProduct.metadata || {};
@@ -1657,7 +1666,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedProduct.discount_list
     );
-    const preservedBookingUid = nextProduct.booking_uid || ((_l = nextProduct.metadata) == null ? void 0 : _l.booking_uid) || targetProduct.booking_uid || ((_m = targetProduct.metadata) == null ? void 0 : _m.booking_uid);
+    const preservedBookingUid = nextProduct.booking_uid || ((_m = nextProduct.metadata) == null ? void 0 : _m.booking_uid) || targetProduct.booking_uid || ((_n = targetProduct.metadata) == null ? void 0 : _n.booking_uid);
     if (!booking && preservedBookingUid) {
       normalizedProduct.booking_uid = preservedBookingUid;
       normalizedProduct.metadata = {
@@ -1667,7 +1676,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     if (booking) {
       const productUid = String(
-        ((_n = normalizedProduct.metadata) == null ? void 0 : _n.unique_identification_number) || ((_o = targetProduct.metadata) == null ? void 0 : _o.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
+        ((_o = normalizedProduct.metadata) == null ? void 0 : _o.unique_identification_number) || ((_p = targetProduct.metadata) == null ? void 0 : _p.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
       );
       normalizedProduct.metadata = {
         ...normalizedProduct.metadata || {},
@@ -1697,7 +1706,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       updates,
       tempOrder.products[productIndex],
-      (_p = tempOrder.products[productIndex].metadata) == null ? void 0 : _p.unique_identification_number
+      (_q = tempOrder.products[productIndex].metadata) == null ? void 0 : _q.unique_identification_number
     );
     await this.applyPromotion();
     this.applyDiscount();
@@ -1713,7 +1722,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       num,
       unique_identification_number,
       identity_key,
-      product_option_item,
+      product_sku,
       product_bundle
     } = params;
     const tempOrder = this.ensureTempOrder();
@@ -1729,8 +1738,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     if (identity_key !== void 0)
       identityLookup.identity_key = identity_key;
-    if (product_option_item !== void 0)
-      identityLookup.product_option_item = product_option_item;
+    if (product_sku !== void 0)
+      identityLookup.product_sku = product_sku;
     if (product_bundle !== void 0)
       identityLookup.product_bundle = product_bundle;
     let productIndex = -1;
@@ -1841,7 +1850,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 应传 1，确保 /order/sales/checkout 返回打印所需数据。
    */
   async submitTempOrder(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
     this.persistTempOrder();
     const effectiveCacheId = (params == null ? void 0 : params.cacheId) ?? this.cacheId;
@@ -1866,7 +1875,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       cacheId: effectiveCacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: params == null ? void 0 : params.businessCode,
+      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: params == null ? void 0 : params.channel,
       type: params == null ? void 0 : params.type,
       enhance: enhancePayload
@@ -1880,7 +1889,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         externalSaleNumber: payload.external_sale_number,
         requestUniqueIdempotencyToken: payload.request_unique_idempotency_token,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_b = payload.payments) == null ? void 0 : _b.length) || 0,
+        paymentsCount: ((_d = payload.payments) == null ? void 0 : _d.length) || 0,
         smallTicketDataFlag: payload.small_ticket_data_flag
       });
       result = await this.submitSalesOrder({
@@ -1899,7 +1908,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderId: payload.order_id,
         externalSaleNumber: payload.external_sale_number,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_c = payload.payments) == null ? void 0 : _c.length) || 0
+        paymentsCount: ((_e = payload.payments) == null ? void 0 : _e.length) || 0
       });
       throw error;
     }
@@ -1988,6 +1997,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       payments: mappedPayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
+      businessCode: params.businessCode,
       channel: params.channel,
       enhancePayload: (payload) => {
         const nextPayload = {
@@ -2404,14 +2414,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   normalizeHydratedProductOptionItem(optionItem) {
     const rawNum = (optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity) ?? 1;
     const parsedNum = Number(rawNum);
-    const rawPrice = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
+    const rawPrice = (optionItem == null ? void 0 : optionItem.add_price) ?? (optionItem == null ? void 0 : optionItem.price) ?? 0;
     const parsedPrice = Number(rawPrice);
     const normalized = {
+      ...optionItem,
       option_group_item_id: optionItem == null ? void 0 : optionItem.option_group_item_id,
       option_group_id: optionItem == null ? void 0 : optionItem.option_group_id,
       num: Number.isFinite(parsedNum) && parsedNum > 0 ? parsedNum : 1,
-      price: Number.isFinite(parsedPrice) ? parsedPrice : 0
+      add_price: Number.isFinite(parsedPrice) ? parsedPrice : 0
     };
+    delete normalized.price;
     if ((optionItem == null ? void 0 : optionItem.name) !== void 0)
       normalized.name = optionItem.name;
     if ((optionItem == null ? void 0 : optionItem.group_name) !== void 0)
@@ -2420,46 +2432,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalized.id = optionItem.id;
     return normalized;
   }
-  mergeHydratedProductOptionDisplayFields(options, skuOptions) {
-    if (!Array.isArray(skuOptions) || skuOptions.length === 0)
-      return options;
-    const displayByItemId = /* @__PURE__ */ new Map();
-    for (const option of skuOptions) {
-      const key = option == null ? void 0 : option.option_group_item_id;
-      if (key === void 0 || key === null || key === "")
-        continue;
-      displayByItemId.set(String(key), option);
-    }
-    return options.map((option) => {
-      const display = displayByItemId.get(String((option == null ? void 0 : option.option_group_item_id) ?? ""));
-      if (!display)
-        return option;
-      return {
-        ...option,
-        ...option.name === void 0 && display.name !== void 0 ? { name: display.name } : {},
-        ...option.group_name === void 0 && display.group_name !== void 0 ? { group_name: display.group_name } : {},
-        ...option.id === void 0 && display.id !== void 0 ? { id: display.id } : {}
-      };
-    });
-  }
-  resolveHydratedProductOptions(row) {
-    var _a;
-    const skuOptions = (_a = row.product_sku) == null ? void 0 : _a.option;
-    if (Array.isArray(row.product_option_item) && row.product_option_item.length > 0) {
-      return this.mergeHydratedProductOptionDisplayFields(row.product_option_item, skuOptions);
-    }
-    if (!Array.isArray(skuOptions))
-      return [];
-    return skuOptions.map(
-      (optionItem) => this.normalizeHydratedProductOptionItem(optionItem || {})
-    );
-  }
   normalizeHydratedOrderProduct(product) {
     const row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
     }
-    row.product_option_item = this.resolveHydratedProductOptions(row);
+    const productSku = (0, import_utils.ensureProductSku)(row);
+    row.product_sku = {
+      ...productSku,
+      option: (0, import_utils.normalizeProductSkuOptions)(
+        productSku.option.map(
+          (optionItem) => this.normalizeHydratedProductOptionItem(optionItem || {})
+        )
+      )
+    };
+    delete row[`product_${"option"}_item`];
     if (!Array.isArray(row.product_bundle))
       row.product_bundle = [];
     if (!row.metadata || typeof row.metadata !== "object")
@@ -2478,7 +2465,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const result = {
       ...row,
       ...normalized,
-      product_sku: row.product_sku,
+      product_sku: normalized.product_sku,
       metadata: {
         ...row.metadata,
         ...normalized.metadata

package/lib/modules/Order/types.d.ts

@@ -161,15 +161,18 @@ export interface OrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     unique_identification_number?: string;
-    product_option_item?: any[];
+    product_sku?: OrderProductSku;
     product_bundle?: any[];
 }
+export interface OrderProductSku {
+    option: any[];
+    [key: string]: any;
+}
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
     bundle_edit?: number;
-    product_option_item: any[];
-    product_sku?: Record<string, any>;
+    product_sku: OrderProductSku;
     gift_card?: number;
     selling_price: string;
     original_price: string;
@@ -262,10 +265,10 @@ export interface OrderTempOrder {
         [key: string]: any;
     };
 }
-export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num' | 'product_option_item'> {
+export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num'> {
     product_quantity: number;
     payment_price: string;
-    product_sku: Record<string, any>;
+    product_sku: OrderProductSku;
 }
 export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list' | 'created_at'> {
     platform: string;
@@ -300,7 +303,7 @@ export interface UpdateOrderProductParams {
     updates: Partial<OrderProduct>;
     unique_identification_number?: string;
     identity_key?: string;
-    product_option_item?: any[];
+    product_sku?: OrderProductSku;
     product_bundle?: any[];
     booking?: AddProductBookingInput;
 }
@@ -479,6 +482,7 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
+    businessCode?: string;
     channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {

package/lib/modules/Order/utils.d.ts

@@ -28,11 +28,18 @@ export declare function composeLinePrice(params: {
     }> | null;
     useOriginalBundle?: boolean;
 }): string;
+export declare function normalizeProductSkuOptions(options?: unknown): Record<string, any>[];
+export declare function ensureProductSku(product?: Record<string, any> | null): Record<string, any> & {
+    option: Record<string, any>[];
+};
+export declare function getProductSkuOptions(product?: Record<string, any> | null): Record<string, any>[];
 /**
- * 计算 option 单价合计：Σ(option.price × option.num)。
+ * 计算 option 单价合计：Σ(option.add_price × option.num)。
+ * 兼容入参仍带旧 `price` 的调用方，但运行时归一化后只维护 `add_price`。
  * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
  */
 export declare function sumOptionUnitPrice(options?: Array<{
+    add_price?: any;
     price?: any;
     num?: any;
 }> | null): Decimal;
@@ -162,7 +169,7 @@ export declare function mapPaymentItemsToOrderPayments(paymentItems: OrderPaymen
 export declare function formatV1Product(products: OrderSubmitProduct[]): {
     bundle: any[];
     key: number | null;
-    option: any;
+    option: any[];
     product_id: number | null;
     product_variant_id: number;
     num: number;

package/lib/modules/Order/utils.js

@@ -38,12 +38,14 @@ __export(utils_exports, {
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
+  ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
   getOrderProductLineUid: () => getOrderProductLineUid,
+  getProductSkuOptions: () => getProductSkuOptions,
   hasAssignedHolderId: () => hasAssignedHolderId,
   indexOrderProductsByUid: () => indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
@@ -56,6 +58,7 @@ __export(utils_exports, {
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
   normalizeOrderProductDiscountList: () => normalizeOrderProductDiscountList,
+  normalizeProductSkuOptions: () => normalizeProductSkuOptions,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
   resolveEffectivePerUnitDiscount: () => resolveEffectivePerUnitDiscount,
@@ -91,12 +94,36 @@ function composeLinePrice(params) {
   }
   return total.toDecimalPlaces(2).toFixed(2);
 }
+function normalizeProductSkuOptions(options) {
+  if (!Array.isArray(options))
+    return [];
+  return options.map((option) => {
+    const normalized = {
+      ...option && typeof option === "object" ? option : {}
+    };
+    const addPrice = normalized.add_price ?? normalized.price;
+    if (addPrice !== void 0)
+      normalized.add_price = addPrice;
+    delete normalized.price;
+    return normalized;
+  });
+}
+function ensureProductSku(product) {
+  const rawSku = (product == null ? void 0 : product.product_sku) && typeof product.product_sku === "object" ? product.product_sku : {};
+  return {
+    ...rawSku,
+    option: normalizeProductSkuOptions(rawSku.option)
+  };
+}
+function getProductSkuOptions(product) {
+  return ensureProductSku(product).option;
+}
 function sumOptionUnitPrice(options) {
   let total = new import_decimal.default(0);
   if (!Array.isArray(options))
     return total;
   for (const opt of options) {
-    const price = new import_decimal.default(Number(opt == null ? void 0 : opt.price) || 0);
+    const price = new import_decimal.default(Number((opt == null ? void 0 : opt.add_price) ?? (opt == null ? void 0 : opt.price)) || 0);
     const num = new import_decimal.default(Number(opt == null ? void 0 : opt.num) || 0);
     total = total.plus(price.times(num));
   }
@@ -184,7 +211,7 @@ function resolveEffectivePerUnitDiscount(product) {
   if (hasPromoDiscountItem)
     return fromList;
   const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = sumOptionUnitPrice(product == null ? void 0 : product.product_option_item).toNumber();
+  const optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
   if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
     const source = Number(metadata.source_product_price);
     const selling = Number(metadata.main_product_selling_price) - optionSum;
@@ -246,7 +273,7 @@ function createDefaultOrderRulesHooks() {
     getProduct: (product) => {
       var _a, _b, _c, _d, _e, _f;
       const metadataAny = product.metadata || {};
-      const optionSum = sumOptionUnitPrice(product.product_option_item);
+      const optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
       let sourcePrice;
       if (metadataAny.source_product_price !== void 0) {
         sourcePrice = String(metadataAny.source_product_price);
@@ -274,7 +301,7 @@ function createDefaultOrderRulesHooks() {
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
         _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
-          product.product_option_item,
+          getProductSkuOptions(product),
           product.product_bundle
         )}`,
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
@@ -306,7 +333,7 @@ function createDefaultOrderRulesHooks() {
       const nextNum = Number(values.quantity ?? product.num ?? 1) || 1;
       const metadataAny = product.metadata || {};
       const existedSource = metadataAny.source_product_price ?? product.selling_price ?? "0";
-      const nextOptions = product.product_option_item;
+      const nextOptions = getProductSkuOptions(product);
       const optionSum = sumOptionUnitPrice(nextOptions);
       const nextSourceSellingPrice = values.main_product_selling_price !== void 0 ? String(values.main_product_selling_price) : values.price !== void 0 ? String(values.price) : values.total !== void 0 ? toUnitPriceString(values.total, nextNum) : String(existedSource);
       const nextSourceOriginalPrice = values.original_price !== void 0 ? String(values.original_price) : String(existedSource);
@@ -415,6 +442,7 @@ function formatSubmitOptionItems(options) {
     return [];
   return options.map((d) => {
     const option = {
+      ...d && typeof d === "object" ? d : {},
       num: d == null ? void 0 : d.num,
       option_group_item_id: d == null ? void 0 : d.option_group_item_id,
       option_group_id: d == null ? void 0 : d.option_group_id
@@ -422,6 +450,7 @@ function formatSubmitOptionItems(options) {
     const addPrice = (d == null ? void 0 : d.add_price) ?? (d == null ? void 0 : d.price);
     if (addPrice !== void 0)
       option.add_price = String(addPrice);
+    delete option.price;
     return option;
   });
 }
@@ -485,7 +514,6 @@ function normalizeSubmitProduct(product) {
   const { unique_identification_number: _runtimeUid, ...submitProduct } = product;
   const {
     num,
-    product_option_item: productOptionItem,
     surcharge_fee: _productSurchargeFee,
     discount_amount: _deprecatedDiscountAmount,
     discount_type: _deprecatedDiscountType,
@@ -494,6 +522,7 @@ function normalizeSubmitProduct(product) {
     discount_per: _deprecatedDiscountPer,
     ...productRest
   } = submitProduct;
+  delete productRest[`product_${"option"}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
   const cleanMetadata = {};
@@ -527,9 +556,7 @@ function normalizeSubmitProduct(product) {
   }
   const productSku = {
     ...submitProduct.product_sku && typeof submitProduct.product_sku === "object" ? submitProduct.product_sku : {},
-    option: formatSubmitOptionItems(
-      (productOptionItem == null ? void 0 : productOptionItem.length) ? productOptionItem : (_a = submitProduct.product_sku) == null ? void 0 : _a.option
-    )
+    option: formatSubmitOptionItems((_a = submitProduct.product_sku) == null ? void 0 : _a.option)
   };
   return {
     ...productRest,
@@ -872,7 +899,8 @@ function mergeOrderProductDisplayFields(previous, next) {
     "product_cover",
     "cover",
     "variant_title",
-    "product_sku"
+    "product_sku",
+    "payment_price"
   ];
   displayFields.forEach((field) => {
     if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
@@ -919,12 +947,14 @@ function indexOrderProductsByUid(products) {
   createEmptySummary,
   createUuidV4,
   ensureManualProductDiscountList,
+  ensureProductSku,
   findManualProductDiscountItem,
   formatDateTime,
   formatV1Product,
   generateDuration,
   getAllDiscountList,
   getOrderProductLineUid,
+  getProductSkuOptions,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
@@ -937,6 +967,7 @@ function indexOrderProductsByUid(products) {
   normalizeBookingIsAll,
   normalizeBookingSubType,
   normalizeOrderProductDiscountList,
+  normalizeProductSkuOptions,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
   resolveEffectivePerUnitDiscount,

package/lib/modules/SalesSummary/types.d.ts

@@ -8,7 +8,9 @@ export interface SalesSummaryProduct {
     original_price: string;
     tax_fee: string;
     is_charge_tax?: number;
-    product_option_item?: any[];
+    product_sku?: Record<string, any> & {
+        option?: any[];
+    };
     discount_list?: any[];
     product_bundle?: any[];
     metadata?: Record<string, any>;

package/lib/modules/SalesSummary/utils.js

@@ -35,6 +35,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../Summary/utils");
+var import_utils2 = require("../Order/utils");
 function toDecimal(value) {
   return new import_decimal.default(value || 0);
 }
@@ -75,6 +76,7 @@ function buildSurchargeServiceItems(products) {
     var _a, _b;
     const quantity = getSafeNum(product.num);
     const unitTotal = getUnitPaymentTotal(product);
+    const options = (0, import_utils2.getProductSkuOptions)(product);
     return {
       id: product.product_id,
       num: quantity,
@@ -86,12 +88,12 @@ function buildSurchargeServiceItems(products) {
         product: {
           discount_list: product.discount_list || [],
           product_bundle: product.product_bundle || [],
-          product_option_item: product.product_option_item || []
+          product_sku: product.product_sku || { option: options }
         }
       },
       bundle: product.product_bundle || [],
-      option: product.product_option_item || [],
-      options: product.product_option_item || [],
+      option: options,
+      options,
       relation_details: [],
       metadata: product.metadata || {},
       start_date: ((_a = product.metadata) == null ? void 0 : _a.start_date) || "",