@pisell/pisellos 2.3.33 → 2.3.35

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

@@ -485,7 +485,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -2872,12 +2872,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
     const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
+      var _a2;
       if (this.hasGoodPassDiscount(item))
         return false;
       if (this.hasOrderProductLineNote(item))
         return false;
       if (item.order_detail_id !== void 0 && item.order_detail_id !== null)
         return false;
+      if ((_a2 = item.metadata) == null ? void 0 : _a2.is_edit_for_runtime)
+        return false;
       if (item.product_id !== productToAdd.product_id)
         return false;
       if (item.product_variant_id !== productToAdd.product_variant_id)
@@ -3119,7 +3122,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   applyOrderProductUpdateToTempOrder(tempOrder, params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     const {
       product_id,
       product_variant_id,
@@ -3183,9 +3186,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextProduct.num = (0, import_utils3.getSafeProductNum)(nextProduct.num);
     const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
     const callerUpdatesMainMeta = ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.main_product_selling_price) !== void 0 || ((_d = updates == null ? void 0 : updates.metadata) == null ? void 0 : _d.main_product_original_price) !== void 0 || ((_e = updates == null ? void 0 : updates.metadata) == null ? void 0 : _e.source_product_price) !== void 0;
+    const callerUpdatesSourcePrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.source_product_price) !== void 0;
+    const callerUpdatesMainSellingPrice = ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.main_product_selling_price) !== void 0;
+    const callerUpdatesMainOriginalPrice = ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.main_product_original_price) !== void 0;
+    const previousLineFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+      (0, import_utils.getProductSkuOptions)(targetProduct),
+      targetProduct.product_bundle
+    );
+    const nextLineFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+      (0, import_utils.getProductSkuOptions)(nextProduct),
+      nextProduct.product_bundle
+    );
+    const callerChangesVariant = Number(product_variant_id || 0) !== Number(targetProduct.product_variant_id || 0);
+    const callerChangesLineConfiguration = callerChangesVariant || previousLineFingerprint !== nextLineFingerprint;
     const isPersistedOrderLine = targetProduct.order_detail_id !== void 0 && targetProduct.order_detail_id !== null;
     const callerChangesDiscountList = Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
-    const callerUpdatesManualPrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.price_override) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.is_manual_discount) !== void 0 || ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.product_discount_reason) !== void 0 || callerChangesDiscountList;
+    const callerUpdatesManualPrice = ((_i = updates == null ? void 0 : updates.metadata) == null ? void 0 : _i.price_override) !== void 0 || ((_j = updates == null ? void 0 : updates.metadata) == null ? void 0 : _j.is_manual_discount) !== void 0 || ((_k = updates == null ? void 0 : updates.metadata) == null ? void 0 : _k.product_discount_reason) !== void 0 || callerChangesDiscountList;
     const callerAllowsBookingReprice = (() => {
       if (params.allow_booking_reprice !== true || !booking || !callerUpdatesTopPrice || !callerUpdatesMainMeta) {
         return false;
@@ -3200,21 +3216,69 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       };
       return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
     })();
