@pisell/pisellos 2.2.190 → 2.2.192

package/dist/solution/ScanOrder/utils.js

@@ -13,7 +13,7 @@ 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, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
@@ -380,12 +380,12 @@ 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 {
       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.option_group_item_id !== q.option_group_item_id) {
@@ -397,9 +397,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
     };
@@ -413,15 +413,15 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
 
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export function isSkuOnlyDeleteIdentity(x) {
   if (x.unique_identification_number || x.identity_key) return false;
-  return !('product_option_item' in x) && !('product_bundle' in x);
+  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);
 }
@@ -437,10 +437,10 @@ function fingerprintForIdentityWithOptionKeys(x) {
  *   忽略线侧 identity_key，按内容语义匹配。这给「行已 opaque、调用方却想按 SKU 通配 / 选项指纹删除」留兼容入口。
  */
 export function isIdentityMatch(a, b) {
-  var _ref2, _metadata$unique_iden, _metadata2, _ref3, _metadata$unique_iden2, _metadata3;
+  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 aUid = (_ref2 = (_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 && _ref2 !== void 0 ? _ref2 : a.identity_key;
-  var bUid = (_ref3 = (_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 && _ref3 !== void 0 ? _ref3 : 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;
@@ -481,7 +481,7 @@ export function getProductIdentityIndex(products, identity) {
  * - 因此多次 normalize 不会重复叠加 option/bundle。
  */
 export function normalizeOrderProduct(product) {
-  var _product$metadata, _metadata$origin, _metadata$origin2, _variantList$find, _product$is_charge_ta;
+  var _product$metadata, _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。
@@ -493,9 +493,9 @@ export function normalizeOrderProduct(product) {
   if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
     var priceById = new Map();
     originOtherBundle.forEach(function (item) {
-      var _item$price2;
+      var _item$price;
       if ((item === null || item === void 0 ? void 0 : item.id) == null) return;
-      var unit = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.bundle_selling_price;
+      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));
     });
@@ -510,19 +510,22 @@ export function normalizeOrderProduct(product) {
     });
   }
   var normalizedBundle = bundleInput.map(function (item) {
-    var _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref4, _item$bundle_selling_, _ref5, _ref6, _item$price3, _ref7, _item$price_type, _ref8, _item$price_type_ext;
+    var _item$bundle_id2, _item$bundle_product_, _item$bundle_group_id, _ref5, _item$bundle_selling_, _ref6, _ref7, _item$price2, _ref8, _item$price_type, _ref9, _item$price_type_ext;
     return _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,
-      bundle_selling_price: (_ref4 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref4 !== void 0 ? _ref4 : '0.00',
-      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: (_ref5 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref5 !== void 0 ? _ref5 : '0.00',
+      price: (_ref6 = (_ref7 = (_item$price2 = item.price) !== null && _item$price2 !== void 0 ? _item$price2 : item.custom_price) !== null && _ref7 !== void 0 ? _ref7 : item.bundle_selling_price) !== null && _ref6 !== void 0 ? _ref6 : '0.00',
+      price_type: (_ref8 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref8 !== void 0 ? _ref8 : '',
+      price_type_ext: (_ref9 = (_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 && _ref9 !== void 0 ? _ref9 : ''
     });
   });
-  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。
   // 优先级：
@@ -538,7 +541,7 @@ export function normalizeOrderProduct(product) {
   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, _ref9, _product$original_pri) {
+  var resolvedSource = function (_product$_origin, _product$_origin2, _ref10, _product$original_pri) {
     if (metadata.source_product_price !== undefined) {
       return String(metadata.source_product_price);
     }
@@ -556,7 +559,7 @@ export function normalizeOrderProduct(product) {
     if (!isV2 && metadata.main_product_original_price !== undefined) {
       return String(metadata.main_product_original_price);
     }
-    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';
+    return (_ref10 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref10 !== void 0 ? _ref10 : '0.00';
   }();
 
   // 2) 派生 main_product_original_price（含 option、不含折扣）
@@ -625,7 +628,7 @@ export function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    product_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: manualOriginalPrice,
     tax_fee: product.tax_fee || '0.00',

package/dist/solution/VenueBooking/index.js

@@ -45,7 +45,7 @@ import { extractResourceIds, buildResourceProductMap } from "./utils/resource";
 import { buildTimeSlotGrid, isBusinessHoursCrossDay, generateTimeLabels } from "./utils/timeSlot";
 import { buildDateRangeSummary } from "./utils/dateSummary";
 import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildVenueResourceMetadata, buildPriceBreakdown } from "./utils/slotMerge";
-import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, getProductSkuOptions, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { OrderModule } from "../../modules/Order";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
 import Decimal from 'decimal.js';
@@ -1726,7 +1726,9 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                       product_variant_id: 0,
                       num: 1,
                       product_bundle: [],
-                      product_option_item: [],
+                      product_sku: {
+                        option: []
+                      },
                       discount_list: [],
                       custom_deposit_data: customDepositData,
                       metadata: {}
@@ -2183,7 +2185,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + (pd.amount || 0);
               }, 0);
-              optionSum = sumOptionUnitPrice(product.product_option_item);
+              optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
               sourcePrice = (_product$metadata$sou = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);

package/dist/solution/VenueBooking/sales-section-4-annotated.json

@@ -71,8 +71,6 @@
         "num__comment": "数量；int；↕；必填。统一使用 num，不再使用 product_quantity。",
         "product_variant_id": 0,
         "product_variant_id__comment": "多规格 ID；int；↕；可选。",
-        "product_option_item": [],
-        "product_option_item__comment": "选项配置；array；↕；可选。",
         "selling_price": "50.00",
         "selling_price__comment": "销售单价（交易快照）；string；←；服务端返回，不能依赖基准数据回填。",
         "original_price": "60.00",

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -33,6 +33,7 @@ __export(buildCacheItemFromOrderLine_exports, {
 });
 module.exports = __toCommonJS(buildCacheItemFromOrderLine_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_utils = require("../../Order/utils");
 var import_manualProductDiscount = require("../../Order/utils/manualProductDiscount");
 var import_orderLineDisplay = require("./orderLineDisplay");
 function safeFormat(value, fmt) {
@@ -182,7 +183,7 @@ function buildCacheItemFromOrderLine(input) {
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
-    option: Array.isArray(product.product_option_item) ? [...product.product_option_item] : [],
+    option: (0, import_utils.getProductSkuOptions)(product),
     bundle: Array.isArray(product.product_bundle) ? [...product.product_bundle] : []
   };
   const extend = {

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -22,6 +22,7 @@ __export(buildNormalProductCacheItemFromOrderLine_exports, {
   buildNormalProductCacheItemFromOrderLine: () => buildNormalProductCacheItemFromOrderLine
 });
 module.exports = __toCommonJS(buildNormalProductCacheItemFromOrderLine_exports);
+var import_utils = require("../../Order/utils");
 var import_orderLineDisplay = require("./orderLineDisplay");
 function resolveSourceProductPrice(product, sourceProduct) {
   var _a, _b, _c;
@@ -81,7 +82,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
   const uid = (_a = product.metadata) == null ? void 0 : _a.unique_identification_number;
-  const option = Array.isArray(product.product_option_item) ? [...product.product_option_item] : [];
+  const option = (0, import_utils.getProductSkuOptions)(product);
   const bundle = mapOrderBundleToOtherBundle(
     Array.isArray(product.product_bundle) ? product.product_bundle : []
   );

package/lib/modules/Cart/utils/cartProduct.js

@@ -185,7 +185,7 @@ var formatProductToCartItemOrigin = (params) => {
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: ((_b = origin.product) == null ? void 0 : _b.product_bundle) || [],
-      product_option_item: ((_c = origin.product) == null ? void 0 : _c.product_option_item) || [],
+      product_sku: ((_c = origin.product) == null ? void 0 : _c.product_sku) || { option: [] },
       metadata: {
         product_discount_difference
       }
@@ -196,7 +196,14 @@ var formatProductToCartItemOrigin = (params) => {
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options == null ? void 0 : options.length) {
-      origin.product.product_option_item = formatOptionsToOrigin(options);
+      origin.product.product_sku = {
+        ...origin.product.product_sku || {},
+        option: formatOptionsToOrigin(options).map((option) => {
+          const next = { ...option, add_price: option.add_price ?? option.price };
+          delete next.price;
+          return next;
+        })
+      };
     }
   }
   return origin;

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

@@ -265,7 +265,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -317,8 +317,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private formatHydratedNamePair;
     private buildHydratedProductOptionString;
     private normalizeHydratedProductOptionItem;
-    private mergeHydratedProductOptionDisplayFields;
-    private resolveHydratedProductOptions;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;

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);
@@ -1449,7 +1449,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     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)(
@@ -1471,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({
@@ -1529,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)
@@ -1568,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;
@@ -1593,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;
@@ -1623,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 || {};
@@ -1656,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 = {
@@ -1666,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 || {},
@@ -1696,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();
@@ -1712,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();
@@ -1728,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;
@@ -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;
 }

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;