@pisell/pisellos 0.10.6 → 0.10.7

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

@@ -237,6 +237,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private sanitizeOrderProductForTempOrder;
     private sanitizeTempOrderProducts;
     private ensureExtend;
+    private repairDuplicateProductLineIdentities;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
     /**
@@ -497,7 +498,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     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;

package/dist/modules/Order/index.js

@@ -41,7 +41,7 @@ import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getO
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
-import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
+import { getOrderCollectionPersistentId, getOrderCollectionUid, normalizeOrderCollections, repairDuplicateProductLineIdentities as repairDuplicateOrderProductLineIdentities, setOrderCollectionUid } from "./utils/orderCollectionIdentity";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -890,6 +890,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             discount_list: normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(mergedProduct.discount_list, mergedProduct.num))
           });
         }));
+        this.repairDuplicateProductLineIdentities(tempOrder);
       }
       if (result !== null && result !== void 0 && result.discountList) {
         var _this$store$discount15;
@@ -2608,6 +2609,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return tempOrder._extend;
     }
+  }, {
+    key: "repairDuplicateProductLineIdentities",
+    value: function repairDuplicateProductLineIdentities(tempOrder) {
+      var _tempOrder$_extend7;
+      var result = repairDuplicateOrderProductLineIdentities(tempOrder.products, (_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.productsByUid);
+      if (!result.repairs.length) return;
+      tempOrder.products = result.products;
+      if (result.productsByUid) {
+        this.ensureExtend(tempOrder).productsByUid = result.productsByUid;
+      }
+      this.logWarning('Repaired duplicate product line identities', {
+        repairCount: result.repairs.length,
+        repairs: result.repairs
+      });
+    }
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
@@ -2880,9 +2896,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyOrderProductsDepositSummary",
     value: function applyOrderProductsDepositSummary(tempOrder, summary) {
-      var _tempOrder$_extend7;
+      var _tempOrder$_extend8;
       var depositSummary = calculateOrderProductsDeposit(tempOrder.products || [], {
-        productsByUid: (_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.productsByUid
+        productsByUid: (_tempOrder$_extend8 = tempOrder._extend) === null || _tempOrder$_extend8 === void 0 ? void 0 : _tempOrder$_extend8.productsByUid
       });
       var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       var currentStructuralFingerprint = manualDepositOverride ? this.buildOrderProductsStructuralFingerprint(tempOrder.products) : '';
@@ -4557,6 +4573,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             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_sku = params.product_sku, product_bundle = params.product_bundle;
               tempOrder = this.ensureTempOrder();
+              this.repairDuplicateProductLineIdentities(tempOrder);
               identityLookup = {
                 product_id: product_id,
                 product_variant_id: product_variant_id
@@ -4582,11 +4599,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 productIndex = getProductIdentityIndex(tempOrder.products, identityLookup);
               }
               if (!(productIndex === -1)) {
-                _context27.next = 12;
+                _context27.next = 13;
                 break;
               }
               throw new Error('[Order] 目标商品不存在，无法更新数量');
-            case 12:
+            case 13:
               targetProduct = tempOrder.products[productIndex];
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
@@ -4596,22 +4613,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
-              _context27.next = 18;
+              _context27.next = 19;
               return this.applyPromotion();
-            case 18:
+            case 19:
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context27.next = 22;
+              _context27.next = 23;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 22:
+            case 23:
               this.persistTempOrder();
               this.logInfo('updateOrderProductQuantity success', {
                 params: params
               });
               return _context27.abrupt("return", tempOrder.products);
-            case 25:
+            case 26:
             case "end":
               return _context27.stop();
           }
@@ -4704,12 +4721,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              this.repairDuplicateProductLineIdentities(tempOrder);
               if (identities.length) {
-                _context30.next = 3;
+                _context30.next = 4;
                 break;
               }
               return _context30.abrupt("return", tempOrder.products);
-            case 3:
+            case 4:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
               matchedProducts = productsBeforeRemove.filter(function (item) {
@@ -4731,7 +4749,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context30.prev = 11;
+              _context30.prev = 12;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
@@ -4766,33 +4784,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop3);
               });
               _iterator21.s();
-            case 14:
+            case 15:
               if ((_step21 = _iterator21.n()).done) {
-                _context30.next = 20;
+                _context30.next = 21;
                 break;
               }
-              return _context30.delegateYield(_loop3(), "t0", 16);
-            case 16:
+              return _context30.delegateYield(_loop3(), "t0", 17);
+            case 17:
               if (!_context30.t0) {
-                _context30.next = 18;
+                _context30.next = 19;
                 break;
               }
-              return _context30.abrupt("continue", 18);
-            case 18:
-              _context30.next = 14;
+              return _context30.abrupt("continue", 19);
+            case 19:
+              _context30.next = 15;
               break;
-            case 20:
-              _context30.next = 25;
+            case 21:
+              _context30.next = 26;
               break;
-            case 22:
-              _context30.prev = 22;
-              _context30.t1 = _context30["catch"](11);
+            case 23:
+              _context30.prev = 23;
+              _context30.t1 = _context30["catch"](12);
               _iterator21.e(_context30.t1);
-            case 25:
-              _context30.prev = 25;
+            case 26:
+              _context30.prev = 26;
               _iterator21.f();
-              return _context30.finish(25);
-            case 28:
+              return _context30.finish(26);
+            case 29:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
@@ -4802,18 +4820,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return !(isAddTimeProduct && lineBookingUid !== undefined && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
                 });
               }
-              _context30.next = 31;
+              _context30.next = 32;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 31:
+            case 32:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
               return _context30.abrupt("return", tempOrder.products);
-            case 33:
+            case 34:
             case "end":
               return _context30.stop();
           }
-        }, _callee27, this, [[11, 22, 25, 28]]);
+        }, _callee27, this, [[12, 23, 26, 29]]);
       }));
       function removeProductsFromOrder(_x34) {
         return _removeProductsFromOrder.apply(this, arguments);
@@ -5911,26 +5929,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(record, options) {
-        var _this$store$discount22;
-        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, nextTempOrder, _this$store$discount20, _this$store$discount21, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount23, _this$store$discount24;
+        var _sourceRaw$_extend, _this$store$discount22;
+        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, nextTempOrder, _this$store$discount20, _this$store$discount21, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount23, _this$store$discount24;
         return _regeneratorRuntime().wrap(function _callee44$(_context47) {
           while (1) switch (_context47.prev = _context47.next) {
             case 0:
               sourceRaw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
-              identityReadySource = this.seedAnonymousBookingUidsFromProducts(sourceRaw);
+              duplicateProductIdentityRepair = repairDuplicateOrderProductLineIdentities(Array.isArray(sourceRaw.products) ? sourceRaw.products : [], (_sourceRaw$_extend = sourceRaw._extend) === null || _sourceRaw$_extend === void 0 ? void 0 : _sourceRaw$_extend.productsByUid);
+              duplicateIdentityReadySource = duplicateProductIdentityRepair.repairs.length ? _objectSpread(_objectSpread({}, sourceRaw), {}, {
+                products: duplicateProductIdentityRepair.products
+              }, duplicateProductIdentityRepair.productsByUid ? {
+                _extend: _objectSpread(_objectSpread({}, sourceRaw._extend || {}), {}, {
+                  productsByUid: duplicateProductIdentityRepair.productsByUid
+                })
+              } : {}) : sourceRaw;
+              identityReadySource = this.seedAnonymousBookingUidsFromProducts(duplicateIdentityReadySource);
               normalizedCollections = normalizeOrderCollections(identityReadySource);
               raw = normalizedCollections.order;
-              hasIdentityChanges = Object.values(normalizedCollections.stats).some(function (stats) {
+              hasIdentityChanges = duplicateProductIdentityRepair.repairs.length > 0 || Object.values(normalizedCollections.stats).some(function (stats) {
                 return stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
               });
               if (hasIdentityChanges) {
                 identityLogMetadata = {
                   collections: normalizedCollections.stats,
-                  uidRemapCount: normalizedCollections.uidRemaps.length
+                  uidRemapCount: normalizedCollections.uidRemaps.length,
+                  duplicateProductUidRepairCount: duplicateProductIdentityRepair.repairs.length
                 };
                 hasIdentityWarnings = Object.values(normalizedCollections.stats).some(function (stats) {
                   return stats.uidConflictCount > 0 || stats.anonymousRowCount > 0;
-                });
+                }) || duplicateProductIdentityRepair.repairs.length > 0;
                 if (hasIdentityWarnings) {
                   this.logWarning('Normalized hydrated order collection identities', identityLogMetadata);
                 } else {
@@ -5943,7 +5970,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.tempOrder = nextTempOrder;
               if (!isSessionStorageHydrate) {
-                _context47.next = 27;
+                _context47.next = 29;
                 break;
               }
               // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
@@ -5959,24 +5986,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextTempOrder.discount_list = restoredSessionDiscounts;
               this.store.summary = createEmptySummary();
               this.store.lastOrderInfo = undefined;
-              _context47.next = 20;
-              return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 20:
               _context47.next = 22;
-              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(cloneDeep(restoredSessionDiscounts));
+              return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
             case 22:
+              _context47.next = 24;
+              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(cloneDeep(restoredSessionDiscounts));
+            case 24:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context47.next = 25;
+                _context47.next = 27;
                 break;
               }
-              _context47.next = 25;
+              _context47.next = 27;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 25:
+            case 27:
               this.persistTempOrder();
               return _context47.abrupt("return", nextTempOrder);
-            case 27:
+            case 29:
               // Server list compatibility may synthesize order_id from external_sale_number; tempOrder must not.
               sourceLastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
               isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
@@ -6021,28 +6048,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context47.next = 50;
+                _context47.next = 52;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context47.next = 48;
-              return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList(nextDiscounts);
-            case 48:
               _context47.next = 50;
-              return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setDiscountList(nextDiscounts);
+              return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList(nextDiscounts);
             case 50:
+              _context47.next = 52;
+              return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setDiscountList(nextDiscounts);
+            case 52:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context47.next = 53;
+                _context47.next = 55;
                 break;
               }
-              _context47.next = 53;
+              _context47.next = 55;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 53:
+            case 55:
               this.persistTempOrder();
               return _context47.abrupt("return", nextTempOrder);
-            case 55:
+            case 57:
             case "end":
               return _context47.stop();
           }

package/dist/modules/Order/utils/orderCollectionIdentity.d.ts

@@ -24,6 +24,16 @@ export interface NormalizeOrderCollectionsResult<T> {
     stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
     uidRemaps: OrderCollectionUidRemap[];
 }
+export interface ProductLineIdentityRepair {
+    index: number;
+    from: string;
+    to: string;
+}
+export interface RepairDuplicateProductLineIdentitiesResult<T> {
+    products: T[];
+    productsByUid?: Record<string, Record<string, any>>;
+    repairs: ProductLineIdentityRepair[];
+}
 export declare function createUuidV4(): string;
 export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
 export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
@@ -31,6 +41,11 @@ export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: u
 export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
 export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
 export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export declare function repairDuplicateProductLineIdentities<T extends Record<string, any>>(products: T[] | null | undefined, productsByUid?: Record<string, Record<string, any>> | null): RepairDuplicateProductLineIdentitiesResult<T>;
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
  */

