@pisell/pisellos 0.10.15 → 0.10.17

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";
@@ -1584,21 +1584,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return Decimal.max(new Decimal(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
     }
   }, {
-    key: "getLastOrderDepositSnapshot",
-    value: function getLastOrderDepositSnapshot() {
-      var _lastOrderInfo$deposi, _lastOrderInfo$summar;
-      var lastOrderInfo = this.store.lastOrderInfo;
-      if (!lastOrderInfo || _typeof(lastOrderInfo) !== 'object') return null;
-      var rawDepositAmount = (_lastOrderInfo$deposi = lastOrderInfo.deposit_amount) !== null && _lastOrderInfo$deposi !== void 0 ? _lastOrderInfo$deposi : (_lastOrderInfo$summar = lastOrderInfo.summary) === null || _lastOrderInfo$summar === void 0 ? void 0 : _lastOrderInfo$summar.deposit_amount;
+    key: "normalizeDepositFlag",
+    value: function normalizeDepositFlag(value) {
+      if (value === 0 || value === '0') return 0;
+      if (value === 1 || value === '1') return 1;
+      return null;
+    }
+  }, {
+    key: "getHistoricalDepositSnapshot",
+    value: function getHistoricalDepositSnapshot(source) {
+      var _record$deposit_amoun, _record$summary, _this$normalizeDeposi;
+      if (!source || _typeof(source) !== 'object') return null;
+      var record = source;
+      var rawDepositAmount = (_record$deposit_amoun = record.deposit_amount) !== null && _record$deposit_amoun !== void 0 ? _record$deposit_amoun : (_record$summary = record.summary) === null || _record$summary === void 0 ? void 0 : _record$summary.deposit_amount;
       var depositAmount = this.normalizeDepositAmount(rawDepositAmount !== null && rawDepositAmount !== void 0 ? rawDepositAmount : 0);
-      var hasDepositAmount = new Decimal(depositAmount).gt(0);
-      var isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
-      if (!isDeposit || !hasDepositAmount) return null;
+      if (!new Decimal(depositAmount).gt(0)) return null;
       return {
-        isDeposit: 1,
+        // 兼容历史数据：旧快照缺少 is_deposit 时，沿用正定金金额的推导规则。
+        isDeposit: (_this$normalizeDeposi = this.normalizeDepositFlag(record.is_deposit)) !== null && _this$normalizeDeposi !== void 0 ? _this$normalizeDeposi : 1,
         depositAmount: depositAmount
       };
     }
+  }, {
+    key: "getLastOrderDepositSnapshot",
+    value: function getLastOrderDepositSnapshot() {
+      return this.getHistoricalDepositSnapshot(this.store.lastOrderInfo);
+    }
   }, {
     key: "getLastOrderSubmitSnapshot",
     value: function getLastOrderSubmitSnapshot() {
@@ -1645,7 +1656,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         })
       });
       tempOrder.deposit_amount = snapshot.depositAmount;
-      tempOrder.is_deposit = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+      tempOrder.is_deposit = snapshot.isDeposit;
       return nextSummary;
     }
   }, {
@@ -2355,6 +2366,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
     value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
+      var _historicalDepositSna;
+      // merge hydrate 的商品集合包含本地未提交行，但 summary 仍来自远端旧订单，不能复用。
+      if (snapshot.requiresFullSummaryRecalculation === true) return null;
       var currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
       var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       if (currentFingerprint !== snapshot.productFingerprint) {
@@ -2364,10 +2378,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var summary = _objectSpread(_objectSpread({}, createEmptySummary()), cloneDeep(snapshot.summary || {}));
       var shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+      var historicalDepositSnapshot = this.getHistoricalDepositSnapshot(snapshot);
       if (shouldUseManualDepositOverride) {
         summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
-      } else if (manualDepositOverride) {
-        this.clearManualDepositOverride(tempOrder);
+      } else {
+        if (manualDepositOverride) {
+          this.clearManualDepositOverride(tempOrder);
+        }
+        if (historicalDepositSnapshot) {
+          summary = this.applyDepositAmountToSummary(tempOrder, summary, historicalDepositSnapshot.depositAmount);
+          tempOrder.is_deposit = historicalDepositSnapshot.isDeposit;
+        }
       }
       var isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
       if (!isPayableAmountUnchanged) return null;
@@ -2384,8 +2405,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         tempOrder.surcharges = cloneDeep(snapshot.surcharges);
       }
       tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
-      tempOrder.deposit_amount = summary.deposit_amount || '0.00';
-      tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+      tempOrder.deposit_amount = this.normalizeDepositAmount(summary.deposit_amount || 0);
+      tempOrder.is_deposit = shouldUseManualDepositOverride ? new Decimal(tempOrder.deposit_amount).gt(0) ? 1 : 0 : (_historicalDepositSna = historicalDepositSnapshot === null || historicalDepositSnapshot === void 0 ? void 0 : historicalDepositSnapshot.isDeposit) !== null && _historicalDepositSna !== void 0 ? _historicalDepositSna : new Decimal(tempOrder.deposit_amount).gt(0) ? 1 : 0;
       var previousSummary = this.store.summary;
       this.store.summary = summary;
       this.updateTempOrderPaymentStatus(tempOrder, {
@@ -3047,7 +3068,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var isExistingDepositDisabled = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0);
       tempOrder.deposit_amount = depositAmount;
       tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
-      return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
+      return shouldUseManualDepositOverride ? nextSummary : this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
     }
   }, {
     key: "recalculateSummary",
@@ -4168,9 +4189,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         booking: booking
       }) : null;
       var productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
