@pisell/pisellos 2.3.75 → 2.3.76

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

@@ -562,7 +562,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     hydrateTempOrderFromRecord(record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
-        source?: 'salesDetail' | 'sessionStorage';
+        source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
     }): Promise<OrderTempOrder>;
     /**
      * 兼容后端详情将 holder 放在 metadata.holder 的历史形态，统一补到运行时展示路径。

package/dist/modules/Order/index.js

@@ -37,7 +37,7 @@ import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
-import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
+import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { hasManualProductDiscountFlag, syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
@@ -2305,6 +2305,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
     value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
+      // merge hydrate 的商品集合包含本地未提交行，但 summary 仍来自远端旧订单，不能复用。
+      if (snapshot.requiresFullSummaryRecalculation === true) return null;
       var currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
       var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       if (currentFingerprint !== snapshot.productFingerprint) {
@@ -4018,8 +4020,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         booking: booking
       }) : null;
       var productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
-      var incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
+      var disableMerge = (options === null || options === void 0 ? void 0 : options.disableMerge) === true;
+      var incomingFingerprint = disableMerge ? '' : buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
       var normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
+      if (disableMerge) {
+        normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, _defineProperty({}, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY, true));
+      }
       var isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
       var netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
       if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
@@ -4038,7 +4044,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
       var hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
       var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
-      var shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+      var shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
         var _item$metadata3;
         if (_this27.hasGoodPassDiscount(item)) return false;
@@ -4168,7 +4174,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               singleLine.num = 1;
               delete singleLine.product_quantity;
               _appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
-                insertAtIndex: insertAtIndex
+                insertAtIndex: insertAtIndex,
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
               if (!_appendResult) {
                 _context21.next = 17;
@@ -4189,7 +4196,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context21.abrupt("return", tempOrder.products);
             case 24:
               appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
-                insertAtIndex: insertAtIndex
+                insertAtIndex: insertAtIndex,
+                disableMerge: options === null || options === void 0 ? void 0 : options.disableMerge
               });
               if (!appendResult) {
                 _context21.next = 28;
@@ -6013,7 +6021,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(record, options) {
         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;
+        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, isMergedSalesDetailHydrate, 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 _callee42$(_context45) {
           while (1) switch (_context45.prev = _context45.next) {
             case 0:
@@ -6048,12 +6056,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               isSessionStorageHydrate = (options === null || options === void 0 ? void 0 : options.source) === 'sessionStorage';
+              isMergedSalesDetailHydrate = (options === null || options === void 0 ? void 0 : options.source) === 'mergedSalesDetail';
               nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
-                makeEditMark: !isSessionStorageHydrate
+                // merge 前已只给远端商品补标记；这里不能把本地未提交商品一并变成 saved item。
+                makeEditMark: !isSessionStorageHydrate && !isMergedSalesDetailHydrate
               });
               this.store.tempOrder = nextTempOrder;
               if (!isSessionStorageHydrate) {
-                _context45.next = 29;
+                _context45.next = 30;
                 break;
               }
               // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
@@ -6069,24 +6079,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextTempOrder.discount_list = restoredSessionDiscounts;
               this.store.summary = createEmptySummary();
               this.store.lastOrderInfo = undefined;
-              _context45.next = 22;
+              _context45.next = 23;
               return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 22:
-              _context45.next = 24;
+            case 23:
+              _context45.next = 25;
               return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 24:
+            case 25:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context45.next = 27;
+                _context45.next = 28;
                 break;
               }
-              _context45.next = 27;
+              _context45.next = 28;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 27:
+            case 28:
               this.persistTempOrder();
               return _context45.abrupt("return", nextTempOrder);
-            case 29:
+            case 30:
               // 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;
@@ -6102,7 +6112,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 surcharges: summarySurcharges
               });
               nextTempOrder._extend = _objectSpread(_objectSpread({}, nextTempOrder._extend || {}), {}, {
-                originalSalesSnapshot: {
+                originalSalesSnapshot: _objectSpread({
                   summary: cloneDeep(this.store.summary),
                   products: cloneDeep(nextTempOrder.products || []),
                   bookings: cloneDeep(nextTempOrder.bookings || []),
@@ -6110,7 +6120,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
                   shop_discount: nextTempOrder.shop_discount || '0.00',
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
-                }
+                }, isMergedSalesDetailHydrate ? {
+                  requiresFullSummaryRecalculation: true
+                } : {})
               });
               this.store.lastOrderInfo = this.withoutSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
               hadSyntheticDraftOrderId = this.isSyntheticDraftOrderIdForRuntime(raw, syntheticIdentityOptions) || this.isSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
@@ -6131,28 +6143,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context45.next = 52;
+                _context45.next = 53;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context45.next = 50;
+              _context45.next = 51;
               return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList(nextDiscounts);
-            case 50:
-              _context45.next = 52;
+            case 51:
+              _context45.next = 53;
               return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setDiscountList(nextDiscounts);
-            case 52:
+            case 53:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context45.next = 55;
+                _context45.next = 56;
                 break;
               }
-              _context45.next = 55;
+              _context45.next = 56;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 55:
+            case 56:
               this.persistTempOrder();
               return _context45.abrupt("return", nextTempOrder);
-            case 57:
+            case 58:
             case "end":
               return _context45.stop();
           }

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

@@ -330,6 +330,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
@@ -821,7 +823,7 @@ export interface OrderModuleAPI {
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
-        source?: 'salesDetail' | 'sessionStorage';
+        source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
     getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;

package/dist/solution/BaseSales/index.js

@@ -370,6 +370,24 @@ function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
   }
   return record;
 }
+
+/**
+ * merge hydrate 不会统一给所有商品补 saved 标记，因此先只标记远端已保存商品。
+ * 当前 tempOrder 中尚未提交的本地商品会在 merge 后继续保持 current item 语义。
+ */
+function markLoadedSalesDetailProductsAsSaved(sourceRecord) {
+  if (!sourceRecord || _typeof(sourceRecord) !== 'object') return sourceRecord;
+  if (!Array.isArray(sourceRecord.products)) return sourceRecord;
+  return _objectSpread(_objectSpread({}, sourceRecord), {}, {
+    products: sourceRecord.products.map(function (product) {
+      return _objectSpread(_objectSpread({}, product || {}), {}, {
+        metadata: _objectSpread(_objectSpread({}, product !== null && product !== void 0 && product.metadata && _typeof(product.metadata) === 'object' ? product.metadata : {}), {}, {
+          is_edit_for_runtime: true
+        })
+      });
+    })
+  });
+}
 export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BaseSalesImpl, _BaseModule);
   var _super = _createSuper(BaseSalesImpl);