package/dist/modules/Order/utils/orderCollectionIdentity.js

@@ -74,6 +74,81 @@ export function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
+function getGoodPassResourceId(product) {
+  var _ref, _ref2, _goodPass$discount$re, _goodPass$discount;
+  var goodPass = (product.discount_list || []).find(function (item) {
+    var _item$discount, _item$discount2;
+    var type = (item === null || item === void 0 ? void 0 : item.type) || (item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.type) || (item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.tag);
+    return type === 'good_pass';
+  });
+  if (!goodPass) return null;
+  var resourceId = (_ref = (_ref2 = (_goodPass$discount$re = (_goodPass$discount = goodPass.discount) === null || _goodPass$discount === void 0 ? void 0 : _goodPass$discount.resource_id) !== null && _goodPass$discount$re !== void 0 ? _goodPass$discount$re : goodPass.resource_id) !== null && _ref2 !== void 0 ? _ref2 : goodPass.discount_id) !== null && _ref !== void 0 ? _ref : goodPass.id;
+  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+}
+function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
+  var encodedOriginalUid = encodeURIComponent(originalUid);
+  var resourceId = getGoodPassResourceId(product);
+  if (resourceId) {
+    return "os-split:product:".concat(encodedOriginalUid, ":good-pass:").concat(encodeURIComponent(resourceId), ":").concat(duplicateOrdinal);
+  }
+  return "os-split:product:".concat(encodedOriginalUid, ":duplicate:").concat(duplicateOrdinal);
+}
+
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export function repairDuplicateProductLineIdentities(products, productsByUid) {
+  var repairedProducts = cloneDeep(products || []);
+  var repairedProductsByUid = productsByUid ? cloneDeep(productsByUid) : undefined;
+  var occupiedUids = new Set(repairedProducts.map(function (product) {
+    return getOrderCollectionUid('product', product);
+  }).filter(function (uid) {
+    return Boolean(uid);
+  }));
+  Object.keys(repairedProductsByUid || {}).forEach(function (uid) {
+    return occupiedUids.add(uid);
+  });
+  var occurrences = new Map();
+  var repairs = [];
+  repairedProducts.forEach(function (product, index) {
+    var originalUid = getOrderCollectionUid('product', product);
+    if (!originalUid) return;
+    var occurrence = (occurrences.get(originalUid) || 0) + 1;
+    occurrences.set(originalUid, occurrence);
+    if (occurrence === 1) return;
+    var duplicateOrdinal = occurrence - 1;
+    var baseCandidate = buildSplitProductUid(originalUid, product, duplicateOrdinal);
+    var nextUid = baseCandidate;
+    var conflictOrdinal = 1;
+    while (occupiedUids.has(nextUid)) {
+      nextUid = "".concat(baseCandidate, ":conflict:").concat(conflictOrdinal);
+      conflictOrdinal += 1;
+    }
+    var repairedProduct = setOrderCollectionUid('product', product, nextUid);
+    repairedProduct.identity_key = nextUid;
+    repairedProducts[index] = repairedProduct;
+    occupiedUids.add(nextUid);
+    repairs.push({
+      index: index,
+      from: originalUid,
+      to: nextUid
+    });
+    var runtimeSource = repairedProductsByUid === null || repairedProductsByUid === void 0 ? void 0 : repairedProductsByUid[originalUid];
+    if (runtimeSource && repairedProductsByUid) {
+      repairedProductsByUid[nextUid] = _objectSpread(_objectSpread({}, cloneDeep(runtimeSource)), runtimeSource.rowKey !== undefined ? {
+        rowKey: nextUid
+      } : {});
+    }
+  });
+  return _objectSpread(_objectSpread({
+    products: repairedProducts
+  }, repairedProductsByUid ? {
+    productsByUid: repairedProductsByUid
+  } : {}), {}, {
+    repairs: repairs
+  });
+}
 
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 2 | 1 | 6 | 4 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -447,7 +447,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/index.js