+      var disableMerge = (options === null || options === void 0 ? void 0 : options.disableMerge) === true;
       this.assertAndLockProductSettlement(tempOrder, productToAdd);
-      var incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
+      var incomingFingerprint = disableMerge ? '' : buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
       var normalizedIncoming = this.normalizeVirtualSettlementProductIfEnabled(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)) {
@@ -4189,7 +4214,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;
@@ -4319,7 +4344,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;
@@ -4340,7 +4366,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;
@@ -5512,7 +5539,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 includePaymentStatus: !isOnlineStorePlatform,
                 enhance: enhancePayload
               });
-              console.log('[Order.runSubmitTempOrder.payload]', payload);
               if (params !== null && params !== void 0 && params.syncMode) {
                 payload.sync_mode = true;
               }
@@ -5520,10 +5546,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context36.next = 28;
+              _context36.next = 27;
               return this.saveDraft();
-            case 28:
-              _context36.prev = 28;
+            case 27:
+              _context36.prev = 27;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -5533,26 +5559,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context36.next = 32;
+              _context36.next = 31;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 32:
+            case 31:
               result = _context36.sent;
-              _context36.next = 45;
+              _context36.next = 44;
               break;
-            case 35:
-              _context36.prev = 35;
-              _context36.t2 = _context36["catch"](28);
+            case 34:
+              _context36.prev = 34;
+              _context36.t2 = _context36["catch"](27);
               backendErrorResponse = this.extractSubmitErrorResponse(_context36.t2);
               if (!backendErrorResponse) {
-                _context36.next = 42;
+                _context36.next = 41;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context36.abrupt("return", backendErrorResponse);
-            case 42:
+            case 41:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context36.t2 instanceof Error ? _context36.t2.message : String(_context36.t2),
@@ -5562,15 +5588,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context36.t2;
-            case 45:
+            case 44:
               if (!this.isSubmitResponseRejected(result)) {
-                _context36.next = 49;
+                _context36.next = 48;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context36.abrupt("return", result);
-            case 49:
+            case 48:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
@@ -5580,29 +5606,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context36.next = 58;
+                _context36.next = 57;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context36.next = 56;
+              _context36.next = 55;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 56:
-              _context36.next = 59;
+            case 55:
+              _context36.next = 58;
               break;
-            case 58:
+            case 57:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 59:
+            case 58:
               return _context36.abrupt("return", result);
-            case 60:
+            case 59:
             case "end":
               return _context36.stop();
           }
-        }, _callee33, this, [[28, 35]]);
+        }, _callee33, this, [[27, 34]]);
       }));
       function runSubmitTempOrder(_x39) {
         return _runSubmitTempOrder.apply(this, arguments);
@@ -5707,7 +5733,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(params) {
         var _this32 = this,
           _params$confirmPendin;
-        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitParams, submitResult;
+        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, enhancePayload, submitParams, submitResult;
         return _regeneratorRuntime().wrap(function _callee35$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
@@ -5760,6 +5786,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
+              enhancePayload = function enhancePayload(payload, ctx) {
+                var enhancedPayload = params.enhancePayload ? params.enhancePayload(payload, ctx) : payload;
+                return _objectSpread(_objectSpread({}, enhancedPayload), {}, {
+                  request_unique_idempotency_token: paymentSyncIdempotencyToken
+                });
+              };
               submitParams = {
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
@@ -5767,34 +5799,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 businessCode: params.businessCode,
                 channel: params.channel,
                 confirmPendingVoucherPayments: true,
-                enhancePayload: function enhancePayload(payload) {
-                  var nextPayload = _objectSpread(_objectSpread({}, payload), {}, {
-                    request_unique_idempotency_token: paymentSyncIdempotencyToken
-                  });
-                  return nextPayload;
-                }
+                enhancePayload: enhancePayload
               };
               if (!(params.checkoutSyncTaskEnabled === false)) {
-                _context38.next = 34;
+                _context38.next = 35;
                 break;
               }
-              _context38.next = 31;
+              _context38.next = 32;
               return this.submitTempOrderAsync(submitParams);
-            case 31:
+            case 32:
               _context38.t1 = _context38.sent;
-              _context38.next = 37;
+              _context38.next = 38;
               break;
-            case 34:
-              _context38.next = 36;
+            case 35:
+              _context38.next = 37;
               return this.submitTempOrder(submitParams);
-            case 36:
-              _context38.t1 = _context38.sent;
             case 37:
+              _context38.t1 = _context38.sent;
+            case 38:
               submitResult = _context38.t1;
               return _context38.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 39:
+            case 40:
             case "end":
               return _context38.stop();
           }
@@ -6030,8 +6057,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrderByCheckout",
     value: (function () {
       var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(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 _callee39$(_context42) {
           while (1) switch (_context42.prev = _context42.next) {
             case 0:
@@ -6058,16 +6085,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
-              });
-              _context42.prev = 4;
+              _context42.prev = 3;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -6089,20 +6107,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',
@@ -6111,10 +6115,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,
@@ -6129,34 +6133,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context42.next = 12;
+              _context42.next = 10;
               return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
-            case 12:
+            case 10:
               response = _context42.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 _context42.abrupt("return", response);
-            case 18:
-              _context42.prev = 18;
-              _context42.t0 = _context42["catch"](4);
+            case 15:
+              _context42.prev = 15;
+              _context42.t0 = _context42["catch"](3);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context42.t0);
               this.logInfo('Order API called failed', {
                 error: _context42.t0 instanceof Error ? _context42.t0.message : String(_context42.t0)
               });
               throw _context42.t0;
-            case 23:
+            case 20:
             case "end":
               return _context42.stop();
           }
-        }, _callee39, this, [[4, 18]]);
+        }, _callee39, this, [[3, 15]]);
       }));
       function createOrderByCheckout(_x46) {
         return _createOrderByCheckout.apply(this, arguments);
@@ -6287,7 +6287,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(record, options) {
         var _sourceRaw$_extend, _this$store$discount26;
-        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, nextTempOrder, _this$store$discount24, _this$store$discount25, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount27, _this$store$discount28;
+        var sourceRaw, duplicateProductIdentityRepair, duplicateIdentityReadySource, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, isSessionStorageHydrate, isMergedSalesDetailHydrate, nextTempOrder, _this$store$discount24, _this$store$discount25, restoredSessionDiscounts, nextExtend, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, historicalDepositSnapshot, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount27, _this$store$discount28;
         return _regeneratorRuntime().wrap(function _callee43$(_context46) {
           while (1) switch (_context46.prev = _context46.next) {
             case 0:
@@ -6322,12 +6322,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) {
-                _context46.next = 29;
+                _context46.next = 30;
                 break;
               }
               // 会话快照是未提交购物车，不应获得编辑订单的 saved/edit 标记与服务端基线。
@@ -6343,24 +6345,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextTempOrder.discount_list = restoredSessionDiscounts;
               this.store.summary = createEmptySummary();
               this.store.lastOrderInfo = undefined;
-              _context46.next = 22;
+              _context46.next = 23;
               return (_this$store$discount24 = this.store.discount) === null || _this$store$discount24 === void 0 ? void 0 : _this$store$discount24.setOriginalDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 22:
-              _context46.next = 24;
+            case 23:
+              _context46.next = 25;
               return (_this$store$discount25 = this.store.discount) === null || _this$store$discount25 === void 0 ? void 0 : _this$store$discount25.setDiscountList(cloneDeep(restoredSessionDiscounts));
-            case 24:
+            case 25:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context46.next = 27;
+                _context46.next = 28;
                 break;
               }
-              _context46.next = 27;
+              _context46.next = 28;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 27:
+            case 28:
               this.persistTempOrder();
               return _context46.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;
@@ -6369,6 +6371,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 externalSaleNumber: nextTempOrder.external_sale_number
               };
               rawSummary = raw.summary && _typeof(raw.summary) === 'object' ? raw.summary : {};
+              historicalDepositSnapshot = this.getHistoricalDepositSnapshot(sourceLastOrderInfo);
               summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map(function (s) {
                 return _objectSpread({}, s || {});
               }) : cloneDeep(nextTempOrder.surcharges || []);
@@ -6376,7 +6379,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 surcharges: summarySurcharges
               });
               nextTempOrder._extend = _objectSpread(_objectSpread({}, nextTempOrder._extend || {}), {}, {
-                originalSalesSnapshot: {
+                originalSalesSnapshot: _objectSpread(_objectSpread({
                   summary: cloneDeep(this.store.summary),
                   products: cloneDeep(nextTempOrder.products || []),
                   bookings: cloneDeep(nextTempOrder.bookings || []),
@@ -6384,7 +6387,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
                   shop_discount: nextTempOrder.shop_discount || '0.00',
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
-                }
+                }, historicalDepositSnapshot ? {
+                  is_deposit: historicalDepositSnapshot.isDeposit,
+                  deposit_amount: historicalDepositSnapshot.depositAmount
+                } : {}), isMergedSalesDetailHydrate ? {
+                  requiresFullSummaryRecalculation: true
+                } : {})
               });
               this.store.lastOrderInfo = this.withoutSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
               hadSyntheticDraftOrderId = this.isSyntheticDraftOrderIdForRuntime(raw, syntheticIdentityOptions) || this.isSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
