@pisell/pisellos 2.3.33 → 2.3.34

package/dist/modules/Order/payment-utils.d.ts

@@ -10,6 +10,8 @@ export interface OrderPaymentIdentityMatch<T> {
     matchedBy: OrderPaymentIdentityType;
 }
 export declare function getOrderPaymentIdentityKeys(payment: unknown): string[];
+export declare function isPendingOrderPayment(payment: unknown): boolean;
+export declare function isIdentifiedPendingOrderPayment(payment: unknown): boolean;
 export declare function hasOrderPaymentIdentityOverlap(left: unknown, right: unknown): boolean;
 export declare function resolveOrderPaymentIdentity<T extends Record<string, any>>(payments: T[] | null | undefined, identity: string | number, mode?: 'payment_number' | 'compat'): OrderPaymentIdentityMatch<T> | null;
 export declare function ensureOrderPaymentNumber<T extends Record<string, any>>(payment: T, devicePrefix: string, createPaymentNumber: () => string): T & {
@@ -20,4 +22,5 @@ export declare function mergeOrderPaymentRecord<T extends Record<string, any>>(p
 export declare function mergeOrderPaymentSnapshot<T extends Record<string, any>>(current: T, incoming: T): T;
 export declare function mergeOrderPaymentListsByIdentity<T extends Record<string, any>>(existing: T[] | null | undefined, incoming: T[] | null | undefined, options?: {
     preserveUnmatchedExisting?: boolean;
+    preserveUnmatchedExistingWhen?: (payment: T) => boolean;
 }): T[];

package/dist/modules/Order/payment-utils.js

@@ -31,6 +31,13 @@ export function getOrderPaymentIdentityKeys(payment) {
     return value === null ? [] : ["".concat(type, ":").concat(value)];
   });
 }
+export function isPendingOrderPayment(payment) {
+  var record = payment;
+  return String((record === null || record === void 0 ? void 0 : record.status) || '').toLowerCase() === 'payment_pending';
+}
+export function isIdentifiedPendingOrderPayment(payment) {
+  return isPendingOrderPayment(payment) && getOrderPaymentIdentityKeys(payment).length > 0;
+}
 export function hasOrderPaymentIdentityOverlap(left, right) {
   var leftKeys = new Set(getOrderPaymentIdentityKeys(left));
   if (leftKeys.size === 0) return false;
@@ -123,10 +130,18 @@ export function mergeOrderPaymentRecord(payment, updates) {
 export function mergeOrderPaymentSnapshot(current, incoming) {
   var currentMetadata = current.metadata || {};
   var incomingMetadata = incoming.metadata || {};
+  var currentUniquePaymentNumber = normalizePaymentIdentityValue(currentMetadata.unique_payment_number);
+  var incomingUniquePaymentNumber = normalizePaymentIdentityValue(incomingMetadata.unique_payment_number);
+  var incomingOrderPaymentId = normalizePaymentIdentityValue(incoming.order_payment_id);
+  var incomingFallbackPrefix = incomingOrderPaymentId ? "os-fallback:payment:order-payment:".concat(incomingOrderPaymentId) : null;
+  var incomingUsesDerivedUniquePaymentNumber = Boolean(incomingUniquePaymentNumber && incomingFallbackPrefix && (incomingUniquePaymentNumber === incomingFallbackPrefix || incomingUniquePaymentNumber.startsWith("".concat(incomingFallbackPrefix, ":conflict:"))));
   var transactions = mergeOrderPaymentTransactions(currentMetadata.transactions, incomingMetadata.transactions);
   return _objectSpread(_objectSpread(_objectSpread({}, current), incoming), {}, {
+    order_payment_id: normalizePaymentIdentityValue(incoming.order_payment_id) !== null ? incoming.order_payment_id : current.order_payment_id,
     payment_number: incoming.payment_number || current.payment_number,
-    metadata: _objectSpread(_objectSpread(_objectSpread({}, currentMetadata), incomingMetadata), transactions.length > 0 ? {
+    metadata: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, currentMetadata), incomingMetadata), incomingUsesDerivedUniquePaymentNumber && currentUniquePaymentNumber ? {
+      unique_payment_number: currentUniquePaymentNumber
+    } : {}), transactions.length > 0 ? {
       transactions: transactions
     } : {})
   });
@@ -192,12 +207,19 @@ export function mergeOrderPaymentListsByIdentity(existing, incoming) {
   if (options.preserveUnmatchedExisting) {
     return compactOrderPaymentList([].concat(_toConsumableArray(existingList), _toConsumableArray(incomingList)));
   }
-  return compactOrderPaymentList(incomingList.map(function (incomingPayment) {
+  var mergedIncoming = incomingList.map(function (incomingPayment) {
     var matchingExisting = existingList.filter(function (existingPayment) {
       return hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment);
     });
     return matchingExisting.reduce(function (merged, existingPayment) {
       return mergeOrderPaymentSnapshot(existingPayment, merged);
     }, incomingPayment);
-  }));
+  });
+  var preservedExisting = options.preserveUnmatchedExistingWhen ? existingList.filter(function (existingPayment) {
+    var _options$preserveUnma;
+    return !incomingList.some(function (incomingPayment) {
+      return hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment);
+    }) && ((_options$preserveUnma = options.preserveUnmatchedExistingWhen) === null || _options$preserveUnma === void 0 ? void 0 : _options$preserveUnma.call(options, existingPayment));
+  }) : [];
+  return compactOrderPaymentList([].concat(_toConsumableArray(mergedIncoming), _toConsumableArray(preservedExisting)));
 }

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