@@ -669,7 +687,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateLatestLoadedSalesDetail",
     value: function () {
-      var _hydrateLatestLoadedSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, loadSequence, hydrateSource) {
+      var _hydrateLatestLoadedSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, loadSequence, options) {
         var _this4 = this;
         var hydratedSales, skippedBeforeHydrate, hydrateTask, queuedTask;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -679,7 +697,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               skippedBeforeHydrate = false;
               hydrateTask = /*#__PURE__*/function () {
                 var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-                  var sales;
+                  var hydrateOptions, sales;
                   return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                     while (1) switch (_context4.prev = _context4.next) {
                       case 0:
@@ -696,30 +714,39 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         }
                         throw new Error('order 模块未初始化');
                       case 5:
-                        _context4.next = 7;
-                        return _this4.store.order.hydrateTempOrderFromRecord(record, hydrateSource === 'sessionStorage' ? {
-                          recalcOnHydrate: true,
-                          source: 'sessionStorage'
-                        } : {
+                        hydrateOptions = {
                           recalcOnHydrate: false
-                        });
-                      case 7:
+                        };
+                        if ((options === null || options === void 0 ? void 0 : options.hydrateSource) === 'sessionStorage') {
+                          hydrateOptions = {
+                            recalcOnHydrate: true,
+                            source: 'sessionStorage'
+                          };
+                        } else if (options !== null && options !== void 0 && options.merge) {
+                          hydrateOptions = {
+                            recalcOnHydrate: true,
+                            source: 'mergedSalesDetail'
+                          };
+                        }
+                        _context4.next = 9;
+                        return _this4.store.order.hydrateTempOrderFromRecord(record, hydrateOptions);
+                      case 9:
                         sales = _context4.sent;
                         hydratedSales = sales;
 
                         // hydrate 期间可能又发起了更新请求；后续任务已串行排队，将负责最终状态。
                         if (!(loadSequence !== _this4.salesDetailLoadSequence)) {
-                          _context4.next = 11;
+                          _context4.next = 13;
                           break;
                         }
                         return _context4.abrupt("return");
-                      case 11:
+                      case 13:
                         _this4.currentSalesDetail = sales;
-                        _context4.next = 14;
+                        _context4.next = 16;
                         return _this4.core.effects.emit("".concat(_this4.name, ":onSalesOrderLoaded"), {
                           sales: sales
                         });
-                      case 14:
+                      case 16:
                       case "end":
                         return _context4.stop();
                     }
@@ -1534,7 +1561,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderIdOrParams) {
-        var loadSequence, _ref27, _ref28, _ref29, _ref30, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, loadedSalesDetail, shouldFilterPendingPayments, remoteRecord, currentTempOrder, mergedRecord, record;
+        var loadSequence, _ref27, _ref28, _ref29, _ref30, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, loadedSalesDetail, shouldFilterPendingPayments, remoteRecord, mergeSourceRecord, currentTempOrder, mergedRecord, record;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1586,39 +1613,43 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               loadedSalesDetail = preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data; // payment_pending 只存在于本地；远端详情需过滤，但会话快照必须完整恢复。
               shouldFilterPendingPayments = params.hydrateSource !== 'sessionStorage';
               remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
+              mergeSourceRecord = params.merge ? markLoadedSalesDetailProductsAsSaved(remoteRecord) : remoteRecord;
               currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-              mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord, 'preserve-local') : remoteRecord;