@@ -402,35 +402,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: function () {
       var _configureIdGeneratorFromOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _openDataConfig, _openDataConfig2, _openDataConfig3, _openDataConfig4, _openDataConfig5, _openDataConfig6;
-        var openDataConfig, idGenerator, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode;
+        var idGenerator, openDataConfig, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               // 业务码切换或配置失败时不能复用上一次初始化的短号。
               this.setPaymentNumberDevicePrefix(null);
-              openDataConfig = null;
-              _context5.prev = 2;
-              _context5.next = 5;
-              return this.loadOpenDataConfig();
-            case 5:
-              openDataConfig = _context5.sent;
-              _context5.next = 12;
-              break;
-            case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](2);
-              console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
-              return _context5.abrupt("return");
-            case 12:
-              // if (!openDataConfig) return;
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator !== null && idGenerator !== void 0 && idGenerator.configure) {
-                _context5.next = 16;
+                _context5.next = 5;
                 break;
               }
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context5.abrupt("return");
+            case 5:
+              openDataConfig = null;
+              _context5.prev = 6;
+              _context5.next = 9;
+              return this.loadOpenDataConfig();
+            case 9:
+              openDataConfig = _context5.sent;
+              _context5.next = 16;
+              break;
+            case 12:
+              _context5.prev = 12;
+              _context5.t0 = _context5["catch"](6);
+              console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
+              return _context5.abrupt("return");
             case 16:
