@pisell/pisellos 2.2.190 → 2.2.192

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

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -15,6 +15,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from 'dayjs';
+import { getProductSkuOptions } from "../../Order/utils";
 import { resolveManualDiscountMessage } from "../../Order/utils/manualProductDiscount";
 import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 function safeFormat(value, fmt) {
@@ -192,7 +193,7 @@ export function buildCacheItemFromOrderLine(input) {
   var productOptionString = buildProductOptionStringFromOrderLine(product);
   var other = {
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
-    option: Array.isArray(product.product_option_item) ? _toConsumableArray(product.product_option_item) : [],
+    option: getProductSkuOptions(product),
     bundle: Array.isArray(product.product_bundle) ? _toConsumableArray(product.product_bundle) : []
   };
   var extend = _objectSpread({

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

@@ -1,11 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["bundle_selling_price"];
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -13,6 +7,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { getProductSkuOptions } from "../../Order/utils";
 import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
@@ -84,7 +79,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   var selling = Number((_product$selling_pric2 = product.selling_price) !== null && _product$selling_pric2 !== void 0 ? _product$selling_pric2 : 0);
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
   var uid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
-  var option = Array.isArray(product.product_option_item) ? _toConsumableArray(product.product_option_item) : [];
+  var option = getProductSkuOptions(product);
   var bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : []);
   var originExtend = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 || (_product$metadata2 = _product$metadata2.origin) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._extend;
   var productOptionString = buildProductOptionStringFromOrderLine(product);

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

@@ -183,7 +183,9 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: ((_origin$product2 = origin.product) === null || _origin$product2 === void 0 ? void 0 : _origin$product2.product_bundle) || [],
-      product_option_item: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_option_item) || [],
+      product_sku: ((_origin$product3 = origin.product) === null || _origin$product3 === void 0 ? void 0 : _origin$product3.product_sku) || {
+        option: []
+      },
       metadata: {
         product_discount_difference: product_discount_difference
       }
@@ -196,7 +198,16 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options !== null && options !== void 0 && options.length) {
-      origin.product.product_option_item = formatOptionsToOrigin(options);
+      origin.product.product_sku = _objectSpread(_objectSpread({}, origin.product.product_sku || {}), {}, {
+        option: formatOptionsToOrigin(options).map(function (option) {
+          var _option$add_price;
+          var next = _objectSpread(_objectSpread({}, option), {}, {
+            add_price: (_option$add_price = option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option.price
+          });
+          delete next.price;
+          return next;
+        })
+      });
     }
   }
   return origin;

package/dist/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/dist/modules/Order/index.js

@@ -30,7 +30,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, mergeOrderProductDisplayFields } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, mergeOrderProductDisplayFields } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
@@ -87,7 +87,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var _product$metadata, _product$metadata$sou, _product$metadata2, _product$metadata3, _product$original_pri;
         if ((_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.is_manual_discount) return product;
         var totalPerUnitDiscount = resolveEffectivePerUnitDiscount(product);
-        var optionSum = sumOptionUnitPrice(product.product_option_item);
+        var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
         var sourcePrice = (_product$metadata$sou = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.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';
         var newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         var newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -2123,7 +2123,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 booking: booking
               }) : null;
               productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
-              incomingFingerprint = buildProductLineFingerprint(productToAdd.product_option_item, productToAdd.product_bundle);
+              incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
               normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
               normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
@@ -2132,11 +2132,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 if (_this9.hasGoodPassDiscount(item)) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
-                var existedFingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
+                var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
                 return existedFingerprint === incomingFingerprint;
               });
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
-              existedFingerprint = matchedProduct ? buildProductLineFingerprint(matchedProduct.product_option_item, matchedProduct.product_bundle) : '';
+              existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
                 _context18.next = 17;
                 break;
@@ -2182,6 +2182,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
                     unique_identification_number: targetUid
                   }),
+                  product_sku: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.product_sku || {
+                    option: []
+                  }), normalizedProduct.product_sku || {
+                    option: []
+                  }), {}, {
+                    option: getProductSkuOptions(normalizedProduct)
+                  }),
                   note: targetProduct.note,
                   order_detail_id: targetProduct.order_detail_id,
                   num: getSafeProductNum(targetProduct.num + normalizedProduct.num)