+              mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, mergeSourceRecord, 'preserve-local') : mergeSourceRecord;
               record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
-              _context14.next = 30;
-              return this.hydrateLatestLoadedSalesDetail(record, loadSequence, params.hydrateSource);
-            case 30:
-              return _context14.abrupt("return", _context14.sent);
+              _context14.next = 31;
+              return this.hydrateLatestLoadedSalesDetail(record, loadSequence, {
+                hydrateSource: params.hydrateSource,
+                merge: params.merge
+              });
             case 31:
-              _context14.prev = 31;
+              return _context14.abrupt("return", _context14.sent);
+            case 32:
+              _context14.prev = 32;
               this.salesDetailLoadInFlightCount = Math.max(0, this.salesDetailLoadInFlightCount - 1);
               if (!(this.salesDetailLoadInFlightCount === 0)) {
-                _context14.next = 42;
+                _context14.next = 43;
                 break;
               }
-              _context14.prev = 34;
-              _context14.next = 37;
+              _context14.prev = 35;
+              _context14.next = 38;
               return this.drainQueuedServerOrderChanges();
-            case 37:
-              _context14.next = 42;
+            case 38:
+              _context14.next = 43;
               break;
-            case 39:
-              _context14.prev = 39;
-              _context14.t1 = _context14["catch"](34);
+            case 40:
+              _context14.prev = 40;
+              _context14.t1 = _context14["catch"](35);
               this.logError('drain queued server order changes failed', {
                 error: _context14.t1 instanceof Error ? _context14.t1.message : String(_context14.t1)
               });
-            case 42:
-              return _context14.finish(31);
             case 43:
+              return _context14.finish(32);
+            case 44:
             case "end":
               return _context14.stop();
           }