+              // if (!openDataConfig) return;
               receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 5);
               receiptSequenceStart = this.normalizePositiveInteger((_openDataConfig2 = openDataConfig) === null || _openDataConfig2 === void 0 ? void 0 : _openDataConfig2['sale.short_number_start_number'], 1);
               prefix = this.normalizeIdPrefix((_openDataConfig3 = openDataConfig) === null || _openDataConfig3 === void 0 ? void 0 : _openDataConfig3['sale.short_number_prefix'], '');
@@ -477,7 +477,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[2, 8], [30, 35]]);
+        }, _callee5, this, [[6, 12], [30, 35]]);
       }));
       function configureIdGeneratorFromOpenData() {
         return _configureIdGeneratorFromOpenData.apply(this, arguments);

package/dist/solution/UnifiedBookingSales/index.d.ts

@@ -63,8 +63,19 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private openDataTarget;
     private loadOpenDataInFlight;
     private loadOpenDataInFlightTarget;
+    protected getSubmitOrderSalesChannel(): string;
     protected isSessionStoragePersistEnabled(): boolean;
     protected shouldUseSessionStorageForSubModule(moduleName?: string): boolean;
+    /**
+     * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+     * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+     */
+    getSessionStateValue<T = unknown>(key: string): T | undefined;
+    /**
+     * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+     * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+     */
+    setSessionStateValue(key: string, value: unknown): void;
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。

package/dist/solution/UnifiedBookingSales/index.js

@@ -40,6 +40,9 @@ import { BookingTicket } from "../BookingTicket";
 export * from "./types";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow'];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
+function isRecord(value) {
+  return !!value && _typeof(value) === 'object' && !Array.isArray(value);
+}
 function pickLocalizedText(value) {
   if (!value) return undefined;
   if (typeof value === 'string') return value;
@@ -520,10 +523,17 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     return _this;
   }
   _createClass(UnifiedBookingSalesImpl, [{
+    key: "getSubmitOrderSalesChannel",
+    value: function getSubmitOrderSalesChannel() {
+      var _this$otherParams$cha, _this$otherParams;
+      var channel = String((_this$otherParams$cha = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
+      return channel || _get(_getPrototypeOf(UnifiedBookingSalesImpl.prototype), "getSubmitOrderSalesChannel", this).call(this);
+    }
+  }, {
     key: "isSessionStoragePersistEnabled",
     value: function isSessionStoragePersistEnabled() {
-      var _this$otherParams;
-      return Boolean(this.cacheId && ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.enableSessionStoragePersist) === true);
+      var _this$otherParams2;
+      return Boolean(this.cacheId && ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.enableSessionStoragePersist) === true);
     }
   }, {
     key: "shouldUseSessionStorageForSubModule",
@@ -531,6 +541,49 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
       return this.isSessionStoragePersistEnabled() && moduleName === 'order';
     }
 
+    /**
+     * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+     * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+     */
+  }, {
+    key: "getSessionStateValue",
+    value: function getSessionStateValue(key) {
+      if (!key || !this.isSessionStoragePersistEnabled()) return undefined;
+      var cacheData = this.readSessionCacheData();
+      var solutionCache = cacheData === null || cacheData === void 0 ? void 0 : cacheData[this.name];
+      if (!isRecord(solutionCache) || !isRecord(solutionCache.sessionState)) {
+        return undefined;
+      }
+      return solutionCache.sessionState[key];
+    }
+
+    /**
+     * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+     * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+     */
+  }, {
+    key: "setSessionStateValue",
+    value: function setSessionStateValue(key, value) {
+      if (!key || !this.isSessionStoragePersistEnabled()) return;
+      var cacheData = this.readSessionCacheData();
+      var solutionCache = cacheData === null || cacheData === void 0 ? void 0 : cacheData[this.name];
+      var currentSessionState = isRecord(solutionCache) && isRecord(solutionCache.sessionState) ? solutionCache.sessionState : {};
+      var nextSessionState = _objectSpread({}, currentSessionState);
+      if (value === undefined) {
+        delete nextSessionState[key];
+      } else {
+        nextSessionState[key] = value;
+      }
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.name,
+        store: {
+          sessionState: nextSessionState
+        },
+        cacheKey: ['sessionState']
+      });
+    }
+
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
@@ -538,8 +591,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
   }, {
     key: "shouldUseCheckoutSyncTask",
     value: function shouldUseCheckoutSyncTask() {
-      var _this$otherParams2;
-      var configured = (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.checkoutSyncTaskEnabled;
+      var _this$otherParams3;
+      var configured = (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.checkoutSyncTaskEnabled;
       return typeof configured === 'boolean' ? configured : false;
     }
 
@@ -697,8 +750,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
   }, {
     key: "isAuthenticatedCustomerUserPlatform",
     value: function isAuthenticatedCustomerUserPlatform() {
-      var _this$otherParams3;
-      var platform = String(((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform) || '').toLowerCase();
+      var _this$otherParams4;
+      var platform = String(((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.platform) || '').toLowerCase();
       return platform === 'pc' || platform === 'h5';
     }
   }, {
@@ -877,13 +930,13 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "getOpenData",
     value: function () {
       var _getOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _this$otherParams4, _this$otherParams5, _this$store$openData;
+        var _this$otherParams5, _this$otherParams6, _this$store$openData;
         var businessCode, channel, target, cachedData;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              businessCode = String(((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) || '').trim();
-              channel = String(((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.channel) || '').trim();
+              businessCode = String(((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.businessCode) || '').trim();
+              channel = String(((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.channel) || '').trim();
               if (!(!businessCode || !channel)) {
                 _context6.next = 4;
                 break;

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

@@ -1,51 +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,
-  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_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,
-  ITEM_REWARD_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -237,6 +237,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private sanitizeOrderProductForTempOrder;
     private sanitizeTempOrderProducts;
     private ensureExtend;
+    private repairDuplicateProductLineIdentities;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
     /**
@@ -497,7 +498,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     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;

package/lib/modules/Order/index.js

@@ -694,6 +694,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           };
         })
       );
+      this.repairDuplicateProductLineIdentities(tempOrder);
     }
     if (result == null ? void 0 : result.discountList) {
       OrderModule.populateSavedAmounts(
@@ -1931,6 +1932,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return tempOrder._extend;
   }
+  repairDuplicateProductLineIdentities(tempOrder) {
+    var _a;
+    const result = (0, import_orderCollectionIdentity.repairDuplicateProductLineIdentities)(
+      tempOrder.products,
+      (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid
+    );
+    if (!result.repairs.length)
+      return;
+    tempOrder.products = result.products;
+    if (result.productsByUid) {
+      this.ensureExtend(tempOrder).productsByUid = result.productsByUid;
+    }
+    this.logWarning("Repaired duplicate product line identities", {
+      repairCount: result.repairs.length,
+      repairs: result.repairs
+    });
+  }
   captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
     var _a;
     const uid = existedUid || this.getProductUid(normalizedProduct);
@@ -3484,6 +3502,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       product_bundle
     } = params;
     const tempOrder = this.ensureTempOrder();
+    this.repairDuplicateProductLineIdentities(tempOrder);
     const identityLookup = {
       product_id,
       product_variant_id
@@ -3594,6 +3613,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async removeProductsFromOrder(identities) {
     var _a, _b, _c, _d;
     const tempOrder = this.ensureTempOrder();
+    this.repairDuplicateProductLineIdentities(tempOrder);
     if (!identities.length) {
       return tempOrder.products;
     }
@@ -4300,24 +4320,39 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 例如数组字段、商品行唯一值、价格 metadata、summary 派生状态和 _extend。
    */
   async hydrateTempOrderFromRecord(record, options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const sourceRaw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
+    const duplicateProductIdentityRepair = (0, import_orderCollectionIdentity.repairDuplicateProductLineIdentities)(
+      Array.isArray(sourceRaw.products) ? sourceRaw.products : [],
+      (_a = sourceRaw._extend) == null ? void 0 : _a.productsByUid
+    );
+    const duplicateIdentityReadySource = duplicateProductIdentityRepair.repairs.length ? {
+      ...sourceRaw,
+      products: duplicateProductIdentityRepair.products,
+      ...duplicateProductIdentityRepair.productsByUid ? {
+        _extend: {
+          ...sourceRaw._extend || {},
+          productsByUid: duplicateProductIdentityRepair.productsByUid
+        }
+      } : {}
+    } : sourceRaw;
     const identityReadySource = this.seedAnonymousBookingUidsFromProducts(
-      sourceRaw
+      duplicateIdentityReadySource
     );
     const normalizedCollections = (0, import_orderCollectionIdentity.normalizeOrderCollections)(identityReadySource);
     const raw = normalizedCollections.order;
-    const hasIdentityChanges = Object.values(normalizedCollections.stats).some(
+    const hasIdentityChanges = duplicateProductIdentityRepair.repairs.length > 0 || Object.values(normalizedCollections.stats).some(
       (stats) => stats.backfilledUidCount > 0 || stats.collapsedDuplicateCount > 0 || stats.uidConflictCount > 0 || stats.anonymousRowCount > 0
     );
     if (hasIdentityChanges) {
       const identityLogMetadata = {
         collections: normalizedCollections.stats,
-        uidRemapCount: normalizedCollections.uidRemaps.length
+        uidRemapCount: normalizedCollections.uidRemaps.length,
+        duplicateProductUidRepairCount: duplicateProductIdentityRepair.repairs.length
       };
       const hasIdentityWarnings = Object.values(normalizedCollections.stats).some(
         (stats) => stats.uidConflictCount > 0 || stats.anonymousRowCount > 0
-      );
+      ) || duplicateProductIdentityRepair.repairs.length > 0;
       if (hasIdentityWarnings) {
         this.logWarning(
           "Normalized hydrated order collection identities",
@@ -4348,10 +4383,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       nextTempOrder.discount_list = restoredSessionDiscounts;
       this.store.summary = (0, import_utils.createEmptySummary)();
       this.store.lastOrderInfo = void 0;
-      await ((_a = this.store.discount) == null ? void 0 : _a.setOriginalDiscountList(
+      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(
         (0, import_lodash_es.cloneDeep)(restoredSessionDiscounts)
       ));
-      await ((_b = this.store.discount) == null ? void 0 : _b.setDiscountList(
+      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(
         (0, import_lodash_es.cloneDeep)(restoredSessionDiscounts)
       ));
       if (options == null ? void 0 : options.recalcOnHydrate) {
@@ -4394,7 +4429,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.syncState = "local";
     }
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-    const currentDiscounts = typeof ((_c = this.store.discount) == null ? void 0 : _c.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
+    const currentDiscounts = typeof ((_d = this.store.discount) == null ? void 0 : _d.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
     const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
     const hydratedDiscountIds = new Set(
       hydratedEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
@@ -4412,8 +4447,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         nextTempOrder.products,
         nextDiscounts
       );
-      await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(nextDiscounts));
-      await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(nextDiscounts));
+      await ((_e = this.store.discount) == null ? void 0 : _e.setOriginalDiscountList(nextDiscounts));
+      await ((_f = this.store.discount) == null ? void 0 : _f.setDiscountList(nextDiscounts));
     }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });

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

@@ -24,6 +24,16 @@ export interface NormalizeOrderCollectionsResult<T> {
     stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
     uidRemaps: OrderCollectionUidRemap[];
 }
+export interface ProductLineIdentityRepair {
+    index: number;
+    from: string;
+    to: string;
+}
+export interface RepairDuplicateProductLineIdentitiesResult<T> {
+    products: T[];
+    productsByUid?: Record<string, Record<string, any>>;
+    repairs: ProductLineIdentityRepair[];
+}
 export declare function createUuidV4(): string;
 export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
 export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
@@ -31,6 +41,11 @@ export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: u
 export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
 export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
 export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export declare function repairDuplicateProductLineIdentities<T extends Record<string, any>>(products: T[] | null | undefined, productsByUid?: Record<string, Record<string, any>> | null): RepairDuplicateProductLineIdentitiesResult<T>;
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
  */

package/lib/modules/Order/utils/orderCollectionIdentity.js

@@ -30,6 +30,7 @@ __export(orderCollectionIdentity_exports, {
   mergeOrderCollectionItems: () => mergeOrderCollectionItems,
   normalizeOrderCollection: () => normalizeOrderCollection,
   normalizeOrderCollections: () => normalizeOrderCollections,
+  repairDuplicateProductLineIdentities: () => repairDuplicateProductLineIdentities,
   setOrderCollectionUid: () => setOrderCollectionUid
 });
 module.exports = __toCommonJS(orderCollectionIdentity_exports);
@@ -105,6 +106,74 @@ function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
+function getGoodPassResourceId(product) {
+  var _a;
+  const goodPass = (product.discount_list || []).find((item) => {
+    var _a2, _b;
+    const type = (item == null ? void 0 : item.type) || (item == null ? void 0 : item.tag) || ((_a2 = item == null ? void 0 : item.discount) == null ? void 0 : _a2.type) || ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.tag);
+    return type === "good_pass";
+  });
+  if (!goodPass)
+    return null;
+  const resourceId = ((_a = goodPass.discount) == null ? void 0 : _a.resource_id) ?? goodPass.resource_id ?? goodPass.discount_id ?? goodPass.id;
+  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+}
+function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
+  const encodedOriginalUid = encodeURIComponent(originalUid);
+  const resourceId = getGoodPassResourceId(product);
+  if (resourceId) {
+    return `os-split:product:${encodedOriginalUid}:good-pass:${encodeURIComponent(resourceId)}:${duplicateOrdinal}`;
+  }
+  return `os-split:product:${encodedOriginalUid}:duplicate:${duplicateOrdinal}`;
+}
+function repairDuplicateProductLineIdentities(products, productsByUid) {
+  const repairedProducts = (0, import_lodash_es.cloneDeep)(products || []);
+  const repairedProductsByUid = productsByUid ? (0, import_lodash_es.cloneDeep)(productsByUid) : void 0;
+  const occupiedUids = new Set(
+    repairedProducts.map((product) => getOrderCollectionUid("product", product)).filter((uid) => Boolean(uid))
+  );
+  Object.keys(repairedProductsByUid || {}).forEach((uid) => occupiedUids.add(uid));
+  const occurrences = /* @__PURE__ */ new Map();
+  const repairs = [];
+  repairedProducts.forEach((product, index) => {
+    const originalUid = getOrderCollectionUid("product", product);
+    if (!originalUid)
+      return;
+    const occurrence = (occurrences.get(originalUid) || 0) + 1;
+    occurrences.set(originalUid, occurrence);
+    if (occurrence === 1)
+      return;
+    const duplicateOrdinal = occurrence - 1;
+    const baseCandidate = buildSplitProductUid(
+      originalUid,
+      product,
+      duplicateOrdinal
+    );
+    let nextUid = baseCandidate;
+    let conflictOrdinal = 1;
+    while (occupiedUids.has(nextUid)) {
+      nextUid = `${baseCandidate}:conflict:${conflictOrdinal}`;
+      conflictOrdinal += 1;
+    }
+    const repairedProduct = setOrderCollectionUid("product", product, nextUid);
+    repairedProduct.identity_key = nextUid;
+    repairedProducts[index] = repairedProduct;
+    occupiedUids.add(nextUid);
+    repairs.push({ index, from: originalUid, to: nextUid });
+    const runtimeSource = repairedProductsByUid == null ? void 0 : repairedProductsByUid[originalUid];
+    if (runtimeSource && repairedProductsByUid) {
+      repairedProductsByUid[nextUid] = {
+        ...(0, import_lodash_es.cloneDeep)(runtimeSource),
+        ...runtimeSource.rowKey !== void 0 ? { rowKey: nextUid } : {}
+      };
+    }
+  });
+  return {
+    products: repairedProducts,
+    ...repairedProductsByUid ? { productsByUid: repairedProductsByUid } : {},
+    repairs
+  };
+}
 function isSameOrderCollectionItem(kind, left, right) {
   const leftPersistentId = getOrderCollectionPersistentId(kind, left);
   const rightPersistentId = getOrderCollectionPersistentId(kind, right);
@@ -414,5 +483,6 @@ function normalizeOrderCollections(sourceOrder, options) {
   mergeOrderCollectionItems,
   normalizeOrderCollection,
   normalizeOrderCollections,
+  repairDuplicateProductLineIdentities,
   setOrderCollectionUid
 });

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 2 | 1 | 6 | 4 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -447,7 +447,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -242,6 +242,11 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   async configureIdGeneratorFromOpenData() {
     this.setPaymentNumberDevicePrefix(null);
+    const idGenerator = this.getIdGeneratorPlugin();
+    if (!(idGenerator == null ? void 0 : idGenerator.configure)) {
+      console.warn("[BookingTicket] idGenerator 插件不可用，跳过配置");
+      return;
+    }
     let openDataConfig = null;
     try {
       openDataConfig = await this.loadOpenDataConfig();
@@ -249,11 +254,6 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       console.warn("[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置", error);
       return;
     }
-    const idGenerator = this.getIdGeneratorPlugin();
-    if (!(idGenerator == null ? void 0 : idGenerator.configure)) {
-      console.warn("[BookingTicket] idGenerator 插件不可用，跳过配置");
-      return;
-    }
     const receiptSequenceLength = this.normalizePositiveInteger(
       openDataConfig == null ? void 0 : openDataConfig["sale.short_number_digits"],
       5

package/lib/solution/UnifiedBookingSales/index.d.ts

@@ -63,8 +63,19 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private openDataTarget;
     private loadOpenDataInFlight;
     private loadOpenDataInFlightTarget;
+    protected getSubmitOrderSalesChannel(): string;
     protected isSessionStoragePersistEnabled(): boolean;
     protected shouldUseSessionStorageForSubModule(moduleName?: string): boolean;
+    /**
+     * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+     * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+     */
+    getSessionStateValue<T = unknown>(key: string): T | undefined;
+    /**
+     * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+     * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+     */
+    setSessionStateValue(key: string, value: unknown): void;
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。

package/lib/solution/UnifiedBookingSales/index.js

@@ -49,6 +49,9 @@ var import_BookingTicket = require("../BookingTicket");
 __reExport(UnifiedBookingSales_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = ["sale", "reservation", "fulfillment", "menu", "workflow"];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
 function pickLocalizedText(value) {
   if (!value)
     return void 0;
@@ -469,6 +472,11 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
     this.loadOpenDataInFlight = null;
     this.loadOpenDataInFlightTarget = null;
   }
+  getSubmitOrderSalesChannel() {
+    var _a;
+    const channel = String(((_a = this.otherParams) == null ? void 0 : _a.channel) ?? "").trim();
+    return channel || super.getSubmitOrderSalesChannel();
+  }
   isSessionStoragePersistEnabled() {
     var _a;
     return Boolean(
@@ -478,6 +486,43 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
   shouldUseSessionStorageForSubModule(moduleName) {
     return this.isSessionStoragePersistEnabled() && moduleName === "order";
   }
+  /**
+   * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+   * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+   */
+  getSessionStateValue(key) {
+    if (!key || !this.isSessionStoragePersistEnabled())
+      return void 0;
+    const cacheData = this.readSessionCacheData();
+    const solutionCache = cacheData == null ? void 0 : cacheData[this.name];
+    if (!isRecord(solutionCache) || !isRecord(solutionCache.sessionState)) {
+      return void 0;
+    }
+    return solutionCache.sessionState[key];
+  }
+  /**
+   * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+   * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+   */
+  setSessionStateValue(key, value) {
+    if (!key || !this.isSessionStoragePersistEnabled())
+      return;
+    const cacheData = this.readSessionCacheData();
+    const solutionCache = cacheData == null ? void 0 : cacheData[this.name];
+    const currentSessionState = isRecord(solutionCache) && isRecord(solutionCache.sessionState) ? solutionCache.sessionState : {};
+    const nextSessionState = { ...currentSessionState };
+    if (value === void 0) {
+      delete nextSessionState[key];
+    } else {
+      nextSessionState[key] = value;
+    }
+    this.checkSaveCache({
+      cacheId: this.cacheId,
+      fatherModule: this.name,
+      store: { sessionState: nextSessionState },
+      cacheKey: ["sessionState"]
+    });
+  }
   /**
    * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
    * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",