@pisell/pisellos 2.1.129 → 2.1.131

package/dist/solution/VenueBooking/utils/timeSlot.js

@@ -1,3 +1,13 @@
+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); }
+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 _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 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; }
+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); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -6,6 +16,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import dayjs from 'dayjs';
+import Decimal from 'decimal.js';
 export function isBusinessHoursCrossDay(config) {
   var _config$businessStart = config.businessStartTime.split(':').map(Number),
     _config$businessStart2 = _slicedToArray(_config$businessStart, 2),
@@ -152,6 +163,160 @@ export function computeSlotStatus(params) {
     remainingCapacity: remaining
   };
 }
+
+/**
+ * 合并多个子商品的同一个时段为一个"外层 slot"。
+ * - status 取优先级最高的（available > partially_occupied > occupied > unavailable / past）
+ * - price 取非空子 slot 中最小的那个
+ * - 其它字段使用第一个参考子 slot（外层 slot 不带 productId）
+ */
+function mergeSubSlots(subSlots) {
+  var priority = {
+    available: 5,
+    partially_occupied: 4,
+    occupied: 3,
+    unavailable: 2,
+    past: 1
+  };
+  var best = subSlots[0];
+  var _iterator5 = _createForOfIteratorHelper(subSlots),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var _priority$slot$status, _priority$best$status;
+      var slot = _step5.value;
+      if (((_priority$slot$status = priority[slot.status]) !== null && _priority$slot$status !== void 0 ? _priority$slot$status : 0) > ((_priority$best$status = priority[best.status]) !== null && _priority$best$status !== void 0 ? _priority$best$status : 0)) best = slot;
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+  var minPrice = null;
+  var _iterator6 = _createForOfIteratorHelper(subSlots),
+    _step6;
+  try {
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var _slot = _step6.value;
+      if (_slot.price == null) continue;
+      var decimal = new Decimal(_slot.price || '0');
+      if (!minPrice || decimal.lt(minPrice)) minPrice = decimal;
+    }
+  } catch (err) {
+    _iterator6.e(err);
+  } finally {
+    _iterator6.f();
+  }
+  return {
+    startTime: best.startTime,
+    endTime: best.endTime,
+    status: best.status,
+    price: minPrice ? minPrice.toFixed(2) : null,
+    resourceId: best.resourceId,
+    resourceFormId: best.resourceFormId,
+    capacity: best.capacity,
+    remainingCapacity: best.remainingCapacity
+  };
+}
+function buildProductSlots(params) {
+  var date = params.date,
+    config = params.config,
+    resource = params.resource,
+    mapping = params.mapping,
+    timeLabels = params.timeLabels,
+    timesForDate = params.timesForDate,
+    events = params.events,
+    resCapacity = params.resCapacity,
+    now = params.now,
+    crossDay = params.crossDay,
+    quotationPriceMap = params.quotationPriceMap,
+    childRawResources = params.childRawResources,
+    childTimesCache = params.childTimesCache,
+    childEventsCache = params.childEventsCache,
+    config_businessStartHour = params.config_businessStartHour;
+  var slots = [];
+  var _iterator7 = _createForOfIteratorHelper(timeLabels),
+    _step7;
+  try {
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var _quotationPriceMap$ge;
+      var label = _step7.value;
+      var _label$split$map = label.split(':').map(Number),
+        _label$split$map2 = _slicedToArray(_label$split$map, 1),
+        h = _label$split$map2[0];
+      var isNextDay = crossDay && h < config_businessStartHour;
+      var slotDate = isNextDay ? dayjs(date).add(1, 'day').format('YYYY-MM-DD') : date;
+      var slotStart = dayjs("".concat(slotDate, " ").concat(label));
+      var slotEnd = slotStart.add(config.slotDurationMinutes, 'minute');
+      var status = void 0;
+      var remainingCapacity = null;
+      if (slotStart.isBefore(now)) {
+        status = 'past';
+      } else if (!isSlotWithinResourceTimes(slotStart, slotEnd, timesForDate)) {
+        status = 'unavailable';
+      } else {
+        var result = computeSlotStatus({
+          slotStart: slotStart,
+          slotEnd: slotEnd,
+          events: events,
+          resourceType: mapping.resourceType,
+          capacity: resCapacity
+        });
+        status = result.status;
+        remainingCapacity = result.remainingCapacity;
+        if (status !== 'occupied' && childRawResources && childRawResources.length) {
+          for (var i = 0; i < childRawResources.length; i++) {
+            var _childTimesCache$i, _childEventsCache$i, _child$capacity;
+            var child = childRawResources[i];
+            var childTimes = (_childTimesCache$i = childTimesCache === null || childTimesCache === void 0 ? void 0 : childTimesCache[i]) !== null && _childTimesCache$i !== void 0 ? _childTimesCache$i : getResourceTimesForDate(child, date, config);
+            var childEvents = (_childEventsCache$i = childEventsCache === null || childEventsCache === void 0 ? void 0 : childEventsCache[i]) !== null && _childEventsCache$i !== void 0 ? _childEventsCache$i : collectEventsForDate(child, date, config);
+            if (!isSlotWithinResourceTimes(slotStart, slotEnd, childTimes)) {
+              status = 'unavailable';
+              remainingCapacity = null;
+              break;
+            }
+            var childType = child.type || 'single';
+            var childResult = computeSlotStatus({
+              slotStart: slotStart,
+              slotEnd: slotEnd,
+              events: childEvents,
+              resourceType: childType,
+              capacity: (_child$capacity = child.capacity) !== null && _child$capacity !== void 0 ? _child$capacity : 1
+            });
+            if (childResult.status === 'occupied') {
+              status = 'occupied';
+              remainingCapacity = 0;
+              break;
+            }
+            if (childResult.status === 'partially_occupied' && status === 'available') {
+              var _remainingCapacity;
+              status = 'partially_occupied';
+              remainingCapacity = Math.min((_remainingCapacity = remainingCapacity) !== null && _remainingCapacity !== void 0 ? _remainingCapacity : childResult.remainingCapacity, childResult.remainingCapacity);
+            }
+          }
+        }
+      }
+      var isBookable = status === 'available' || status === 'partially_occupied';
+      var slotStartStr = slotStart.format('YYYY-MM-DD HH:mm');
+      slots.push({
+        startTime: slotStartStr,
+        endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
+        status: status,
+        price: isBookable ? (_quotationPriceMap$ge = quotationPriceMap === null || quotationPriceMap === void 0 ? void 0 : quotationPriceMap.get("".concat(mapping.productId, ":").concat(slotStartStr))) !== null && _quotationPriceMap$ge !== void 0 ? _quotationPriceMap$ge : mapping.price : null,
+        resourceId: resource.resourceId,
+        resourceFormId: resource.formId,
+        capacity: status === 'past' || status === 'unavailable' ? null : resCapacity,
+        remainingCapacity: remainingCapacity,
+        productId: mapping.productId
+      });
+    }
+  } catch (err) {
+    _iterator7.e(err);
+  } finally {
+    _iterator7.f();
+  }
+  return slots;
+}
 export function buildTimeSlotGrid(params) {
   var date = params.date,
     config = params.config,
@@ -161,83 +326,115 @@ export function buildTimeSlotGrid(params) {
   var timeLabels = generateTimeLabels(config);
   var now = dayjs();
   var crossDay = isBusinessHoursCrossDay(config);
+  var config_businessStartHour = Number(config.businessStartTime.split(':')[0]);
+  var rawResourceById = new Map();
+  var _iterator8 = _createForOfIteratorHelper(rawResources),
+    _step8;
+  try {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var item = _step8.value;
+      rawResourceById.set(item.resourceId, item);
+    }
+  } catch (err) {
+    _iterator8.e(err);
+  } finally {
+    _iterator8.f();
+  }
   var resources = [];
-  var _iterator5 = _createForOfIteratorHelper(rawResources),
-    _step5;
+  var _iterator9 = _createForOfIteratorHelper(rawResources),
+    _step9;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+    var _loop = function _loop() {
       var _resource$capacity;
-      var resource = _step5.value;
-      var mapping = resourceProductMap.get(resource.resourceId);
-      if (!mapping) continue;
+      var resource = _step9.value;
+      var mappings = resourceProductMap.get(resource.resourceId);
+      if (!mappings || !mappings.length) return 1; // continue
       var timesForDate = getResourceTimesForDate(resource, date, config);
       var events = collectEventsForDate(resource, date, config);
       var resCapacity = (_resource$capacity = resource.capacity) !== null && _resource$capacity !== void 0 ? _resource$capacity : 1;
-      var slots = [];
-      var _iterator6 = _createForOfIteratorHelper(timeLabels),
-        _step6;
-      try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var _quotationPriceMap$ge;
-          var label = _step6.value;
-          var _label$split$map = label.split(':').map(Number),
-            _label$split$map2 = _slicedToArray(_label$split$map, 2),
-            h = _label$split$map2[0],
-            m = _label$split$map2[1];
-          var isNextDay = crossDay && h < Number(config.businessStartTime.split(':')[0]);
-          var slotDate = isNextDay ? dayjs(date).add(1, 'day').format('YYYY-MM-DD') : date;
-          var slotStart = dayjs("".concat(slotDate, " ").concat(label));
-          var slotEnd = slotStart.add(config.slotDurationMinutes, 'minute');
-          var status = void 0;
-          var remainingCapacity = null;
-          if (slotStart.isBefore(now)) {
-            status = 'past';
-          } else if (!isSlotWithinResourceTimes(slotStart, slotEnd, timesForDate)) {
-            status = 'unavailable';
-          } else {
-            var result = computeSlotStatus({
-              slotStart: slotStart,
-              slotEnd: slotEnd,
-              events: events,
-              resourceType: mapping.resourceType,
-              capacity: resCapacity
-            });
-            status = result.status;
-            remainingCapacity = result.remainingCapacity;
-          }
-          var isBookable = status === 'available' || status === 'partially_occupied';
-          var slotStartStr = slotStart.format('YYYY-MM-DD HH:mm');
-          slots.push({
-            startTime: slotStartStr,
-            endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
-            status: status,
-            price: isBookable ? (_quotationPriceMap$ge = quotationPriceMap === null || quotationPriceMap === void 0 ? void 0 : quotationPriceMap.get("".concat(mapping.productId, ":").concat(slotStartStr))) !== null && _quotationPriceMap$ge !== void 0 ? _quotationPriceMap$ge : mapping.price : null,
-            resourceId: resource.resourceId,
-            resourceFormId: resource.formId,
-            capacity: status === 'past' || status === 'unavailable' ? null : resCapacity,
-            remainingCapacity: remainingCapacity
+      var combined = resource.combined_resource;
+      var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids) && combined.resource_ids.length);
+      var childRawResources = isCombined ? combined.resource_ids.map(function (id) {
+        return rawResourceById.get(id);
+      }).filter(function (r) {
+        return !!r;
+      }) : undefined;
+      var childTimesCache = childRawResources === null || childRawResources === void 0 ? void 0 : childRawResources.map(function (child) {
+        return getResourceTimesForDate(child, date, config);
+      });
+      var childEventsCache = childRawResources === null || childRawResources === void 0 ? void 0 : childRawResources.map(function (child) {
+        return collectEventsForDate(child, date, config);
+      });
+      var subRows = mappings.map(function (mapping) {
+        var productSlots = buildProductSlots({
+          date: date,
+          config: config,
+          resource: resource,
+          mapping: mapping,
+          timeLabels: timeLabels,
+          timesForDate: timesForDate,
+          events: events,
+          resCapacity: resCapacity,
+          now: now,
+          crossDay: crossDay,
+          quotationPriceMap: quotationPriceMap,
+          childRawResources: childRawResources,
+          childTimesCache: childTimesCache,
+          childEventsCache: childEventsCache,
+          config_businessStartHour: config_businessStartHour
+        });
+        return {
+          productId: mapping.productId,
+          productTitle: mapping.productTitle,
+          price: mapping.price,
+          slots: productSlots
+        };
+      });
+      var hasMultipleProducts = subRows.length > 1;
+      var primary = mappings[0];
+      var outerSlots;
+      if (hasMultipleProducts) {
+        outerSlots = timeLabels.map(function (_label, slotIndex) {
+          var group = subRows.map(function (row) {
+            return row.slots[slotIndex];
           });
-        }
-      } catch (err) {
-        _iterator6.e(err);
-      } finally {
-        _iterator6.f();
+          return mergeSubSlots(group);
+        });
+      } else {
+        outerSlots = subRows[0].slots.map(function (slot) {
+          return _objectSpread(_objectSpread({}, slot), {}, {
+            productId: undefined
+          });
+        });
       }
-      resources.push({
+      var row = {
         resourceId: resource.resourceId,
         resourceFormId: resource.formId,
-        resourceName: resource.main_field || mapping.resourceName,
-        productId: mapping.productId,
-        productTitle: mapping.productTitle,
-        slots: slots
-      });
+        resourceName: resource.main_field || primary.resourceName,
+        productId: primary.productId,
+        productTitle: primary.productTitle,
+        slots: outerSlots
+      };
+      if (hasMultipleProducts) {
+        row.products = subRows;
+        row.hasMultipleProducts = true;
+      }
+      if (isCombined && combined) {
+        row.combinedResource = {
+          resourceIds: _toConsumableArray(combined.resource_ids)
+        };
+      }
+      resources.push(row);
+    };
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      if (_loop()) continue;
     }
 
     // 按 productId 分组排序，确保同一商品的场地连续排列
   } catch (err) {
-    _iterator5.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator5.f();
+    _iterator9.f();
   }
   var productOrder = new Map();
   for (var _i = 0, _resources = resources; _i < _resources.length; _i++) {

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

@@ -1,7 +1,8 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams, UpdateProductInOrderParams } from './types';
 import { CartItem } from '../Cart/types';