-        }, _callee14, this, [[4,, 31, 43], [34, 39]]);
+        }, _callee14, this, [[4,, 32, 44], [35, 40]]);
       }));
       function loadSalesDetail(_x13) {
         return _loadSalesDetail.apply(this, arguments);

package/dist/solution/BaseSales/utils/cartPromotion.d.ts

@@ -1,4 +1,9 @@
 import type { OrderProduct } from '../../../modules/Order/types';
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export declare const PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = "_productLineMergeDisabled";
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *

package/dist/solution/BaseSales/utils/cartPromotion.js

@@ -23,6 +23,12 @@ import { cloneDeep } from 'lodash-es';
 import { composeLinePrice, createUuidV4, getProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildProductLineFingerprint, getSafeProductNum } from "../../ScanOrder/utils";
 
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export var PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = '_productLineMergeDisabled';
+
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *
@@ -483,10 +489,13 @@ function hasGoodPassDiscount(product) {
 }
 
 /**
- * 商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
+ * 不合并商品、商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
  */
 function getPromotionLineMergeBoundary(product) {
-  var _product$product_sku, _product$metadata3;
+  var _product$metadata3, _product$product_sku, _product$metadata4;
+  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3[PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY]) === true) {
+    return "separate:".concat(getOrderProductUid(product));
+  }
   if ((product === null || product === void 0 ? void 0 : product.product_id) === undefined || (product === null || product === void 0 ? void 0 : product.product_id) === null) {
     return "custom:".concat(getOrderProductUid(product));
   }