-    if (isPersistedOrderLine && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
+    if (isPersistedOrderLine && !callerChangesLineConfiguration && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
       nextProduct.selling_price = targetProduct.selling_price;
       nextProduct.original_price = targetProduct.original_price;
       nextProduct.payment_price = targetProduct.payment_price;
       nextProduct.metadata = {
         ...nextProduct.metadata || {},
-        source_product_price: (_i = targetProduct.metadata) == null ? void 0 : _i.source_product_price,
-        main_product_selling_price: (_j = targetProduct.metadata) == null ? void 0 : _j.main_product_selling_price,
-        main_product_original_price: (_k = targetProduct.metadata) == null ? void 0 : _k.main_product_original_price,
-        price_schema_version: ((_l = targetProduct.metadata) == null ? void 0 : _l.price_schema_version) ?? 2
+        source_product_price: (_l = targetProduct.metadata) == null ? void 0 : _l.source_product_price,
+        main_product_selling_price: (_m = targetProduct.metadata) == null ? void 0 : _m.main_product_selling_price,
+        main_product_original_price: (_n = targetProduct.metadata) == null ? void 0 : _n.main_product_original_price,
+        price_schema_version: ((_o = targetProduct.metadata) == null ? void 0 : _o.price_schema_version) ?? 2
       };
       nextProduct.product_bundle = this.preservePersistedBundlePriceFields(
         targetProduct.product_bundle,
         nextProduct.product_bundle
       );
+    } else if (callerChangesLineConfiguration && callerUpdatesSourcePrice && (!callerUpdatesMainSellingPrice || !callerUpdatesMainOriginalPrice)) {
+      const previousMainOriginal = new import_decimal.default(
+        Number((_p = targetProduct.metadata) == null ? void 0 : _p.main_product_original_price) || 0
+      );
+      const previousMainSelling = new import_decimal.default(
+        Number((_q = targetProduct.metadata) == null ? void 0 : _q.main_product_selling_price) || previousMainOriginal.toNumber()
+      );
+      const preservedDiscount = previousMainOriginal.minus(previousMainSelling);
+      const nextMainOriginal = new import_decimal.default(
+        Number(updates.metadata.source_product_price) || 0
+      ).plus((0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(nextProduct)));
+      nextProduct.metadata = {
+        ...nextProduct.metadata || {},
+        source_product_price: String(updates.metadata.source_product_price),
+        main_product_original_price: callerUpdatesMainOriginalPrice ? String(updates.metadata.main_product_original_price) : nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+        main_product_selling_price: callerUpdatesMainSellingPrice ? String(updates.metadata.main_product_selling_price) : nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
+        price_schema_version: 2
+      };
+    } else if (callerChangesVariant && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      const existedMeta = nextProduct.metadata || {};
+      nextProduct.metadata = { ...existedMeta };
+      delete nextProduct.metadata.source_product_price;
+      delete nextProduct.metadata.main_product_selling_price;
+      delete nextProduct.metadata.main_product_original_price;
+      delete nextProduct.metadata.price_schema_version;
+    } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+      const previousOptionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(targetProduct));
+      const nextOptionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(nextProduct));
+      const previousMainOriginal = new import_decimal.default(
+        Number(
+          ((_r = targetProduct.metadata) == null ? void 0 : _r.main_product_original_price) ?? targetProduct.original_price ?? 0
+        ) || 0
+      );
+      const previousMainSelling = new import_decimal.default(
+        Number(
+          ((_s = targetProduct.metadata) == null ? void 0 : _s.main_product_selling_price) ?? targetProduct.selling_price ?? previousMainOriginal.toNumber()
+        ) || 0
+      );
+      const preservedDiscount = previousMainOriginal.minus(previousMainSelling);
+      const previousSource = ((_t = targetProduct.metadata) == null ? void 0 : _t.source_product_price) != null ? new import_decimal.default(Number(targetProduct.metadata.source_product_price) || 0) : previousMainOriginal.minus(previousOptionSum);
+      const nextMainOriginal = previousSource.plus(nextOptionSum);
+      nextProduct.metadata = {
+        ...nextProduct.metadata || {},
+        source_product_price: previousSource.toDecimalPlaces(2).toFixed(2),
+        main_product_original_price: nextMainOriginal.toDecimalPlaces(2).toFixed(2),
+        main_product_selling_price: nextMainOriginal.minus(preservedDiscount).toDecimalPlaces(2).toFixed(2),
+        price_schema_version: 2
+      };
     } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       const existedMeta = nextProduct.metadata || {};
       nextProduct.metadata = { ...existedMeta };
@@ -3230,7 +3294,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedProduct.discount_list
     );
-    const preservedBookingUid = nextProduct.booking_uid || ((_m = nextProduct.metadata) == null ? void 0 : _m.booking_uid) || targetProduct.booking_uid || ((_n = targetProduct.metadata) == null ? void 0 : _n.booking_uid);
+    const preservedBookingUid = nextProduct.booking_uid || ((_u = nextProduct.metadata) == null ? void 0 : _u.booking_uid) || targetProduct.booking_uid || ((_v = targetProduct.metadata) == null ? void 0 : _v.booking_uid);
     if (!booking && preservedBookingUid) {
       normalizedProduct.booking_uid = preservedBookingUid;
       normalizedProduct.metadata = {
@@ -3240,7 +3304,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     if (booking) {
       const productUid = String(
-        ((_o = normalizedProduct.metadata) == null ? void 0 : _o.unique_identification_number) || ((_p = targetProduct.metadata) == null ? void 0 : _p.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
+        ((_w = normalizedProduct.metadata) == null ? void 0 : _w.unique_identification_number) || ((_x = targetProduct.metadata) == null ? void 0 : _x.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
       );
       normalizedProduct.metadata = {
         ...normalizedProduct.metadata || {},
@@ -3271,9 +3335,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       updates,
       tempOrder.products[productIndex],
-      (_q = tempOrder.products[productIndex].metadata) == null ? void 0 : _q.unique_identification_number
+      (_y = tempOrder.products[productIndex].metadata) == null ? void 0 : _y.unique_identification_number
     );
-    return (_r = tempOrder.products[productIndex].metadata) == null ? void 0 : _r.unique_identification_number;
+    return (_z = tempOrder.products[productIndex].metadata) == null ? void 0 : _z.unique_identification_number;
   }
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();

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;