+import { type SubmitPayloadEnhancer } from './utils';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -57,6 +58,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     persistTempOrder(): void;
     private createDefaultTempOrderInstance;
     ensureTempOrder(): ScanOrderTempOrder;
+    restoreOrder(): ScanOrderTempOrder;
     getTempOrder(): ScanOrderTempOrder | null;
     addNewOrder(): Promise<ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
@@ -66,13 +68,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): Promise<ScanOrderSummary | null>;
     getScanOrderSummary(): Promise<ScanOrderSummary>;
     updateTempOrderNote(note: string): string;
+    updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    updateProductInOrder(params: {
-        product_id: number | null;
-        product_variant_id: number;
-        updates: Partial<ScanOrderOrderProduct>;
-    }): Promise<ScanOrderOrderProduct[]>;
+    updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     submitTempOrder<T = any>(params?: {
         cacheId?: string;
@@ -80,6 +79,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         businessCode?: string;
         channel?: string;
         type?: string;
+        enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";
@@ -115,3 +115,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfoByRemote(order_id: number): Promise<any>;
     getLastOrderInfo(): Record<string, any> | undefined;
 }
+export type { UpdateProductInOrderParams } from './types';

package/lib/modules/Order/index.js

@@ -285,6 +285,31 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.window.localStorage.removeItem(key);
         return;
       }
