@pisell/pisellos 2.2.282 → 2.2.284

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;
@@ -5266,7 +5274,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 request_unique_idempotency_token: params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token,
                 enhance: enhancePayload
               });
-              console.log('[Order.runSubmitTempOrder.payload]', payload);
               if (params !== null && params !== void 0 && params.syncMode) {
                 payload.sync_mode = true;
               }
@@ -5274,10 +5281,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context35.next = 26;
+              _context35.next = 25;
               return this.saveDraft();
-            case 26:
-              _context35.prev = 26;
+            case 25:
+              _context35.prev = 25;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5287,26 +5294,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context35.next = 30;
+              _context35.next = 29;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 30:
+            case 29:
               result = _context35.sent;
-              _context35.next = 43;
+              _context35.next = 42;
               break;
-            case 33:
-              _context35.prev = 33;
-              _context35.t2 = _context35["catch"](26);
+            case 32:
+              _context35.prev = 32;
+              _context35.t2 = _context35["catch"](25);
               backendErrorResponse = this.extractSubmitErrorResponse(_context35.t2);
               if (!backendErrorResponse) {
-                _context35.next = 40;
+                _context35.next = 39;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context35.abrupt("return", backendErrorResponse);
-            case 40:
+            case 39:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context35.t2 instanceof Error ? _context35.t2.message : String(_context35.t2),
@@ -5316,15 +5323,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context35.t2;
-            case 43:
+            case 42:
               if (!this.isSubmitResponseRejected(result)) {
-                _context35.next = 47;
+                _context35.next = 46;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context35.abrupt("return", result);
-            case 47:
+            case 46:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
@@ -5334,29 +5341,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context35.next = 56;
+                _context35.next = 55;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context35.next = 54;
+              _context35.next = 53;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 54:
-              _context35.next = 57;
+            case 53:
+              _context35.next = 56;
               break;
-            case 56:
+            case 55:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 57:
+            case 56:
               return _context35.abrupt("return", result);
-            case 58:
+            case 57:
             case "end":
               return _context35.stop();
           }
-        }, _callee32, this, [[26, 33]]);
+        }, _callee32, this, [[25, 32]]);
       }));
       function runSubmitTempOrder(_x39) {
         return _runSubmitTempOrder.apply(this, arguments);
@@ -5784,8 +5791,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrderByCheckout",
     value: (function () {
       var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
-        var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
-        var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
+        var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3;
+        var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, orderData, response;
         return _regeneratorRuntime().wrap(function _callee38$(_context41) {
           while (1) switch (_context41.prev = _context41.next) {
             case 0:
@@ -5812,16 +5819,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return p.code;
                 })) || []
               });
-              console.log('[Order] createOrderByCheckout 开始创建订单:', {
-                type: params.type,
-                platform: params.platform,
-                is_deposit: params.is_deposit,
-                customer_id: params.customer_id,
-                bookingsCount: ((_params$bookings3 = params.bookings) === null || _params$bookings3 === void 0 ? void 0 : _params$bookings3.length) || 0,
-                relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
-                paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
-              });
-              _context41.prev = 4;
+              _context41.prev = 3;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -5843,20 +5841,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!params.order_id && !orderData.schedule_date) {
                 orderData.schedule_date = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              console.log('[Order] 调用后端接口创建订单:', {
-                url: '/shop/order/checkout',
-                orderType: orderData.type,
-                platform: orderData.platform,
-                isDeposit: orderData.is_deposit,
-                customerId: orderData.customer_id,
-                bookingsCount: ((_orderData$bookings = orderData.bookings) === null || _orderData$bookings === void 0 ? void 0 : _orderData$bookings.length) || 0,
-                relationProductsCount: ((_orderData$relation_p = orderData.relation_products) === null || _orderData$relation_p === void 0 ? void 0 : _orderData$relation_p.length) || 0,
-                paymentsCount: ((_orderData$payments2 = orderData.payments) === null || _orderData$payments2 === void 0 ? void 0 : _orderData$payments2.length) || 0,
-                paymentsMethods: ((_orderData$payments3 = orderData.payments) === null || _orderData$payments3 === void 0 ? void 0 : _orderData$payments3.map(function (p) {
-                  return p.code;
-                })) || []
-              });
-
               // 记录接口调用详情
               this.logInfo('Calling backend checkout API', {
                 url: '/shop/order/checkout',
@@ -5865,10 +5849,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 isDeposit: orderData.is_deposit,
                 customerId: orderData.customer_id,
                 depositAmount: orderData.deposit_amount,
-                bookingsCount: ((_orderData$bookings2 = orderData.bookings) === null || _orderData$bookings2 === void 0 ? void 0 : _orderData$bookings2.length) || 0,
-                relationProductsCount: ((_orderData$relation_p2 = orderData.relation_products) === null || _orderData$relation_p2 === void 0 ? void 0 : _orderData$relation_p2.length) || 0,
-                paymentsCount: ((_orderData$payments4 = orderData.payments) === null || _orderData$payments4 === void 0 ? void 0 : _orderData$payments4.length) || 0,
-                paymentMethods: ((_orderData$payments5 = orderData.payments) === null || _orderData$payments5 === void 0 ? void 0 : _orderData$payments5.map(function (p) {
+                bookingsCount: ((_orderData$bookings = orderData.bookings) === null || _orderData$bookings === void 0 ? void 0 : _orderData$bookings.length) || 0,
+                relationProductsCount: ((_orderData$relation_p = orderData.relation_products) === null || _orderData$relation_p === void 0 ? void 0 : _orderData$relation_p.length) || 0,
+                paymentsCount: ((_orderData$payments2 = orderData.payments) === null || _orderData$payments2 === void 0 ? void 0 : _orderData$payments2.length) || 0,
+                paymentMethods: ((_orderData$payments3 = orderData.payments) === null || _orderData$payments3 === void 0 ? void 0 : _orderData$payments3.map(function (p) {
                   return {
                     code: p.code,
                     amount: p.amount,
@@ -5883,34 +5867,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context41.next = 12;
+              _context41.next = 10;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
-            case 12:
+            case 10:
               response = _context41.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
-              console.log('[Order] 订单创建成功，后端响应:', {
-                success: !!response,
-                hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
-              });
               return _context41.abrupt("return", response);
-            case 18:
-              _context41.prev = 18;
-              _context41.t0 = _context41["catch"](4);
+            case 15:
+              _context41.prev = 15;
+              _context41.t0 = _context41["catch"](3);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context41.t0);
               this.logInfo('Order API called failed', {
                 error: _context41.t0 instanceof Error ? _context41.t0.message : String(_context41.t0)
               });
               throw _context41.t0;
-            case 23:
+            case 20:
             case "end":
               return _context41.stop();
           }
-        }, _callee38, this, [[4, 18]]);
+        }, _callee38, this, [[3, 15]]);
       }));
       function createOrderByCheckout(_x46) {
         return _createOrderByCheckout.apply(this, arguments);
@@ -6041,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:
@@ -6076,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 标记与服务端基线。
@@ -6097,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;
@@ -6130,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 || []),
@@ -6138,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);
@@ -6159,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

@@ -328,6 +328,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
@@ -819,7 +821,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>;