@@ -2236,12 +2243,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProduct",
     value: function () {
       var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _nextProduct$metadata, _targetProduct$metada7, _tempOrder$products$p;
-        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, isPersistedOrderLine, callerUpdatesManualPrice, _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada8, productUid, linked;
+        var _targetProduct$metada2, _product_sku, _metadata, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _nextProduct$metadata, _targetProduct$metada7, _tempOrder$products$p;
+        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_sku, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, isPersistedOrderLine, callerUpdatesManualPrice, _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada8, productUid, linked;
         return _regeneratorRuntime().wrap(function _callee17$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_option_item = params.product_option_item, product_bundle = params.product_bundle, booking = params.booking;
+              product_id = params.product_id, product_variant_id = params.product_variant_id, updates = params.updates, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle, booking = params.booking;
               tempOrder = this.ensureTempOrder();
               identityLookup = {
                 product_id: product_id,
@@ -2256,7 +2263,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (identity_key !== undefined) {
                 identityLookup.identity_key = identity_key;
               }
-              if (product_option_item !== undefined) identityLookup.product_option_item = product_option_item;
+              if (product_sku !== undefined) identityLookup.product_sku = product_sku;
               if (product_bundle !== undefined) identityLookup.product_bundle = product_bundle;
               productIndex = -1;
               if (unique_identification_number !== undefined) {
@@ -2281,6 +2288,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 product_variant_id: product_variant_id,
                 metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), (updates === null || updates === void 0 ? void 0 : updates.metadata) || {}), {}, {
                   unique_identification_number: ((_targetProduct$metada2 = targetProduct.metadata) === null || _targetProduct$metada2 === void 0 ? void 0 : _targetProduct$metada2.unique_identification_number) || unique_identification_number
+                }),
+                product_sku: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.product_sku || {
+                  option: []
+                }), updates !== null && updates !== void 0 && updates.product_sku && _typeof(updates.product_sku) === 'object' ? updates.product_sku : {}), {}, {
+                  option: Array.isArray(updates === null || updates === void 0 || (_product_sku = updates.product_sku) === null || _product_sku === void 0 ? void 0 : _product_sku.option) ? updates.product_sku.option : getProductSkuOptions(targetProduct)
                 })
               });
               nextProduct.num = getSafeProductNum(nextProduct.num);
@@ -2373,11 +2385,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
         var _targetProduct$metada9;
-        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
+        var product_id, product_variant_id, num, unique_identification_number, identity_key, product_sku, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_option_item = params.product_option_item, product_bundle = params.product_bundle;
+              product_id = params.product_id, product_variant_id = params.product_variant_id, num = params.num, unique_identification_number = params.unique_identification_number, identity_key = params.identity_key, product_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
               identityLookup = {
                 product_id: product_id,
@@ -2390,7 +2402,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               if (identity_key !== undefined) identityLookup.identity_key = identity_key;
-              if (product_option_item !== undefined) identityLookup.product_option_item = product_option_item;
+              if (product_sku !== undefined) identityLookup.product_sku = product_sku;
               if (product_bundle !== undefined) identityLookup.product_bundle = product_bundle;
               productIndex = -1;
               if (unique_identification_number !== undefined) {
@@ -3415,76 +3427,38 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref26, _optionItem$num, _ref27, _optionItem$price;
+      var _ref26, _optionItem$num, _ref27, _optionItem$add_price;
       var rawNum = (_ref26 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref26 !== void 0 ? _ref26 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref27 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref27 !== void 0 ? _ref27 : 0;
+      var rawPrice = (_ref27 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref27 !== void 0 ? _ref27 : 0;
       var parsedPrice = Number(rawPrice);
-      var normalized = {
+      var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
         option_group_id: optionItem === null || optionItem === void 0 ? 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 || optionItem === void 0 ? void 0 : optionItem.name) !== undefined) normalized.name = optionItem.name;
       if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.group_name) !== undefined) normalized.group_name = optionItem.group_name;
       if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.id) !== undefined) normalized.id = optionItem.id;
       return normalized;
     }