@@ -209,6 +209,11 @@ export function normalizeOrderCollection(kind, items, options) {
     var persistentId = getOrderCollectionPersistentId(kind, item);
     var uid = getOrderCollectionUid(kind, item);
     if (!uid) {
+      var _item;
+      if (kind === 'payment' && !isBlankOrderCollectionIdentity((_item = item) === null || _item === void 0 ? void 0 : _item.payment_number)) {
+        // payment_number 已提供稳定身份，不占用真实交易流水字段作为内部 UID。
+        continue;
+      }
       uid = persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       item = setOrderCollectionUid(kind, item, uid);
       result[index] = item;
@@ -216,7 +221,7 @@ export function normalizeOrderCollection(kind, items, options) {
       if (!persistentId) stats.anonymousRowCount += 1;
     }
     if (occupiedUids.has(uid)) {
-      var _item, _item2, _item3, _item4;
+      var _item2, _item3, _item4, _item5;
       var replacementUid = persistentId ? allocatePersistentConflictUid(kind, persistentId, occupiedUids) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       result[index] = setOrderCollectionUid(kind, item, replacementUid);
       uidRemaps.push({
@@ -225,7 +230,7 @@ export function normalizeOrderCollection(kind, items, options) {
         to: replacementUid,
         persistentId: persistentId,
         scope: 'linked-owner',
-        referenceOwnerUid: kind === 'product' ? String(((_item = item) === null || _item === void 0 ? void 0 : _item.booking_uid) || ((_item2 = item) === null || _item2 === void 0 || (_item2 = _item2.metadata) === null || _item2 === void 0 ? void 0 : _item2.booking_uid) || '') || null : kind === 'booking' ? String(((_item3 = item) === null || _item3 === void 0 ? void 0 : _item3.product_uid) || ((_item4 = item) === null || _item4 === void 0 || (_item4 = _item4.metadata) === null || _item4 === void 0 ? void 0 : _item4.product_uid) || '') || null : null
+        referenceOwnerUid: kind === 'product' ? String(((_item2 = item) === null || _item2 === void 0 ? void 0 : _item2.booking_uid) || ((_item3 = item) === null || _item3 === void 0 || (_item3 = _item3.metadata) === null || _item3 === void 0 ? void 0 : _item3.booking_uid) || '') || null : kind === 'booking' ? String(((_item4 = item) === null || _item4 === void 0 ? void 0 : _item4.product_uid) || ((_item5 = item) === null || _item5 === void 0 || (_item5 = _item5.metadata) === null || _item5 === void 0 ? void 0 : _item5.product_uid) || '') || null : null
       });
       uid = replacementUid;
       stats.uidConflictCount += 1;

package/dist/server/index.d.ts

@@ -121,6 +121,8 @@ declare class Server {
     private handleSyncSalesTask;
     private runCheckoutSync;
     private omitCheckoutSyncMode;
+    private buildRemoteCheckoutData;
+    private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。

package/dist/server/index.js

@@ -23,6 +23,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
+import { cloneDeep } from 'lodash-es';
 import { ProductsModule } from "./modules/products";
 import { MenuModule } from "./modules/menu";
 import { QuotationModule } from "./modules/quotation";
@@ -40,6 +41,7 @@ import { filterOrders } from "./modules/order/utils/filterOrders";
 import { filterBookingsFromOrders, sortBookings } from "./modules/order/utils/filterBookings";
 import { buildSmallTicketData, hasSmallTicketData } from "./utils/small-ticket";
 import { BaseSalesImpl } from "../solution/BaseSales";
+import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity } from "../modules/Order/payment-utils";
 
 // 重新导出类型供外部使用
 
@@ -2472,7 +2474,7 @@ var Server = /*#__PURE__*/function () {
               return this.ensureCheckoutOrderNumbers(normalizedData, title);
             case 6:
               checkoutData = _context31.sent;
-              remoteCheckoutData = this.omitCheckoutSyncMode(checkoutData);
+              remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
               if ((_this$app6 = this.app) !== null && _this$app6 !== void 0 && (_this$app6 = _this$app6.request) !== null && _this$app6 !== void 0 && _this$app6.post) {
                 _context31.next = 10;
                 break;
@@ -2496,18 +2498,18 @@ var Server = /*#__PURE__*/function () {
                 errorResponse: response,
                 response: response,
                 normalizedResponse: this.normalizeCheckoutResponse(response),
-                checkoutData: remoteCheckoutData
+                checkoutData: checkoutData
               });
             case 15:
               fresh = this.extractOrderDataFromCheckoutResponse(response);
-              externalSaleNumber = this.getCheckoutExternalSaleNumber(remoteCheckoutData, {
+              externalSaleNumber = this.getCheckoutExternalSaleNumber(checkoutData, {
                 external_sale_number: params.externalSaleNumber,
-                data: remoteCheckoutData
+                data: checkoutData
               });
               _context31.next = 19;
               return this.persistSyncedCheckoutOrder({
                 backendPath: backendPath,
-                checkoutData: remoteCheckoutData,
+                checkoutData: checkoutData,
                 externalSaleNumber: externalSaleNumber,
                 fresh: fresh,
                 title: title,
@@ -2520,7 +2522,7 @@ var Server = /*#__PURE__*/function () {
                 checkoutResponseOrder: fresh
               }) : undefined;
               if (!(printableSyncedOrder && this.shouldPrintSyncedOrder({
-                checkoutData: remoteCheckoutData,
+                checkoutData: checkoutData,
                 syncedOrder: printableSyncedOrder
               }))) {
                 _context31.next = 24;
@@ -2528,7 +2530,7 @@ var Server = /*#__PURE__*/function () {
               }
               _context31.next = 24;
               return this.dispatchPrintOtherReceiptTask({
-                checkoutData: remoteCheckoutData,
+                checkoutData: checkoutData,
                 syncedOrder: printableSyncedOrder,
                 response: response,
                 deviceId: params.deviceId
@@ -2538,7 +2540,7 @@ var Server = /*#__PURE__*/function () {
                 rejected: false,
                 response: response,
                 normalizedResponse: this.normalizeCheckoutResponse(response),
-                checkoutData: remoteCheckoutData,
+                checkoutData: checkoutData,
                 syncedOrder: syncedOrder,
                 fresh: fresh
               });
@@ -2562,6 +2564,67 @@ var Server = /*#__PURE__*/function () {
       delete next.syncMode;
       return next;
     }
+  }, {
+    key: "buildRemoteCheckoutData",
+    value: function buildRemoteCheckoutData(data, title) {
+      var next = cloneDeep(this.omitCheckoutSyncMode(data));
+      if (!next || _typeof(next) !== 'object') return next;
+      var record = next;
+      if (!Array.isArray(record.payments)) return next;
+      var originalPayments = record.payments;
+      var filteredPayments = originalPayments.filter(function (payment) {
+        return !isPendingOrderPayment(payment);
+      });
+      var removedPayments = originalPayments.filter(function (payment) {
+        return isPendingOrderPayment(payment);
+      });
+      record.payments = filteredPayments;
+      this.logInfo("".concat(title, ": checkout \u4E91\u7AEF\u652F\u4ED8\u9879\u5DF2\u8FC7\u6EE4"), {
+        external_sale_number: record.external_sale_number,
+        original_payment_count: originalPayments.length,
+        remote_payment_count: filteredPayments.length,
+        filtered_pending_count: removedPayments.length,
+        filtered_payment_identities: removedPayments.map(function (payment) {
+          return getOrderPaymentIdentityKeys(payment);
+        })
+      });
+      return next;
+    }
+  }, {
+    key: "mergeCheckoutSyncPayments",
+    value: function mergeCheckoutSyncPayments(checkoutData, fresh, title) {
+      var localPayments = Array.isArray(checkoutData === null || checkoutData === void 0 ? void 0 : checkoutData.payments) ? checkoutData.payments : [];
+      var freshRecord = fresh;
+      if (!Array.isArray(freshRecord.payments)) {
+        return localPayments.length > 0 ? _objectSpread(_objectSpread({}, freshRecord), {}, {
+          payments: cloneDeep(localPayments)
+        }) : freshRecord;
+      }
+      var freshPayments = freshRecord.payments;
+      var mergedPayments = mergeOrderPaymentListsByIdentity(localPayments, freshPayments, {
+        preserveUnmatchedExistingWhen: isIdentifiedPendingOrderPayment
+      });
+      var remoteIdentityKeys = new Set(freshPayments.flatMap(function (payment) {
+        return getOrderPaymentIdentityKeys(payment);
+      }));
+      var preservedPending = localPayments.filter(function (payment) {
+        return isIdentifiedPendingOrderPayment(payment) && !getOrderPaymentIdentityKeys(payment).some(function (key) {
+          return remoteIdentityKeys.has(key);
+        });
+      });
+      if (preservedPending.length > 0) {
+        this.logInfo("".concat(title, ": checkout \u54CD\u5E94\u5408\u5E76\u4FDD\u7559\u672C\u5730 pending \u652F\u4ED8\u9879"), {
+          external_sale_number: checkoutData === null || checkoutData === void 0 ? void 0 : checkoutData.external_sale_number,
+          preserved_pending_count: preservedPending.length,
+          preserved_payment_identities: preservedPending.map(function (payment) {
+            return getOrderPaymentIdentityKeys(payment);
+          })
+        });
+      }
+      return _objectSpread(_objectSpread({}, freshRecord), {}, {
+        payments: mergedPayments
+      });
+    }
   }, {
     key: "persistSyncedCheckoutOrder",
     value: function () {
@@ -2576,11 +2639,11 @@ var Server = /*#__PURE__*/function () {
                 _context32.next = 9;
                 break;
               }
-              syncedOrder = persistCheckoutDataWithResponse ? _objectSpread(_objectSpread(_objectSpread({}, checkoutData), fresh), {}, {
+              syncedOrder = persistCheckoutDataWithResponse ? _objectSpread(_objectSpread(_objectSpread({}, checkoutData), this.mergeCheckoutSyncPayments(checkoutData, fresh, title)), {}, {
                 external_sale_number: (_external_sale_number2 = fresh.external_sale_number) !== null && _external_sale_number2 !== void 0 ? _external_sale_number2 : externalSaleNumber,
                 need_sync: 0,
                 is_draft_order: 0
-              }) : _objectSpread(_objectSpread({}, fresh), {}, {
+              }) : _objectSpread(_objectSpread({}, this.mergeCheckoutSyncPayments(checkoutData, fresh, title)), {}, {
                 external_sale_number: (_external_sale_number3 = fresh.external_sale_number) !== null && _external_sale_number3 !== void 0 ? _external_sale_number3 : externalSaleNumber,
                 need_sync: 0,
                 is_draft_order: 0

package/dist/server/modules/order/index.d.ts

@@ -260,6 +260,9 @@ export declare class OrderModule extends BaseModule implements Module {
     private getProductIdentityKeys;
     private mergeOrderProductLists;
     private mergeOrderPaymentLists;
+    private getIdentifiedPendingPayments;
+    private shouldProtectLocalOrderFromRemoteSnapshot;
+    private getUnmatchedIdentifiedPendingPayments;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;
@@ -305,7 +308,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private updateOrderInSQLite;
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync 订单。
+     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync / pending 支付订单。
      * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example

package/dist/server/modules/order/index.js

@@ -7,11 +7,11 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -35,7 +35,7 @@ import dayjs from 'dayjs';
 import { BaseModule } from "../../../modules/BaseModule";
 import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 import { OrderHooks } from "./types";
-import { mergeOrderPaymentListsByIdentity, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "../../../modules/Order/payment-utils";
+import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "../../../modules/Order/payment-utils";
 
 /**
  * SQLite 存储名称
@@ -57,6 +57,7 @@ var ORDER_BUSINESS_WRITE_SOURCES = new Set(['upsertOrdersFromRemote', 'upsertPen
  * 仅用于排查增量身份索引是否遗漏了重复订单，不应在生产常开。
  */
 var ORDER_MERGE_SELF_CHECK = false;
+var PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER = '__pisell_os_pending_payment_without_unique_number__';
 var ORDER_AUTHORITATIVE_COLLECTION_FIELDS = ['products', 'bookings', 'payments'];
 var ORDER_COLLECTION_KIND_BY_FIELD = {
   products: 'product',
@@ -245,7 +246,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeOrderCollectionsForIngress",
     value: function normalizeOrderCollectionsForIngress(order, source) {
-      var result = normalizeOrderCollections(order);
+      var sourceOrder = cloneDeep(order);
+      var sourceOrderRecord = sourceOrder;
+      if (Array.isArray(sourceOrderRecord.payments)) {
+        sourceOrderRecord.payments = sourceOrderRecord.payments.map(function (payment) {
+          if (!isPendingOrderPayment(payment) || getOrderPaymentIdentityKeys(payment).some(function (key) {
+            return key.startsWith('unique_payment_number:');
+          })) {
+            return payment;
+          }
+          return _objectSpread(_objectSpread({}, payment), {}, _defineProperty({}, PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER, true));
+        });
+      }
+      var result = normalizeOrderCollections(sourceOrder);
+      var normalizedOrderRecord = result.order;
+      if (Array.isArray(normalizedOrderRecord.payments)) {
+        normalizedOrderRecord.payments = normalizedOrderRecord.payments.map(function (payment) {
+          if (!(payment !== null && payment !== void 0 && payment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER])) return payment;
+          var nextPayment = _objectSpread({}, payment);
+          var metadata = _objectSpread({}, nextPayment.metadata || {});
+          delete metadata.unique_payment_number;
+          delete nextPayment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER];
+          nextPayment.metadata = metadata;
+          return nextPayment;
+        });
+      }
       var kinds = ['product', 'booking', 'payment'];
       var hasChanges = kinds.some(function (kind) {
         var stats = result.stats[kind];
@@ -289,8 +314,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "mergeAuthoritativeOrderCollection",
     value: function mergeAuthoritativeOrderCollection(field, existing, incoming) {
       var uidRemaps = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+      var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
       var kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
       var existingItems = Array.isArray(existing) ? existing : [];
+      if (field === 'payments' && options.preserveIdentifiedPendingPayments) {
+        return mergeOrderPaymentListsByIdentity(existingItems, incoming, {
+          preserveUnmatchedExistingWhen: isIdentifiedPendingOrderPayment
+        });
+      }
       return incoming.map(function (incomingItem) {
         var existingItem = existingItems.find(function (item) {
           return isSameOrderCollectionItem(kind, item, incomingItem);
@@ -961,12 +992,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return this.loadOrdersFromSQLite();
             case 3:
               protectedOrdersBeforeRemoteFetch = _context7.sent.filter(function (order) {
-                return _this5.isPendingSyncOrder(order) || _this5.isDraftOrder(order);
+                return _this5.shouldProtectLocalOrderFromRemoteSnapshot(order);
               });
               this.logInfo('loadOrdersByServer-开始', {
                 hasOrderDataSource: !!this.orderDataSource,
                 query: ((_this$store = this.store) === null || _this$store === void 0 ? void 0 : _this$store.createdAtQuery) || null,
-                protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length
+                protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length,
+                protectedPendingPaymentCount: protectedOrdersBeforeRemoteFetch.reduce(function (count, order) {
+                  return count + _this5.getIdentifiedPendingPayments(order).length;
+                }, 0)
               });
               if (!this.orderDataSource) {
                 _context7.next = 20;
@@ -2745,6 +2779,33 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (incomingList.length === 0) return cloneDeep(existingList);
       return mergeOrderPaymentListsByIdentity(existingList, incomingList);
     }
+  }, {
+    key: "getIdentifiedPendingPayments",
+    value: function getIdentifiedPendingPayments(order) {
+      var payments = Array.isArray(order === null || order === void 0 ? void 0 : order.payments) ? order.payments : [];
+      return payments.filter(function (payment) {
+        return isIdentifiedPendingOrderPayment(payment);
+      });
+    }
+  }, {
+    key: "shouldProtectLocalOrderFromRemoteSnapshot",
+    value: function shouldProtectLocalOrderFromRemoteSnapshot(order) {
+      return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0;
+    }
+  }, {
+    key: "getUnmatchedIdentifiedPendingPayments",
+    value: function getUnmatchedIdentifiedPendingPayments(existing, incoming) {
+      var existingPayments = Array.isArray(existing) ? existing : [];
+      var incomingPayments = Array.isArray(incoming) ? incoming : [];
+      var incomingIdentityKeys = new Set(incomingPayments.flatMap(function (payment) {
+        return getOrderPaymentIdentityKeys(payment);
+      }));
+      return existingPayments.filter(function (payment) {
+        return isIdentifiedPendingOrderPayment(payment) && !getOrderPaymentIdentityKeys(payment).some(function (key) {
+          return incomingIdentityKeys.has(key);
+        });
+      });
+    }
   }, {
     key: "mergeOrderRecords",
     value: function mergeOrderRecords(existing, incoming) {
@@ -2782,7 +2843,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       for (var _i6 = 0, _ORDER_AUTHORITATIVE_2 = ORDER_AUTHORITATIVE_COLLECTION_FIELDS; _i6 < _ORDER_AUTHORITATIVE_2.length; _i6++) {
         var _field2 = _ORDER_AUTHORITATIVE_2[_i6];
         if (Array.isArray(incomingRecord[_field2])) {
-          mergedRecord[_field2] = this.mergeAuthoritativeOrderCollection(_field2, existingRecord[_field2], incomingRecord[_field2], childUidRemaps);
+          if (_field2 === 'payments') {
+            var preservedPending = this.getUnmatchedIdentifiedPendingPayments(existingRecord[_field2], incomingRecord[_field2]);
+            if (preservedPending.length > 0) {
+              var _ref5, _existing$order_id, _ref6, _existingRecord$exter;
+              this.logInfo('mergeOrderRecords-保留本地 pending 支付项', {
+                order_id: (_ref5 = (_existing$order_id = existing.order_id) !== null && _existing$order_id !== void 0 ? _existing$order_id : incoming.order_id) !== null && _ref5 !== void 0 ? _ref5 : null,
+                external_sale_number: (_ref6 = (_existingRecord$exter = existingRecord.external_sale_number) !== null && _existingRecord$exter !== void 0 ? _existingRecord$exter : incomingRecord.external_sale_number) !== null && _ref6 !== void 0 ? _ref6 : null,
+                preserved_pending_count: preservedPending.length,
+                preserved_payment_identities: preservedPending.map(function (payment) {
+                  return getOrderPaymentIdentityKeys(payment);
+                })
+              });
+            }
+          }
+          mergedRecord[_field2] = this.mergeAuthoritativeOrderCollection(_field2, existingRecord[_field2], incomingRecord[_field2], childUidRemaps, {
+            preserveIdentifiedPendingPayments: _field2 === 'payments'
+          });
           continue;
         }
         if (Object.prototype.hasOwnProperty.call(existingRecord, _field2)) {
@@ -2825,14 +2902,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator26.f();
       }
-      return _toConsumableArray(groups.entries()).filter(function (_ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
-          group = _ref6[1];
-        return group.length > 1;
-      }).slice(0, 20).map(function (_ref7) {
+      return _toConsumableArray(groups.entries()).filter(function (_ref7) {
         var _ref8 = _slicedToArray(_ref7, 2),
-          key = _ref8[0],
           group = _ref8[1];
+        return group.length > 1;
+      }).slice(0, 20).map(function (_ref9) {
+        var _ref10 = _slicedToArray(_ref9, 2),
+          key = _ref10[0],
+          group = _ref10[1];
         return {
           key: key,
           count: group.length,
@@ -3069,7 +3146,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator29.s(); !(_step29 = _iterator29.n()).done;) {
           var rawOrder = _step29.value;
           var order = this.normalizeOrderCollectionsForIngress(rawOrder, 'mergeRemoteSnapshotWithPendingOrders.existingSQLite');
-          if (!this.isPendingSyncOrder(order) && !this.isDraftOrder(order)) continue;
+          if (!this.shouldProtectLocalOrderFromRemoteSnapshot(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
             if (this.isDraftOrder(order)) {
@@ -3443,7 +3520,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return updateOrderInSQLite;
     }()
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync 订单。
+     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync / pending 支付订单。
      * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
@@ -3501,7 +3578,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map(function (order) {
                         return _this23.normalizeOrderCollectionsForIngress(order, "".concat(source, ".protectedBeforeRemoteFetch"));
                       }).filter(function (order) {
-                        return _this23.isPendingSyncOrder(order) || _this23.isDraftOrder(order);
+                        return _this23.shouldProtectLocalOrderFromRemoteSnapshot(order);
                       });
                       _iterator31 = _createForOfIteratorHelper(existingOrders || []);
                       _context25.prev = 10;
@@ -3514,7 +3591,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       rawCurrentOrder = _step31.value;
                       currentOrder = _this23.normalizeOrderCollectionsForIngress(rawCurrentOrder, "".concat(source, ".currentSQLite"));
                       protectedIndex = _this23.findOrderIndexByIdentity(protectedLocalOrders, currentOrder);
-                      currentNeedsProtection = _this23.isPendingSyncOrder(currentOrder) || _this23.isDraftOrder(currentOrder);
+                      currentNeedsProtection = _this23.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
                       if (!(protectedIndex >= 0)) {
                         _context25.next = 20;
                         break;
@@ -3550,7 +3627,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         remoteCount: remoteSnapshot.length,
                         protectedBeforeRemoteFetchCount: protectedOrdersBeforeRemoteFetch.length,
                         protectedLocalOrderCount: protectedLocalOrders.length,
-                        preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length
+                        preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length,
+                        protectedPendingPaymentCount: protectedLocalOrders.reduce(function (count, order) {
+                          return count + _this23.getIdentifiedPendingPayments(order).length;
+                        }, 0),
+                        protectedPendingPaymentIdentities: protectedLocalOrders.flatMap(function (order) {
+                          return _this23.getIdentifiedPendingPayments(order).map(function (payment) {
+                            var _order$order_id5, _external_sale_number5;
+                            return {
+                              order_id: (_order$order_id5 = order.order_id) !== null && _order$order_id5 !== void 0 ? _order$order_id5 : null,
+                              external_sale_number: (_external_sale_number5 = order.external_sale_number) !== null && _external_sale_number5 !== void 0 ? _external_sale_number5 : null,
+                              payment_identities: getOrderPaymentIdentityKeys(payment)
+                            };
+                          });
+                        })
                       });
                       _context25.next = 36;
                       return _this23.dbManager.clear(INDEXDB_STORE_NAME);

package/dist/solution/BaseSales/index.js

@@ -37,7 +37,7 @@ import Decimal from 'decimal.js';
 import { cloneDeep, mergeWith } from 'lodash-es';
 import { createModule } from "../BookingByStep/types";
 import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, resolveIsFormSubject, sumOptionUnitPrice } from "../../modules/Order/utils";
-import { ensureOrderPaymentNumber, mergeOrderPaymentListsByIdentity, resolveOrderPaymentIdentity } from "../../modules/Order/payment-utils";
+import { ensureOrderPaymentNumber, isIdentifiedPendingOrderPayment, mergeOrderPaymentListsByIdentity, resolveOrderPaymentIdentity } from "../../modules/Order/payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { applyOrderCollectionUidRemaps, getOrderCollectionPersistentId, getOrderCollectionReferenceUid, getOrderCollectionUid, isSameOrderCollectionItem, mergeOrderCollectionItems, normalizeOrderCollection, normalizeOrderCollections, setOrderCollectionUid } from "../../modules/Order/utils/orderCollectionIdentity";
 import dayjs from 'dayjs';
@@ -149,6 +149,15 @@ function mergeBaseSalesCollectionItem(kind, currentItem, incomingItem, uidRemaps
   return kind === 'product' ? mergeBaseSalesProductSnapshotFields(currentItem, mergedItem) : mergedItem;
 }
 function mergeBaseSalesOrderCollection(kind, currentValue, incomingValue, strategy, uidRemaps) {
+  if (kind === 'payment') {
+    return mergeOrderPaymentListsByIdentity(currentValue, incomingValue, strategy === 'preserve-local' ? {
+      preserveUnmatchedExisting: true
+    } : {
+      preserveUnmatchedExistingWhen: function preserveUnmatchedExistingWhen(payment) {
+        return isIdentifiedPendingOrderPayment(payment) || !getOrderCollectionPersistentId('payment', payment);
+      }
+    });
+  }
   var currentItems = normalizeOrderCollection(kind, currentValue, {
     ensureUid: false
   }).items;

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

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

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/Order/payment-utils.d.ts

@@ -10,6 +10,8 @@ export interface OrderPaymentIdentityMatch<T> {
     matchedBy: OrderPaymentIdentityType;
 }
 export declare function getOrderPaymentIdentityKeys(payment: unknown): string[];
+export declare function isPendingOrderPayment(payment: unknown): boolean;
+export declare function isIdentifiedPendingOrderPayment(payment: unknown): boolean;
 export declare function hasOrderPaymentIdentityOverlap(left: unknown, right: unknown): boolean;
 export declare function resolveOrderPaymentIdentity<T extends Record<string, any>>(payments: T[] | null | undefined, identity: string | number, mode?: 'payment_number' | 'compat'): OrderPaymentIdentityMatch<T> | null;
 export declare function ensureOrderPaymentNumber<T extends Record<string, any>>(payment: T, devicePrefix: string, createPaymentNumber: () => string): T & {
@@ -20,4 +22,5 @@ export declare function mergeOrderPaymentRecord<T extends Record<string, any>>(p
 export declare function mergeOrderPaymentSnapshot<T extends Record<string, any>>(current: T, incoming: T): T;
 export declare function mergeOrderPaymentListsByIdentity<T extends Record<string, any>>(existing: T[] | null | undefined, incoming: T[] | null | undefined, options?: {
     preserveUnmatchedExisting?: boolean;
+    preserveUnmatchedExistingWhen?: (payment: T) => boolean;
 }): T[];

package/lib/modules/Order/payment-utils.js

@@ -22,6 +22,8 @@ __export(payment_utils_exports, {
   ensureOrderPaymentNumber: () => ensureOrderPaymentNumber,
   getOrderPaymentIdentityKeys: () => getOrderPaymentIdentityKeys,
   hasOrderPaymentIdentityOverlap: () => hasOrderPaymentIdentityOverlap,
+  isIdentifiedPendingOrderPayment: () => isIdentifiedPendingOrderPayment,
+  isPendingOrderPayment: () => isPendingOrderPayment,
   mergeOrderPaymentListsByIdentity: () => mergeOrderPaymentListsByIdentity,
   mergeOrderPaymentRecord: () => mergeOrderPaymentRecord,
   mergeOrderPaymentSnapshot: () => mergeOrderPaymentSnapshot,
@@ -55,6 +57,13 @@ function getOrderPaymentIdentityKeys(payment) {
     return value === null ? [] : [`${type}:${value}`];
   });
 }
+function isPendingOrderPayment(payment) {
+  const record = payment;
+  return String((record == null ? void 0 : record.status) || "").toLowerCase() === "payment_pending";
+}
+function isIdentifiedPendingOrderPayment(payment) {
+  return isPendingOrderPayment(payment) && getOrderPaymentIdentityKeys(payment).length > 0;
+}
 function hasOrderPaymentIdentityOverlap(left, right) {
   const leftKeys = new Set(getOrderPaymentIdentityKeys(left));
   if (leftKeys.size === 0)
@@ -131,6 +140,19 @@ function mergeOrderPaymentRecord(payment, updates) {
 function mergeOrderPaymentSnapshot(current, incoming) {
   const currentMetadata = current.metadata || {};
   const incomingMetadata = incoming.metadata || {};
+  const currentUniquePaymentNumber = normalizePaymentIdentityValue(
+    currentMetadata.unique_payment_number
+  );
+  const incomingUniquePaymentNumber = normalizePaymentIdentityValue(
+    incomingMetadata.unique_payment_number
+  );
+  const incomingOrderPaymentId = normalizePaymentIdentityValue(
+    incoming.order_payment_id
+  );
+  const incomingFallbackPrefix = incomingOrderPaymentId ? `os-fallback:payment:order-payment:${incomingOrderPaymentId}` : null;
+  const incomingUsesDerivedUniquePaymentNumber = Boolean(
+    incomingUniquePaymentNumber && incomingFallbackPrefix && (incomingUniquePaymentNumber === incomingFallbackPrefix || incomingUniquePaymentNumber.startsWith(`${incomingFallbackPrefix}:conflict:`))
+  );
   const transactions = mergeOrderPaymentTransactions(
     currentMetadata.transactions,
     incomingMetadata.transactions
@@ -138,10 +160,12 @@ function mergeOrderPaymentSnapshot(current, incoming) {
   return {
     ...current,
     ...incoming,
+    order_payment_id: normalizePaymentIdentityValue(incoming.order_payment_id) !== null ? incoming.order_payment_id : current.order_payment_id,
     payment_number: incoming.payment_number || current.payment_number,
     metadata: {
       ...currentMetadata,
       ...incomingMetadata,
+      ...incomingUsesDerivedUniquePaymentNumber && currentUniquePaymentNumber ? { unique_payment_number: currentUniquePaymentNumber } : {},
       ...transactions.length > 0 ? { transactions } : {}
     }
   };
@@ -172,19 +196,26 @@ function mergeOrderPaymentListsByIdentity(existing, incoming, options = {}) {
   if (options.preserveUnmatchedExisting) {
     return compactOrderPaymentList([...existingList, ...incomingList]);
   }
-  return compactOrderPaymentList(incomingList.map((incomingPayment) => {
+  const mergedIncoming = incomingList.map((incomingPayment) => {
     const matchingExisting = existingList.filter((existingPayment) => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment));
     return matchingExisting.reduce(
       (merged, existingPayment) => mergeOrderPaymentSnapshot(existingPayment, merged),
       incomingPayment
     );
-  }));
+  });
+  const preservedExisting = options.preserveUnmatchedExistingWhen ? existingList.filter((existingPayment) => {
+    var _a;
+    return !incomingList.some((incomingPayment) => hasOrderPaymentIdentityOverlap(existingPayment, incomingPayment)) && ((_a = options.preserveUnmatchedExistingWhen) == null ? void 0 : _a.call(options, existingPayment));
+  }) : [];
+  return compactOrderPaymentList([...mergedIncoming, ...preservedExisting]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ensureOrderPaymentNumber,
   getOrderPaymentIdentityKeys,
   hasOrderPaymentIdentityOverlap,
+  isIdentifiedPendingOrderPayment,
+  isPendingOrderPayment,
   mergeOrderPaymentListsByIdentity,
   mergeOrderPaymentRecord,
   mergeOrderPaymentSnapshot,

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

@@ -220,6 +220,9 @@ function normalizeOrderCollection(kind, items, options) {
     const persistentId = getOrderCollectionPersistentId(kind, item);
     let uid = getOrderCollectionUid(kind, item);
     if (!uid) {
+      if (kind === "payment" && !isBlankOrderCollectionIdentity(item == null ? void 0 : item.payment_number)) {
+        continue;
+      }
       uid = persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       item = setOrderCollectionUid(kind, item, uid);
       result[index] = item;

package/lib/server/index.d.ts

@@ -121,6 +121,8 @@ declare class Server {
     private handleSyncSalesTask;
     private runCheckoutSync;
     private omitCheckoutSyncMode;
+    private buildRemoteCheckoutData;
+    private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。

package/lib/server/index.js

@@ -35,6 +35,7 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
+var import_lodash_es = require("lodash-es");
 var import_products = require("./modules/products");
 var import_menu = require("./modules/menu");
 var import_quotation = require("./modules/quotation");
@@ -52,6 +53,7 @@ var import_filterOrders = require("./modules/order/utils/filterOrders");
 var import_filterBookings = require("./modules/order/utils/filterBookings");
 var import_small_ticket = require("./utils/small-ticket");
 var import_BaseSales = require("../solution/BaseSales");
+var import_payment_utils = require("../modules/Order/payment-utils");
 __reExport(server_exports, require("./modules"), module.exports);
 var PRODUCT_TITLE_SNAPSHOT_KEYS = [
   "en",
@@ -1481,7 +1483,7 @@ var Server = class {
     const { backendPath, title } = params;
     const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
     const checkoutData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const remoteCheckoutData = this.omitCheckoutSyncMode(checkoutData);
+    const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
     if (!((_b = (_a = this.app) == null ? void 0 : _a.request) == null ? void 0 : _b.post)) {
       throw new Error("app.request 不可用");
     }
@@ -1497,20 +1499,20 @@ var Server = class {
         errorResponse: response,
         response,
         normalizedResponse: this.normalizeCheckoutResponse(response),
-        checkoutData: remoteCheckoutData
+        checkoutData
       };
     }
     const fresh = this.extractOrderDataFromCheckoutResponse(response);
     const externalSaleNumber = this.getCheckoutExternalSaleNumber(
-      remoteCheckoutData,
+      checkoutData,
       {
         external_sale_number: params.externalSaleNumber,
-        data: remoteCheckoutData
+        data: checkoutData
       }
     );
     const syncedOrder = await this.persistSyncedCheckoutOrder({
       backendPath,
-      checkoutData: remoteCheckoutData,
+      checkoutData,
       externalSaleNumber,
       fresh,
       title,
@@ -1521,11 +1523,11 @@ var Server = class {
       checkoutResponseOrder: fresh
     }) : void 0;
     if (printableSyncedOrder && this.shouldPrintSyncedOrder({
-      checkoutData: remoteCheckoutData,
+      checkoutData,
       syncedOrder: printableSyncedOrder
     })) {
       await this.dispatchPrintOtherReceiptTask({
-        checkoutData: remoteCheckoutData,
+        checkoutData,
         syncedOrder: printableSyncedOrder,
         response,
         deviceId: params.deviceId
@@ -1535,7 +1537,7 @@ var Server = class {
       rejected: false,
       response,
       normalizedResponse: this.normalizeCheckoutResponse(response),
-      checkoutData: remoteCheckoutData,
+      checkoutData,
       syncedOrder,
       fresh
     };
@@ -1548,6 +1550,54 @@ var Server = class {
     delete next.syncMode;
     return next;
   }
+  buildRemoteCheckoutData(data, title) {
+    const next = (0, import_lodash_es.cloneDeep)(this.omitCheckoutSyncMode(data));
+    if (!next || typeof next !== "object")
+      return next;
+    const record = next;
+    if (!Array.isArray(record.payments))
+      return next;
+    const originalPayments = record.payments;
+    const filteredPayments = originalPayments.filter((payment) => !(0, import_payment_utils.isPendingOrderPayment)(payment));
+    const removedPayments = originalPayments.filter((payment) => (0, import_payment_utils.isPendingOrderPayment)(payment));
+    record.payments = filteredPayments;
+    this.logInfo(`${title}: checkout 云端支付项已过滤`, {
+      external_sale_number: record.external_sale_number,
+      original_payment_count: originalPayments.length,
+      remote_payment_count: filteredPayments.length,
+      filtered_pending_count: removedPayments.length,
+      filtered_payment_identities: removedPayments.map((payment) => (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment))
+    });
+    return next;
+  }
+  mergeCheckoutSyncPayments(checkoutData, fresh, title) {
+    const localPayments = Array.isArray(checkoutData == null ? void 0 : checkoutData.payments) ? checkoutData.payments : [];
+    const freshRecord = fresh;
+    if (!Array.isArray(freshRecord.payments)) {
+      return localPayments.length > 0 ? { ...freshRecord, payments: (0, import_lodash_es.cloneDeep)(localPayments) } : freshRecord;
+    }
+    const freshPayments = freshRecord.payments;
+    const mergedPayments = (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(
+      localPayments,
+      freshPayments,
+      { preserveUnmatchedExistingWhen: import_payment_utils.isIdentifiedPendingOrderPayment }
+    );
+    const remoteIdentityKeys = new Set(
+      freshPayments.flatMap((payment) => (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment))
+    );
+    const preservedPending = localPayments.filter((payment) => (0, import_payment_utils.isIdentifiedPendingOrderPayment)(payment) && !(0, import_payment_utils.getOrderPaymentIdentityKeys)(payment).some((key) => remoteIdentityKeys.has(key)));
+    if (preservedPending.length > 0) {
+      this.logInfo(`${title}: checkout 响应合并保留本地 pending 支付项`, {
+        external_sale_number: checkoutData == null ? void 0 : checkoutData.external_sale_number,
+        preserved_pending_count: preservedPending.length,
+        preserved_payment_identities: preservedPending.map((payment) => (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment))
+      });
+    }
+    return {
+      ...freshRecord,
+      payments: mergedPayments
+    };
+  }
   async persistSyncedCheckoutOrder(params) {
     const {
       backendPath,
@@ -1562,12 +1612,12 @@ var Server = class {
     if (this.order && fresh && (shouldMergeRemoteOrder || persistCheckoutDataWithResponse)) {
       syncedOrder = persistCheckoutDataWithResponse ? {
         ...checkoutData,
-        ...fresh,
+        ...this.mergeCheckoutSyncPayments(checkoutData, fresh, title),
         external_sale_number: fresh.external_sale_number ?? externalSaleNumber,
         need_sync: 0,
         is_draft_order: 0
       } : {
-        ...fresh,
+        ...this.mergeCheckoutSyncPayments(checkoutData, fresh, title),
         external_sale_number: fresh.external_sale_number ?? externalSaleNumber,
         need_sync: 0,
         is_draft_order: 0

package/lib/server/modules/order/index.d.ts

@@ -260,6 +260,9 @@ export declare class OrderModule extends BaseModule implements Module {
     private getProductIdentityKeys;
     private mergeOrderProductLists;
     private mergeOrderPaymentLists;
+    private getIdentifiedPendingPayments;
+    private shouldProtectLocalOrderFromRemoteSnapshot;
+    private getUnmatchedIdentifiedPendingPayments;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;
@@ -305,7 +308,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private updateOrderInSQLite;
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync 订单。
+     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync / pending 支付订单。
      * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example

package/lib/server/modules/order/index.js

@@ -53,6 +53,7 @@ var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "updateLocalPayment"
 ]);
 var ORDER_MERGE_SELF_CHECK = false;
+var PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER = "__pisell_os_pending_payment_without_unique_number__";
 var ORDER_AUTHORITATIVE_COLLECTION_FIELDS = ["products", "bookings", "payments"];
 var ORDER_COLLECTION_KIND_BY_FIELD = {
   products: "product",
@@ -172,7 +173,35 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 仅记录计数与订单标识，不输出商品、预约、支付或客户明细。
    */
   normalizeOrderCollectionsForIngress(order, source) {
-    const result = (0, import_orderCollectionIdentity.normalizeOrderCollections)(order);
+    const sourceOrder = (0, import_lodash_es.cloneDeep)(order);
+    const sourceOrderRecord = sourceOrder;
+    if (Array.isArray(sourceOrderRecord.payments)) {
+      sourceOrderRecord.payments = sourceOrderRecord.payments.map((payment) => {
+        if (!(0, import_payment_utils.isPendingOrderPayment)(payment) || (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment).some((key) => key.startsWith("unique_payment_number:"))) {
+          return payment;
+        }
+        return {
+          ...payment,
+          [PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER]: true
+        };
+      });
+    }
+    const result = (0, import_orderCollectionIdentity.normalizeOrderCollections)(sourceOrder);
+    const normalizedOrderRecord = result.order;
+    if (Array.isArray(normalizedOrderRecord.payments)) {
+      normalizedOrderRecord.payments = normalizedOrderRecord.payments.map(
+        (payment) => {
+          if (!(payment == null ? void 0 : payment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER]))
+            return payment;
+          const nextPayment = { ...payment };
+          const metadata = { ...nextPayment.metadata || {} };
+          delete metadata.unique_payment_number;
+          delete nextPayment[PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER];
+          nextPayment.metadata = metadata;
+          return nextPayment;
+        }
+      );
+    }
     const kinds = ["product", "booking", "payment"];
     const hasChanges = kinds.some((kind) => {
       const stats = result.stats[kind];
@@ -208,9 +237,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   /**
    * incoming 决定权威成员集合；同一持久化行仍从 existing 补齐 incoming 省略的本地展示字段。
    */
-  mergeAuthoritativeOrderCollection(field, existing, incoming, uidRemaps = []) {
+  mergeAuthoritativeOrderCollection(field, existing, incoming, uidRemaps = [], options = {}) {
     const kind = ORDER_COLLECTION_KIND_BY_FIELD[field];
     const existingItems = Array.isArray(existing) ? existing : [];
+    if (field === "payments" && options.preserveIdentifiedPendingPayments) {
+      return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(
+        existingItems,
+        incoming,
+        { preserveUnmatchedExistingWhen: import_payment_utils.isIdentifiedPendingOrderPayment }
+      );
+    }
     return incoming.map((incomingItem) => {
       const existingItem = existingItems.find(
         (item) => (0, import_orderCollectionIdentity.isSameOrderCollectionItem)(kind, item, incomingItem)
@@ -695,12 +731,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     let orderList = [];
     const protectedOrdersBeforeRemoteFetch = (await this.loadOrdersFromSQLite()).filter(
-      (order) => this.isPendingSyncOrder(order) || this.isDraftOrder(order)
+      (order) => this.shouldProtectLocalOrderFromRemoteSnapshot(order)
     );
     this.logInfo("loadOrdersByServer-开始", {
       hasOrderDataSource: !!this.orderDataSource,
       query: ((_a = this.store) == null ? void 0 : _a.createdAtQuery) || null,
-      protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length
+      protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length,
+      protectedPendingPaymentCount: protectedOrdersBeforeRemoteFetch.reduce(
+        (count, order) => count + this.getIdentifiedPendingPayments(order).length,
+        0
+      )
     });
     if (this.orderDataSource) {
       try {
@@ -1745,6 +1785,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return (0, import_lodash_es.cloneDeep)(existingList);
     return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(existingList, incomingList);
   }
+  getIdentifiedPendingPayments(order) {
+    const payments = Array.isArray(order == null ? void 0 : order.payments) ? order.payments : [];
+    return payments.filter((payment) => (0, import_payment_utils.isIdentifiedPendingOrderPayment)(payment));
+  }
+  shouldProtectLocalOrderFromRemoteSnapshot(order) {
+    return this.isPendingSyncOrder(order) || this.isDraftOrder(order) || this.getIdentifiedPendingPayments(order).length > 0;
+  }
+  getUnmatchedIdentifiedPendingPayments(existing, incoming) {
+    const existingPayments = Array.isArray(existing) ? existing : [];
+    const incomingPayments = Array.isArray(incoming) ? incoming : [];
+    const incomingIdentityKeys = new Set(
+      incomingPayments.flatMap((payment) => (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment))
+    );
+    return existingPayments.filter((payment) => (0, import_payment_utils.isIdentifiedPendingOrderPayment)(payment) && !(0, import_payment_utils.getOrderPaymentIdentityKeys)(payment).some((key) => incomingIdentityKeys.has(key)));
+  }
   mergeOrderRecords(existing, incoming) {
     const preferred = this.pickPreferredOrder(existing, incoming);
     const secondary = preferred === existing ? incoming : existing;
@@ -1803,11 +1858,26 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     for (const field of ORDER_AUTHORITATIVE_COLLECTION_FIELDS) {
       if (Array.isArray(incomingRecord[field])) {
+        if (field === "payments") {
+          const preservedPending = this.getUnmatchedIdentifiedPendingPayments(
+            existingRecord[field],
+            incomingRecord[field]
+          );
+          if (preservedPending.length > 0) {
+            this.logInfo("mergeOrderRecords-保留本地 pending 支付项", {
+              order_id: existing.order_id ?? incoming.order_id ?? null,
+              external_sale_number: existingRecord.external_sale_number ?? incomingRecord.external_sale_number ?? null,
+              preserved_pending_count: preservedPending.length,
+              preserved_payment_identities: preservedPending.map((payment) => (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment))
+            });
+          }
+        }
         mergedRecord[field] = this.mergeAuthoritativeOrderCollection(
           field,
           existingRecord[field],
           incomingRecord[field],
-          childUidRemaps
+          childUidRemaps,
+          { preserveIdentifiedPendingPayments: field === "payments" }
         );
         continue;
       }
@@ -2009,7 +2079,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         rawOrder,
         "mergeRemoteSnapshotWithPendingOrders.existingSQLite"
       );
-      if (!this.isPendingSyncOrder(order) && !this.isDraftOrder(order))
+      if (!this.shouldProtectLocalOrderFromRemoteSnapshot(order))
         continue;
       const matchIndex = this.findOrderIndexByIdentity(merged, order);
       if (matchIndex >= 0) {
@@ -2170,7 +2240,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
   }
   /**
-   * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync 订单。
+   * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync / pending 支付订单。
    * 用于 SSE 全量拉取与营业日窗口裁剪。
    *
    * @example
@@ -2196,7 +2266,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const protectedLocalOrders = protectedOrdersBeforeRemoteFetch.map((order) => this.normalizeOrderCollectionsForIngress(
           order,
           `${source}.protectedBeforeRemoteFetch`
-        )).filter((order) => this.isPendingSyncOrder(order) || this.isDraftOrder(order));
+        )).filter((order) => this.shouldProtectLocalOrderFromRemoteSnapshot(order));
         for (const rawCurrentOrder of existingOrders || []) {
           const currentOrder = this.normalizeOrderCollectionsForIngress(
             rawCurrentOrder,
@@ -2206,7 +2276,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             protectedLocalOrders,
             currentOrder
           );
-          const currentNeedsProtection = this.isPendingSyncOrder(currentOrder) || this.isDraftOrder(currentOrder);
+          const currentNeedsProtection = this.shouldProtectLocalOrderFromRemoteSnapshot(currentOrder);
           if (protectedIndex >= 0) {
             if (currentNeedsProtection) {
               protectedLocalOrders[protectedIndex] = currentOrder;
@@ -2229,7 +2299,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           remoteCount: remoteSnapshot.length,
           protectedBeforeRemoteFetchCount: protectedOrdersBeforeRemoteFetch.length,
           protectedLocalOrderCount: protectedLocalOrders.length,
-          preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length
+          preservedLocalUnsyncedCount: mergedSnapshot.length - remoteSnapshot.length,
+          protectedPendingPaymentCount: protectedLocalOrders.reduce(
+            (count, order) => count + this.getIdentifiedPendingPayments(order).length,
+            0
+          ),
+          protectedPendingPaymentIdentities: protectedLocalOrders.flatMap((order) => this.getIdentifiedPendingPayments(order).map((payment) => ({
+            order_id: order.order_id ?? null,
+            external_sale_number: order.external_sale_number ?? null,
+            payment_identities: (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment)
+          })))
         });
         await this.dbManager.clear(INDEXDB_STORE_NAME);
         this.logInfo("replaceOrdersSnapshotInSQLite-clear完成", {

package/lib/solution/BaseSales/index.js

@@ -157,6 +157,15 @@ function mergeBaseSalesCollectionItem(kind, currentItem, incomingItem, uidRemaps
   return kind === "product" ? mergeBaseSalesProductSnapshotFields(currentItem, mergedItem) : mergedItem;
 }
 function mergeBaseSalesOrderCollection(kind, currentValue, incomingValue, strategy, uidRemaps) {
+  if (kind === "payment") {
+    return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(
+      currentValue,
+      incomingValue,
+      strategy === "preserve-local" ? { preserveUnmatchedExisting: true } : {
+        preserveUnmatchedExistingWhen: (payment) => (0, import_payment_utils.isIdentifiedPendingOrderPayment)(payment) || !(0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("payment", payment)
+      }
+    );
+  }
   const currentItems = (0, import_orderCollectionIdentity.normalizeOrderCollection)(kind, currentValue, {
     ensureUid: false
   }).items;

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

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

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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