+      if (Array.isArray(parsedData.products)) {
+        for (let i = 0; i < parsedData.products.length; i++) {
+          const p = parsedData.products[i];
+          if (!p || typeof p !== "object")
+            continue;
+          if (!Array.isArray(p.product_option_item)) {
+            p.product_option_item = [];
+          }
+          if (!Array.isArray(p.product_bundle)) {
+            p.product_bundle = [];
+          }
+          const row = p;
+          if (typeof row.identity_key !== "string" || row.identity_key.length === 0) {
+            const newKey = (0, import_utils.createUuidV4)();
+            row.identity_key = newKey;
+            if (!row.metadata || typeof row.metadata !== "object") {
+              row.metadata = {};
+            }
+            if (!row.metadata.unique_identification_number) {
+              row.metadata.unique_identification_number = newKey;
+            }
+          }
+          parsedData.products[i] = (0, import_utils3.normalizeOrderProduct)(row);
+        }
+      }
       this.store.tempOrder = parsedData;
     } catch {
       (_b = (_a = this.window) == null ? void 0 : _a.localStorage) == null ? void 0 : _b.removeItem(key);
@@ -313,6 +338,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return newOrder;
   }
+  restoreOrder() {
+    const freshTempOrder = this.createDefaultTempOrderInstance();
+    this.store.tempOrder = freshTempOrder;
+    this.persistTempOrder();
+    return freshTempOrder;
+  }
   getTempOrder() {
     return this.store.tempOrder;
   }