-  }, {
-    key: "mergeHydratedProductOptionDisplayFields",
-    value: function mergeHydratedProductOptionDisplayFields(options, skuOptions) {
-      if (!Array.isArray(skuOptions) || skuOptions.length === 0) return options;
-      var displayByItemId = new Map();
-      var _iterator10 = _createForOfIteratorHelper(skuOptions),
-        _step10;
-      try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var option = _step10.value;
-          var key = option === null || option === void 0 ? void 0 : option.option_group_item_id;
-          if (key === undefined || key === null || key === '') continue;
-          displayByItemId.set(String(key), option);
-        }
-      } catch (err) {
-        _iterator10.e(err);
-      } finally {
-        _iterator10.f();
-      }
-      return options.map(function (option) {
-        var _option$option_group_;
-        var display = displayByItemId.get(String((_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : ''));
-        if (!display) return option;
-        return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, option), option.name === undefined && display.name !== undefined ? {
-          name: display.name
-        } : {}), option.group_name === undefined && display.group_name !== undefined ? {
-          group_name: display.group_name
-        } : {}), option.id === undefined && display.id !== undefined ? {
-          id: display.id
-        } : {});
-      });
-    }
-  }, {
-    key: "resolveHydratedProductOptions",
-    value: function resolveHydratedProductOptions(row) {
-      var _row$product_sku,
-        _this12 = this;
-      var skuOptions = (_row$product_sku = row.product_sku) === null || _row$product_sku === void 0 ? void 0 : _row$product_sku.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(function (optionItem) {
-        return _this12.normalizeHydratedProductOptionItem(optionItem || {});
-      });
-    }
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product) {
+      var _this12 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
       }
-      row.product_option_item = this.resolveHydratedProductOptions(row);
+      var productSku = ensureProductSku(row);
+      row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
+        option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
+          return _this12.normalizeHydratedProductOptionItem(optionItem || {});
+        }))
+      });
+      delete row["product_".concat('option', "_item")];
       if (!Array.isArray(row.product_bundle)) row.product_bundle = [];
       if (!row.metadata || _typeof(row.metadata) !== 'object') row.metadata = {};
       if (row.booking_uid && !row.metadata.booking_uid) {
@@ -3497,7 +3471,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var normalized = normalizeOrderProduct(row);
       normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
       var result = _objectSpread(_objectSpread(_objectSpread({}, row), normalized), {}, {
-        product_sku: row.product_sku,
+        product_sku: normalized.product_sku,
         metadata: _objectSpread(_objectSpread({}, row.metadata), normalized.metadata)
       });
       if (result.metadata) delete result.metadata.price_schema_version;
@@ -3552,67 +3526,67 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
         savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
       };
-      var _iterator11 = _createForOfIteratorHelper(productList),
-        _step11;
+      var _iterator10 = _createForOfIteratorHelper(productList),
+        _step10;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var product = _step11.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var product = _step10.value;
           var qty = product.num || 1;
-          var _iterator13 = _createForOfIteratorHelper(product.discount_list || []),
-            _step13;
+          var _iterator12 = _createForOfIteratorHelper(product.discount_list || []),
+            _step12;
           try {
-            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-              var pd = _step13.value;
+            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+              var pd = _step12.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator13.e(err);
+            _iterator12.e(err);
           } finally {
-            _iterator13.f();
+            _iterator12.f();
           }
-          var _iterator14 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step14;
+          var _iterator13 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step13;
           try {
-            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
               var _ref28, _bundle$num;
-              var bundle = _step14.value;
+              var bundle = _step13.value;
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref28 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref28 !== void 0 ? _ref28 : 1) || 1).toNumber();
-              var _iterator15 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step15;
+              var _iterator14 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step14;
               try {
-                for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-                  var _pd = _step15.value;
+                for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+                  var _pd = _step14.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator15.e(err);
+                _iterator14.e(err);
               } finally {
-                _iterator15.f();
+                _iterator14.f();
               }
             }
           } catch (err) {
-            _iterator14.e(err);
+            _iterator13.e(err);
           } finally {
-            _iterator14.f();
+            _iterator13.f();
           }
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator11.f();
+        _iterator10.f();
       }
-      var _iterator12 = _createForOfIteratorHelper(discountList),
-        _step12;
+      var _iterator11 = _createForOfIteratorHelper(discountList),
+        _step11;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var d = _step12.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var d = _step11.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator12.f();
+        _iterator11.f();
       }
     }
   }]);

package/dist/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/dist/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;