@@ -6405,28 +6413,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               nextDiscounts = [].concat(_toConsumableArray(hydratedEditDiscounts), _toConsumableArray(retainedScanDiscounts));
               shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context46.next = 52;
+                _context46.next = 54;
                 break;
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
-              _context46.next = 50;
-              return (_this$store$discount27 = this.store.discount) === null || _this$store$discount27 === void 0 ? void 0 : _this$store$discount27.setOriginalDiscountList(nextDiscounts);
-            case 50:
               _context46.next = 52;
-              return (_this$store$discount28 = this.store.discount) === null || _this$store$discount28 === void 0 ? void 0 : _this$store$discount28.setDiscountList(nextDiscounts);
+              return (_this$store$discount27 = this.store.discount) === null || _this$store$discount27 === void 0 ? void 0 : _this$store$discount27.setOriginalDiscountList(nextDiscounts);
             case 52:
+              _context46.next = 54;
+              return (_this$store$discount28 = this.store.discount) === null || _this$store$discount28 === void 0 ? void 0 : _this$store$discount28.setDiscountList(nextDiscounts);
+            case 54:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context46.next = 55;
+                _context46.next = 57;
                 break;
               }
-              _context46.next = 55;
+              _context46.next = 57;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 55:
+            case 57:
               this.persistTempOrder();
               return _context46.abrupt("return", nextTempOrder);
