@pisell/pisellos 2.3.33 → 2.3.35

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/BaseSales/utils/cartPromotion.js

@@ -245,9 +245,10 @@ export function mergeIdenticalPromotionCartLines(products) {
       var unitPrice = String((_ref2 = (_line$metadata$source = (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.source_product_price) !== null && _line$metadata$source !== void 0 ? _line$metadata$source : line.selling_price) !== null && _ref2 !== void 0 ? _ref2 : '');
       var promoUnitPrice = String((_ref3 = (_promotion$finalPrice = promotion.finalPrice) !== null && _promotion$finalPrice !== void 0 ? _promotion$finalPrice : (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.main_product_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '');
       var noteSignature = getProductLineNoteSignature(line);
+      var lineMergeBoundary = getPromotionLineMergeBoundary(line);
       var bookingUid = (_line$booking_uid = line === null || line === void 0 ? void 0 : line.booking_uid) !== null && _line$booking_uid !== void 0 ? _line$booking_uid : line === null || line === void 0 || (_line$metadata4 = line.metadata) === null || _line$metadata4 === void 0 ? void 0 : _line$metadata4.booking_uid;
       var orderDetailId = (_line$order_detail_id = line === null || line === void 0 ? void 0 : line.order_detail_id) !== null && _line$order_detail_id !== void 0 ? _line$order_detail_id : line === null || line === void 0 ? void 0 : line.orderDetailId;
-      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, noteSignature, bookingUid ? String(bookingUid) : '', orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '' ? String(orderDetailId) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
+      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, noteSignature, lineMergeBoundary, bookingUid ? String(bookingUid) : '', orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '' ? String(orderDetailId) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
       var hitIndex = indexByKey.get(mergeKey);
       if (hitIndex === undefined) {
         indexByKey.set(mergeKey, merged.length);
@@ -423,6 +424,16 @@ function getProductLineNoteSignature(product) {
   var uid = getOrderProductUid(product);
   return uid ? "note:".concat(uid) : "note:".concat(normalizedNote);
 }
+
+/**
+ * 编辑订单时，历史行仍参与整车促销评估，但不能与本次新增行合并。
+ * 以历史行 uid 作为促销前后的行边界；新增行返回空边界，仍保留原有合并语义。
+ */
+function getPromotionLineMergeBoundary(product) {
+  var _product$metadata3;
+  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_edit_for_runtime) !== true) return '';
+  return "edit:".concat(getOrderProductUid(product));
+}
 function isPersistedGeneratedVoucher(product) {
   var _product$order_detail;
   var orderDetailId = (_product$order_detail = product === null || product === void 0 ? void 0 : product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : product === null || product === void 0 ? void 0 : product.orderDetailId;
@@ -463,17 +474,18 @@ export function buildConsolidateKeyForPromotion(item) {
   var _item$booking_uid, _item$metadata, _item$order_detail_id, _item$product_variant3;
   var fingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
   var noteSignature = getProductLineNoteSignature(item);
+  var lineMergeBoundary = getPromotionLineMergeBoundary(item);
   var bookingUid = (_item$booking_uid = item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _item$booking_uid !== void 0 ? _item$booking_uid : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.booking_uid;
   var orderDetailId = (_item$order_detail_id = item === null || item === void 0 ? void 0 : item.order_detail_id) !== null && _item$order_detail_id !== void 0 ? _item$order_detail_id : item === null || item === void 0 ? void 0 : item.orderDetailId;
   if (orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '') {
     var _item$product_variant;
-    return [item.product_id, (_item$product_variant = item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0, fingerprint, noteSignature, String(orderDetailId)].join('#');
+    return [item.product_id, (_item$product_variant = item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0, fingerprint, noteSignature, lineMergeBoundary, String(orderDetailId)].join('#');
   }
   if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
     var _item$product_variant2;
-    return [item.product_id, (_item$product_variant2 = item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0, fingerprint, noteSignature, String(bookingUid)].join('#');
+    return [item.product_id, (_item$product_variant2 = item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0, fingerprint, noteSignature, lineMergeBoundary, String(bookingUid)].join('#');
   }
-  return [item.product_id, (_item$product_variant3 = item.product_variant_id) !== null && _item$product_variant3 !== void 0 ? _item$product_variant3 : 0, fingerprint, noteSignature].join('#');
+  return [item.product_id, (_item$product_variant3 = item.product_variant_id) !== null && _item$product_variant3 !== void 0 ? _item$product_variant3 : 0, fingerprint, noteSignature, lineMergeBoundary].join('#');
 }
 function consolidateMainProductsForPromotion(entries) {
   if (!Array.isArray(entries) || entries.length <= 1) {
@@ -838,13 +850,13 @@ export function resolveStrategyEligibleProducts(matched) {
 export function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts) {
   var unfulfilledMap = new Map();
   var _loop2 = function _loop2() {
-      var _product$metadata3, _ref13, _product$_originalPro, _product$metadata4, _product$num2;
+      var _product$metadata4, _ref13, _product$_originalPro, _product$metadata5, _product$num2;
       var product = processedProducts[i];
-      var promotion = product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3._promotion;
+      var promotion = product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4._promotion;
       if (!promotion || promotion.inPromotion !== false) return 0; // continue
       var strategyId = promotion.strategyId;
       if (!strategyId) return 0; // continue
-      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
+      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
       var originalIndex = mainProducts.findIndex(function (item) {
         return getOrderProductUid(item) === lookupUid;
       });

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 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/dist/solution/Sales/index.js

@@ -29,6 +29,7 @@ import dayjs from 'dayjs';
 import { BaseModule } from "../../modules/BaseModule";
 import { SalesHooks } from "./types";
 export * from "./types";
+var UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
 
 /**
  * Sales 解决方案基础骨架
@@ -415,6 +416,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _booking$order$paymen, _booking$order;
       return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
     }
+  }, {
+    key: "isUnpaidBooking",
+    value: function isUnpaidBooking(booking) {
+      return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
+    }
   }, {
     key: "countBookingOrders",
     value: function countBookingOrders(bookings) {
@@ -895,9 +901,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingAppointmentStatus(booking) === 'completed';
-              });
+              }); // const unpaidBookingList = matchedBookingList.filter(
+              //   (booking) => this.getBookingOrderPaymentStatus(booking) === 'unpaid' || this.getBookingOrderPaymentStatus(booking) === 'payment_processing',
+              // );
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
+                return _this7.isUnpaidBooking(booking);
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
               completedBookings = completedBookingList.map(function (booking) {

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.d.ts

@@ -48,7 +48,7 @@ export interface BookingResourceInput {
     capacity?: number;
     like_status?: string;
     metadata?: Record<string, any>;
-    children?: any[];
+    children?: BookingResourceInput[];
 }
 /** custom / package 人数维度快照，与 info2 `_extend.capacity` / `metadata.capacity` 对齐。 */
 export interface BookingCapacityMetadataItem {

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.js

@@ -88,6 +88,24 @@ function resolveDurationMinutes(value) {
   const n = Number(value);
   return Number.isNaN(n) ? void 0 : n;
 }
+function normalizeChildResource(child, parentFormId) {
+  const item = {
+    form_id: (child == null ? void 0 : child.form_id) ?? parentFormId,
+    relation_type: (child == null ? void 0 : child.relation_type) || "form",
+    relation_id: (child == null ? void 0 : child.relation_id) ?? (child == null ? void 0 : child.id),
+    capacity: child == null ? void 0 : child.capacity,
+    like_status: (child == null ? void 0 : child.like_status) || "common"
+  };
+  if ((child == null ? void 0 : child.metadata) !== void 0) {
+    item.metadata = { ...child.metadata };
+  }
+  if (Array.isArray(child == null ? void 0 : child.children)) {
+    item.children = child.children.map(
+      (nestedChild) => normalizeChildResource(nestedChild, item.form_id)
+    );
+  }
+  return item;
+}
 function flattenResources(cacheItem) {
   var _a;
   const resourceMap = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.resource) || {};
@@ -107,8 +125,11 @@ function flattenResources(cacheItem) {
       if ((r == null ? void 0 : r.metadata) !== void 0) {
         item.metadata = { ...r.metadata };
       }
-      if ((r == null ? void 0 : r.children) !== void 0)
-        item.children = r.children;
+      if (Array.isArray(r == null ? void 0 : r.children)) {
+        item.children = r.children.map(
+          (child) => normalizeChildResource(child, item.form_id)
+        );
+      }
       result.push(item);
     });
   });