@@ -373,6 +404,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.note;
   }
+  updateTempOrderBuzzer(buzzer) {
+    const tempOrder = this.ensureTempOrder();
+    tempOrder.buzzer = String(buzzer || "");
+    this.persistTempOrder();
+    return tempOrder.buzzer;
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     const tempOrder = this.ensureTempOrder();
     tempOrder.contacts_info = Array.isArray(contactsInfo) ? contactsInfo : [];
@@ -382,21 +419,57 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── TempOrder: 商品 CRUD ───
   async addProductToOrder(product) {
     const tempOrder = this.ensureTempOrder();
-    const normalizedProduct = (0, import_utils3.normalizeOrderProduct)(product);
-    const productIndex = (0, import_utils3.getProductIdentityIndex)(
-      tempOrder.products,
-      normalizedProduct
-    );
-    if (productIndex === -1) {
-      tempOrder.products.push(normalizedProduct);
+    const hasExplicitIdentityKey = typeof product.identity_key === "string" && product.identity_key.length > 0;
+    if (hasExplicitIdentityKey) {
+      const normalizedProduct = (0, import_utils3.normalizeOrderProduct)(product);
+      const productIndex = (0, import_utils3.getProductIdentityIndex)(
+        tempOrder.products,
+        normalizedProduct
+      );
+      if (productIndex === -1) {
+        tempOrder.products.push(normalizedProduct);
+      } else {
+        const targetProduct = tempOrder.products[productIndex];
+        tempOrder.products[productIndex] = {
+          ...targetProduct,
+          ...normalizedProduct,
+          num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num),
+          _origin: normalizedProduct._origin || targetProduct._origin
+        };
+      }
     } else {
-      const targetProduct = tempOrder.products[productIndex];
-      tempOrder.products[productIndex] = {
-        ...targetProduct,
-        ...normalizedProduct,
-        num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num),
-        _origin: normalizedProduct._origin || targetProduct._origin
-      };
+      const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+        product.product_option_item,
+        product.product_bundle
+      );
+      const matchedIndex = tempOrder.products.findIndex((item) => {
+        if (item.product_id !== product.product_id)
+          return false;
+        if (item.product_variant_id !== product.product_variant_id)
+          return false;
+        const existedFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+          item.product_option_item,
+          item.product_bundle
+        );
+        return existedFingerprint === incomingFingerprint;
+      });
+      if (matchedIndex === -1) {
+        const normalizedProduct = (0, import_utils3.normalizeOrderProduct)(product);
+        tempOrder.products.push(normalizedProduct);
+      } else {
+        const targetProduct = tempOrder.products[matchedIndex];
+        const normalizedProduct = (0, import_utils3.normalizeOrderProduct)({
+          ...product,
+          identity_key: targetProduct.identity_key
+        });
+        tempOrder.products[matchedIndex] = {
+          ...targetProduct,
+          ...normalizedProduct,
+          identity_key: targetProduct.identity_key,
+          num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num),
+          _origin: normalizedProduct._origin || targetProduct._origin
+        };
+      }
     }
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
@@ -404,12 +477,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return tempOrder.products;
   }
   async updateProductInOrder(params) {
-    const { product_id, product_variant_id, updates } = params;
+    var _a, _b, _c;
+    const {
+      product_id,
+      product_variant_id,
+      updates,
+      identity_key,
+      product_option_item,
+      product_bundle
+    } = params;
     const tempOrder = this.ensureTempOrder();
-    const productIndex = (0, import_utils3.getProductIdentityIndex)(tempOrder.products, {
+    const identityLookup = {
       product_id,
       product_variant_id
-    });
+    };
+    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_bundle !== void 0)
+      identityLookup.product_bundle = product_bundle;
+    const productIndex = (0, import_utils3.getProductIdentityIndex)(tempOrder.products, identityLookup);
     if (productIndex === -1) {
       throw new Error("[Order] 目标商品不存在，无法更新");
     }