@@ -496,7 +505,7 @@ function getPromotionLineMergeBoundary(product) {
   if (Number((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1) {
     return "weighing:".concat(getOrderProductUid(product));
   }
-  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_edit_for_runtime) !== true) return '';
+  if ((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.is_edit_for_runtime) !== true) return '';
   return "edit:".concat(getOrderProductUid(product));
 }
 function isPersistedGeneratedVoucher(product) {
@@ -921,13 +930,13 @@ export function resolveStrategyEligibleProducts(matched) {
 export function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts) {
   var unfulfilledMap = new Map();
   var _loop2 = function _loop2() {
-      var _product$metadata4, _ref13, _product$_originalPro, _product$metadata5, _product$num2;
+      var _product$metadata5, _ref13, _product$_originalPro, _product$metadata6, _product$num2;
       var product = processedProducts[i];
-      var promotion = product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4._promotion;
+      var promotion = product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5._promotion;
       if (!promotion || promotion.inPromotion !== false) return 0; // continue
       var strategyId = promotion.strategyId;
       if (!strategyId) return 0; // continue
-      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
+      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
       var originalIndex = mainProducts.findIndex(function (item) {
         return getOrderProductUid(item) === lookupUid;
       });

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

@@ -562,7 +562,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     hydrateTempOrderFromRecord(record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
-        source?: 'salesDetail' | 'sessionStorage';
+        source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
     }): Promise<OrderTempOrder>;
     /**
      * 兼容后端详情将 holder 放在 metadata.holder 的历史形态，统一补到运行时展示路径。

package/lib/modules/Order/index.js

@@ -1589,6 +1589,8 @@ class OrderModule extends _BaseModule.BaseModule {
     return !new _decimal.default(tempOrder.shop_discount || 0).equals(snapshotShopDiscount || 0);
   }
   restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
+    // merge hydrate 的商品集合包含本地未提交行，但 summary 仍来自远端旧订单，不能复用。
+    if (snapshot.requiresFullSummaryRecalculation === true) return null;
     const currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
     const manualDepositOverride = this.getManualDepositOverride(tempOrder);
     if (currentFingerprint !== snapshot.productFingerprint) {
@@ -2805,8 +2807,15 @@ class OrderModule extends _BaseModule.BaseModule {
       booking
     }) : null;
     const productToAdd = linked?.product || product;
-    const incomingFingerprint = (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(productToAdd), productToAdd.product_bundle);
+    const disableMerge = options?.disableMerge === true;
+    const incomingFingerprint = disableMerge ? '' : (0, _utils3.buildProductLineFingerprint)((0, _utils.getProductSkuOptions)(productToAdd), productToAdd.product_bundle);
     const normalizedIncoming = (0, _utils.mergeOrderProductDisplayFields)(productToAdd, (0, _utils3.normalizeOrderProduct)(productToAdd));
+    if (disableMerge) {
+      normalizedIncoming.metadata = {
+        ...(normalizedIncoming.metadata || {}),
+        [_cartPromotion.PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY]: true
+      };
+    }
     const isWeighingProduct = Number(normalizedIncoming.product_sku?.open_sold_weight || 0) === 1;
     const netWeight = Number(normalizedIncoming.product_sku?.net_weight);
     if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
@@ -2826,7 +2835,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
     const isIncomingCustomItem = productToAdd.metadata?.origin?.isCustomItem === true || productToAdd._origin?.isCustomItem === true;
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+    const shouldForceNewLine = disableMerge || !!booking || hasIncomingProductNote || hasIncomingManualProductDiscount || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
       if (this.hasGoodPassDiscount(item)) return false;
       if (this.hasOrderProductLineNote(item)) return false;
@@ -2944,7 +2953,8 @@ class OrderModule extends _BaseModule.BaseModule {
           singleLine.num = 1;
           delete singleLine.product_quantity;
           const appendResult = this.appendProductLineToTempOrder(tempOrder, singleLine, (0, _lodashEs.cloneDeep)(booking), {
-            insertAtIndex
+            insertAtIndex,
+            disableMerge: options?.disableMerge
           });
           if (appendResult) await appendResult;
           if (insertAtIndex !== undefined) insertAtIndex += 1;
@@ -2954,7 +2964,8 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     }
     const appendResult = this.appendProductLineToTempOrder(tempOrder, product, booking, {
-      insertAtIndex
+      insertAtIndex,
+      disableMerge: options?.disableMerge
     });
     if (appendResult) await appendResult;
     await this.finalizeProductOrderMutation(tempOrder);
@@ -4134,8 +4145,10 @@ class OrderModule extends _BaseModule.BaseModule {
       }
     }
     const isSessionStorageHydrate = options?.source === 'sessionStorage';
+    const isMergedSalesDetailHydrate = options?.source === 'mergedSalesDetail';
     const nextTempOrder = this.normalizeTempOrderForRuntime(raw, {
-      makeEditMark: !isSessionStorageHydrate
+      // merge 前已只给远端商品补标记；这里不能把本地未提交商品一并变成 saved item。
+      makeEditMark: !isSessionStorageHydrate && !isMergedSalesDetailHydrate
     });
     this.store.tempOrder = nextTempOrder;
     if (isSessionStorageHydrate) {
@@ -4190,7 +4203,11 @@ class OrderModule extends _BaseModule.BaseModule {
         payments: (0, _lodashEs.cloneDeep)(nextTempOrder.payments || []),
         surcharges: (0, _lodashEs.cloneDeep)(nextTempOrder.surcharges || []),
         shop_discount: nextTempOrder.shop_discount || '0.00',
-        productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
+        productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || []),
+        // merged record 的 summary 仍是远端旧值，保留快照仅用于完整重算的价格清理基线。
+        ...(isMergedSalesDetailHydrate ? {
+          requiresFullSummaryRecalculation: true
+        } : {})
       }
     };
     this.store.lastOrderInfo = this.withoutSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);

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

@@ -330,6 +330,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
@@ -821,7 +823,7 @@ export interface OrderModuleAPI {
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
-        source?: 'salesDetail' | 'sessionStorage';
+        source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
     getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;

package/lib/solution/BaseSales/index.js

@@ -331,6 +331,25 @@ function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
   }
   return record;
 }
+
+/**
+ * merge hydrate 不会统一给所有商品补 saved 标记，因此先只标记远端已保存商品。
+ * 当前 tempOrder 中尚未提交的本地商品会在 merge 后继续保持 current item 语义。
+ */
+function markLoadedSalesDetailProductsAsSaved(sourceRecord) {
+  if (!sourceRecord || typeof sourceRecord !== 'object') return sourceRecord;
+  if (!Array.isArray(sourceRecord.products)) return sourceRecord;
+  return {
+    ...sourceRecord,
+    products: sourceRecord.products.map(product => ({
+      ...(product || {}),
+      metadata: {
+        ...(product?.metadata && typeof product.metadata === 'object' ? product.metadata : {}),
+        is_edit_for_runtime: true
+      }
+    }))
+  };
+}
 class BaseSalesImpl extends _BaseModule.BaseModule {
   defaultName = 'baseSales';
   defaultVersion = '1.0.0';
@@ -512,7 +531,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     });
   }