-            case 57:
+            case 59:
             case "end":
               return _context46.stop();
           }

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

@@ -157,11 +157,13 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
+    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
@@ -189,6 +191,8 @@ export interface OrderLocalizedText {
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     bundle_edit?: number;
     product_sku: OrderProductSku;
     gift_card?: number;
@@ -332,6 +336,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
@@ -608,6 +614,7 @@ export interface SyncPaymentsToOrderParams {
     businessCode?: string;
     channel?: string;
     confirmPendingVoucherPayments?: boolean;
+    enhancePayload?: SubmitPayloadEnhancer;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -827,7 +834,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/modules/Order/types.js

@@ -60,6 +60,7 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 

package/dist/modules/Order/utils.js

@@ -873,6 +873,7 @@ function formatSubmitBundleItems(bundle) {
     return {
       is_charge_tax: formatOptions.virtualSettlementMode ? 0 : (_rawBundle$is_charge_ = rawBundle.is_charge_tax) !== null && _rawBundle$is_charge_ !== void 0 ? _rawBundle$is_charge_ : 0,
       bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0,
+      production_code: rawBundle.production_code,
       num: num,
       quantity: toBundleNumber((_rawBundle$quantity = rawBundle.quantity) !== null && _rawBundle$quantity !== void 0 ? _rawBundle$quantity : rawBundle.num, num),
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
@@ -1155,7 +1156,12 @@ export function buildSubmitPayload(params) {
     var _tempOrder$bookings;
     // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
     if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
-      submitType = 'appointment_booking';
+      // 260807 如果 biz 是堂食，type 使用table-order
+      if (businessCode === 'dine_in') {
+        submitType = 'table-order';
+      } else {
+        submitType = 'appointment_booking';
+      }
     } else {
       submitType = 'virtual';
     }