@@ -421,7 +509,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product_variant_id
     };
     nextProduct.num = (0, import_utils3.getSafeProductNum)(nextProduct.num);
-    tempOrder.products[productIndex] = nextProduct;
+    const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
+    const callerUpdatesMainMeta = ((_a = updates == null ? void 0 : updates.metadata) == null ? void 0 : _a.main_product_selling_price) !== void 0 || ((_b = updates == null ? void 0 : updates.metadata) == null ? void 0 : _b.main_product_original_price) !== void 0 || ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.source_product_price) !== void 0;
+    if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      const existedMeta = nextProduct.metadata || {};
+      nextProduct.metadata = { ...existedMeta };
+      delete nextProduct.metadata.source_product_price;
+      delete nextProduct.metadata.main_product_selling_price;
+      delete nextProduct.metadata.main_product_original_price;
+      delete nextProduct.metadata.price_schema_version;
+    }
+    tempOrder.products[productIndex] = (0, import_utils3.normalizeOrderProduct)(nextProduct);
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -429,18 +527,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async removeProductFromOrder(identity) {
     const tempOrder = this.ensureTempOrder();
-    const beforeProducts = tempOrder.products;
     tempOrder.products = tempOrder.products.filter(
       (item) => !(0, import_utils3.isIdentityMatch)(item, identity)
     );
-    const removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
-    if (removedByStrictIdentity === 0 && identity.identity_key) {
-      tempOrder.products = tempOrder.products.filter((item) => {
-        const isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
-        const hasNoIdentityKey = !item.identity_key;
-        return !(isSameProduct && hasNoIdentityKey);
-      });
-    }
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -457,11 +546,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       platform: params == null ? void 0 : params.platform,
       businessCode: params == null ? void 0 : params.businessCode,
       channel: params == null ? void 0 : params.channel,
-      type: params == null ? void 0 : params.type
+      type: params == null ? void 0 : params.type,
+      enhance: params == null ? void 0 : params.enhancePayload
     });
     let result;
     if (tempOrder.order_id) {
-      const products = (0, import_utils.formatV1Product)(payload.products);
+      const products = (0, import_utils.filterProductsForScanOrderMore)(payload.products);
       const moreResult = await this.scanOrderMore({
         query: {
           order_id: tempOrder.order_id,
@@ -687,7 +777,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async submitScanOrder(params) {
     const { url, query } = params;
     const fetchUrl = url || "/order/sales/checkout";
-    return this.request.post(fetchUrl, query);
+    return this.request.post(fetchUrl, query, { customToast: () => {
+    } });
   }
   async scanOrderMore(params) {
     const { url, query } = params;
@@ -696,7 +787,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       products: query.products,
       request_unique_idempotency_token: query.request_unique_idempotency_token
     };
-    return this.request.put(fetchUrl, requestBody);
+    return this.request.put(fetchUrl, requestBody, { customToast: () => {
+    } });
   }
   // TODO 获取详情的接口
   async getOrderInfoByRemote(order_id) {