-  async hydrateLatestLoadedSalesDetail(record, loadSequence, hydrateSource) {
+  async hydrateLatestLoadedSalesDetail(record, loadSequence, options) {
     let hydratedSales = null;
     let skippedBeforeHydrate = false;
     const hydrateTask = async () => {
@@ -522,12 +541,21 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         return;
       }
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, hydrateSource === 'sessionStorage' ? {
-        recalcOnHydrate: true,
-        source: 'sessionStorage'
-      } : {
+      let hydrateOptions = {
         recalcOnHydrate: false
-      });
+      };
+      if (options?.hydrateSource === 'sessionStorage') {
+        hydrateOptions = {
+          recalcOnHydrate: true,
+          source: 'sessionStorage'
+        };
+      } else if (options?.merge) {
+        hydrateOptions = {
+          recalcOnHydrate: true,
+          source: 'mergedSalesDetail'
+        };
+      }
+      const sales = await this.store.order.hydrateTempOrderFromRecord(record, hydrateOptions);
       hydratedSales = sales;
 
       // hydrate 期间可能又发起了更新请求；后续任务已串行排队，将负责最终状态。
@@ -1076,10 +1104,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       // payment_pending 只存在于本地；远端详情需过滤，但会话快照必须完整恢复。
       const shouldFilterPendingPayments = params.hydrateSource !== 'sessionStorage';
       const remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
+      const mergeSourceRecord = params.merge ? markLoadedSalesDetailProductsAsSaved(remoteRecord) : remoteRecord;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-      const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord, 'preserve-local') : remoteRecord;
+      const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, mergeSourceRecord, 'preserve-local') : mergeSourceRecord;
       const record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
-      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence, params.hydrateSource);
+      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence, {
+        hydrateSource: params.hydrateSource,
+        merge: params.merge
+      });
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(0, this.salesDetailLoadInFlightCount - 1);
       if (this.salesDetailLoadInFlightCount === 0) {

package/lib/solution/BaseSales/utils/cartPromotion.d.ts

@@ -1,4 +1,9 @@
 import type { OrderProduct } from '../../../modules/Order/types';
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export declare const PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = "_productLineMergeDisabled";
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = void 0;
 exports.appendPromotionTags = appendPromotionTags;
 exports.buildConsolidateKeyForPromotion = buildConsolidateKeyForPromotion;
 exports.calculateUnfulfilledPromotions = calculateUnfulfilledPromotions;
@@ -19,6 +20,12 @@ var _lodashEs = require("lodash-es");
 var _utils = require("../../../modules/Order/utils");
 var _utils2 = require("../../ScanOrder/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+const PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = exports.PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = '_productLineMergeDisabled';
+
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *
@@ -396,9 +403,12 @@ function hasGoodPassDiscount(product) {
 }
 
 /**
- * 商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
+ * 不合并商品、商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
  */
 function getPromotionLineMergeBoundary(product) {
+  if (product?.metadata?.[PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY] === true) {
+    return `separate:${getOrderProductUid(product)}`;
+  }
   if (product?.product_id === undefined || product?.product_id === null) {
     return `custom:${getOrderProductUid(product)}`;
   }

package/package.json

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