@pisell/pisellos 2.3.28 → 2.3.30

package/lib/solution/BaseSales/index.js

@@ -40,6 +40,9 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var import_types2 = require("../BookingByStep/types");
 var import_utils = require("../../modules/Order/utils");
+var import_payment_utils = require("../../modules/Order/payment-utils");
+var import_payment_number = require("../../utils/payment-number");
+var import_orderCollectionIdentity = require("../../modules/Order/utils/orderCollectionIdentity");
 var import_dayjs = __toESM(require("dayjs"));
 __reExport(BaseSales_exports, require("./types"), module.exports);
 var import_Quotation = require("../../modules/Quotation");
@@ -79,8 +82,20 @@ function isBaseSalesHistoricalDiscountEntry(discount) {
 function getBaseSalesUniqueArrayMetadataKey(key) {
   if (key === "products" || key === "bookings")
     return "unique_identification_number";
+  return null;
+}
+var BASE_SALES_PERSISTENT_ID_FIELD_BY_KIND = {
+  product: "order_detail_id",
+  booking: "schedule_event_id",
+  payment: "order_payment_id"
+};
+function getBaseSalesOrderCollectionKind(key) {
+  if (key === "products")
+    return "product";
+  if (key === "bookings")
+    return "booking";
   if (key === "payments" || key === "payment")
-    return "unique_payment_number";
+    return "payment";
   return null;
 }
 function isSameBaseSalesOrderRecord(left, right) {
@@ -95,13 +110,6 @@ function isSameBaseSalesOrderRecord(left, right) {
     (value) => value !== void 0 && value !== null && value !== "" && leftIdentities.has(String(value))
   );
 }
-function getBaseSalesMetadataUid(item, metadataKey) {
-  var _a;
-  const uid = ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a[metadataKey]) ?? (item == null ? void 0 : item[metadataKey]);
-  if (uid === void 0 || uid === null || uid === "")
-    return null;
-  return String(uid);
-}
 function isBaseSalesBlankValue(value) {
   return value === void 0 || value === null || value === "";
 }
@@ -120,7 +128,102 @@ function mergeBaseSalesProductSnapshotFields(currentItem, loadedItem) {
   }
   return mergedItem;
 }
-function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, arrayKey) {
+function mergeBaseSalesCollectionItem(kind, currentItem, incomingItem, uidRemaps) {
+  const currentReferenceUid = (0, import_orderCollectionIdentity.getOrderCollectionReferenceUid)(kind, currentItem);
+  const incomingReferenceUid = (0, import_orderCollectionIdentity.getOrderCollectionReferenceUid)(kind, incomingItem);
+  const identityMergedItem = (0, import_orderCollectionIdentity.mergeOrderCollectionItems)(
+    kind,
+    currentItem,
+    incomingItem
+  );
+  const mergedUid = (0, import_orderCollectionIdentity.getOrderCollectionUid)(kind, identityMergedItem);
+  if (mergedUid) {
+    for (const from of /* @__PURE__ */ new Set([currentReferenceUid, incomingReferenceUid])) {
+      if (!from || from === mergedUid)
+        continue;
+      uidRemaps.push({
+        kind,
+        from,
+        to: mergedUid,
+        persistentId: (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)(kind, incomingItem) || (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)(kind, currentItem)
+      });
+    }
+  }
+  const mergedItem = mergedUid ? (0, import_orderCollectionIdentity.setOrderCollectionUid)(kind, incomingItem, mergedUid) : (0, import_lodash_es.cloneDeep)(incomingItem);
+  const persistentIdField = BASE_SALES_PERSISTENT_ID_FIELD_BY_KIND[kind];
+  if (isBaseSalesBlankValue(mergedItem[persistentIdField]) && !isBaseSalesBlankValue(identityMergedItem[persistentIdField])) {
+    mergedItem[persistentIdField] = identityMergedItem[persistentIdField];
+  }
+  return kind === "product" ? mergeBaseSalesProductSnapshotFields(currentItem, mergedItem) : mergedItem;
+}
+function mergeBaseSalesOrderCollection(kind, currentValue, incomingValue, strategy, uidRemaps) {
+  const currentItems = (0, import_orderCollectionIdentity.normalizeOrderCollection)(kind, currentValue, {
+    ensureUid: false
+  }).items;
+  const incomingItems = (0, import_orderCollectionIdentity.normalizeOrderCollection)(kind, incomingValue, {
+    ensureUid: false
+  }).items;
+  if (strategy === "authoritative-incoming") {
+    const result2 = (0, import_lodash_es.cloneDeep)(incomingItems);
+    currentItems.forEach((currentItem) => {
+      const incomingIndex = result2.findIndex(
+        (incomingItem) => (0, import_orderCollectionIdentity.isSameOrderCollectionItem)(kind, currentItem, incomingItem)
+      );
+      if (incomingIndex !== -1) {
+        result2[incomingIndex] = mergeBaseSalesCollectionItem(
+          kind,
+          currentItem,
+          result2[incomingIndex],
+          uidRemaps
+        );
+        return;
+      }
+      if (!(0, import_orderCollectionIdentity.getOrderCollectionPersistentId)(kind, currentItem)) {
+        result2.push((0, import_lodash_es.cloneDeep)(currentItem));
+      }
+    });
+    return result2;
+  }
+  const result = (0, import_lodash_es.cloneDeep)(currentItems);
+  incomingItems.forEach((incomingItem) => {
+    const currentIndex = result.findIndex(
+      (currentItem) => (0, import_orderCollectionIdentity.isSameOrderCollectionItem)(kind, currentItem, incomingItem)
+    );
+    if (currentIndex !== -1) {
+      result[currentIndex] = mergeBaseSalesCollectionItem(
+        kind,
+        result[currentIndex],
+        incomingItem,
+        uidRemaps
+      );
+      return;
+    }
+    result.push((0, import_lodash_es.cloneDeep)(incomingItem));
+  });
+  return result;
+}
+function normalizeBaseSalesRecordCollections(sourceRecord, options) {
+  const normalizedRecord = (0, import_orderCollectionIdentity.normalizeOrderCollections)(
+    (0, import_lodash_es.cloneDeep)(sourceRecord || {}),
+    options
+  ).order;
+  if (Array.isArray(normalizedRecord.payment)) {
+    normalizedRecord.payment = (0, import_orderCollectionIdentity.normalizeOrderCollection)(
+      "payment",
+      normalizedRecord.payment,
+      options
+    ).items;
+  }
+  return normalizedRecord;
+}
+function getBaseSalesMetadataUid(item, metadataKey) {
+  var _a;
+  const uid = ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a[metadataKey]) ?? (item == null ? void 0 : item[metadataKey]);
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
+}
+function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
   const result = [];
   const indexByUid = /* @__PURE__ */ new Map();
   const appendOrReplaceByUid = (item) => {
@@ -132,7 +235,7 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, array
     }
     const existingIndex = indexByUid.get(uid);
     if (existingIndex !== void 0) {
-      result[existingIndex] = arrayKey === "products" ? mergeBaseSalesProductSnapshotFields(result[existingIndex], clonedItem) : clonedItem;
+      result[existingIndex] = clonedItem;
       return;
     }
     indexByUid.set(uid, result.length);
@@ -142,17 +245,42 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, array
   loadedValue.forEach(appendOrReplaceByUid);
   return result;
 }
-function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
-  if (!currentTempOrder)
-    return loadedRecord;
+function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
+  const normalizedLoadedRecord = normalizeBaseSalesRecordCollections(
+    loadedRecord || {},
+    { ensureUid: false }
+  );
+  if (!currentTempOrder) {
+    return normalizeBaseSalesRecordCollections(normalizedLoadedRecord);
+  }
+  const normalizedCurrentTempOrder = normalizeBaseSalesRecordCollections(
+    currentTempOrder,
+    { ensureUid: false }
+  );
+  const uidRemaps = [];
   const mergedRecord = (0, import_lodash_es.mergeWith)(
-    (0, import_lodash_es.cloneDeep)(currentTempOrder),
-    (0, import_lodash_es.cloneDeep)(loadedRecord || {}),
+    normalizedCurrentTempOrder,
+    normalizedLoadedRecord,
     (currentValue, loadedValue, key) => {
+      const collectionKind = getBaseSalesOrderCollectionKind(key);
+      if (collectionKind && Array.isArray(loadedValue)) {
+        return mergeBaseSalesOrderCollection(
+          collectionKind,
+          Array.isArray(currentValue) ? currentValue : [],
+          loadedValue,
+          strategy,
+          uidRemaps
+        );
+      }
       if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
+        if (key === "payments" || key === "payment") {
+          return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(currentValue, loadedValue, {
+            preserveUnmatchedExisting: true
+          });
+        }
         const metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
         if (metadataKey) {
-          return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, key);
+          return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey);
         }
         return [
           ...(0, import_lodash_es.cloneDeep)(currentValue),
@@ -168,7 +296,9 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
     }
   );
   delete mergedRecord.request_unique_idempotency_token;
-  return mergedRecord;
+  return normalizeBaseSalesRecordCollections(
+    (0, import_orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps)
+  );
 }
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -190,9 +320,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.queuedAutoPaymentSync = false;
     this.autoPaymentSyncFlushing = false;
     this.autoPaymentSyncTimer = null;
-    this.salesDetailLoadInFlight = false;
+    this.salesDetailLoadInFlightCount = 0;
+    this.salesDetailLoadSequence = 0;
+    this.salesDetailHydrateQueue = Promise.resolve();
     this.serverOrderChangeUnsubscribe = null;
     this.serverOrderChangeHydrateInFlight = null;
+    this.queuedServerOrderChanges = [];
     this.serverOrderChangeSyncEnabled = false;
   }
   /**
@@ -269,22 +402,56 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   setServerOrderChangeSyncEnabled(enabled) {
     this.serverOrderChangeSyncEnabled = enabled;
+    if (!enabled)
+      this.queuedServerOrderChanges = [];
+  }
+  queueLatestServerOrderChange(order) {
+    const snapshot = (0, import_lodash_es.cloneDeep)(order);
+    const existingIndex = this.queuedServerOrderChanges.findIndex(
+      (queued) => isSameBaseSalesOrderRecord(queued, snapshot)
+    );
+    if (existingIndex >= 0) {
+      this.queuedServerOrderChanges[existingIndex] = snapshot;
+      return;
+    }
+    this.queuedServerOrderChanges.push(snapshot);
+  }
+  async drainQueuedServerOrderChanges() {
+    if (!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlightCount > 0 || this.serverOrderChangeHydrateInFlight || this.queuedServerOrderChanges.length === 0)
+      return;
+    const changedOrders = this.queuedServerOrderChanges;
+    this.queuedServerOrderChanges = [];
+    await this.syncCurrentSalesDetailFromServerOrderChange({ changedOrders });
   }
   async syncCurrentSalesDetailFromServerOrderChange(payload) {
     const changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload == null ? void 0 : payload.changedOrders) ? payload.changedOrders : (payload == null ? void 0 : payload.data) && typeof payload.data === "object" ? [payload.data] : [];
-    if (!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
+    if (!this.serverOrderChangeSyncEnabled)
+      return;
+    if (this.salesDetailLoadInFlightCount > 0) {
+      changedOrders.forEach(
+        (order) => this.queueLatestServerOrderChange(order)
+      );
       return;
+    }
     const changedOrder = changedOrders.find(
       (order) => this.isCurrentSalesOrderRecord(order)
     );
     if (!changedOrder)
       return;
+    if (this.serverOrderChangeHydrateInFlight) {
+      this.queueLatestServerOrderChange(changedOrder);
+      return;
+    }
     if (!this.store.order)
       return;
     this.serverOrderChangeHydrateInFlight = (async () => {
       var _a, _b;
       const currentTempOrder = (_b = (_a = this.store.order).getTempOrder) == null ? void 0 : _b.call(_a);
-      const record = mergeSalesDetailRecordWithTempOrder(currentTempOrder, changedOrder);
+      const record = mergeSalesDetailRecordWithTempOrder(
+        currentTempOrder,
+        changedOrder,
+        "authoritative-incoming"
+      );
       const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
         recalcOnHydrate: false
       });
@@ -295,6 +462,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       await this.serverOrderChangeHydrateInFlight;
     } finally {
       this.serverOrderChangeHydrateInFlight = null;
+      await this.drainQueuedServerOrderChanges();
     }
   }
   registerServerOrderChangeSync() {
@@ -304,13 +472,42 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!effects || typeof effects.on !== "function")
       return;
     this.serverOrderChangeUnsubscribe = effects.on(SERVER_ORDER_CHANGED_EVENT, (payload) => {
-      void this.syncCurrentSalesDetailFromServerOrderChange(payload).catch((error) => {
+      return this.syncCurrentSalesDetailFromServerOrderChange(payload).catch((error) => {
         this.logError("sync sales detail from server order change failed", {
           error: error instanceof Error ? error.message : String(error)
         });
       });
     });
   }
+  async hydrateLatestLoadedSalesDetail(record, loadSequence) {
+    let hydratedSales = null;
+    let skippedBeforeHydrate = false;
+    const hydrateTask = async () => {
+      if (loadSequence !== this.salesDetailLoadSequence) {
+        skippedBeforeHydrate = true;
+        return;
+      }
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
+        recalcOnHydrate: false
+      });
+      hydratedSales = sales;
+      if (loadSequence !== this.salesDetailLoadSequence)
+        return;
+      this.currentSalesDetail = sales;
+      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
+    };
+    const queuedTask = this.salesDetailHydrateQueue.then(hydrateTask, hydrateTask);
+    this.salesDetailHydrateQueue = queuedTask.then(
+      () => void 0,
+      () => void 0
+    );
+    await queuedTask;
+    if (skippedBeforeHydrate)
+      return record;
+    return hydratedSales || this.currentSalesDetail || record;
+  }
   hydrateOrderPaymentNames(payments) {
     if (!payments.length)
       return [];
@@ -644,6 +841,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const coreData = (_f = (_d = (_c = app == null ? void 0 : app.models) == null ? void 0 : _c.getStore) == null ? void 0 : (_e = _d.call(_c)).getDataByModel) == null ? void 0 : _f.call(_e, "core", "core");
     return coreData == null ? void 0 : coreData[key];
   }
+  getPaymentNumberDevicePrefixSync() {
+    if (!this.appPlugin)
+      return "LOCAL";
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefixFromDeviceId)((key) => this.getAppData(key));
+  }
+  getPaymentNumberDevicePrefixAsync() {
+    if (!this.appPlugin)
+      return Promise.resolve("LOCAL");
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefix)((key) => this.getAppData(key));
+  }
   syncAppDataToTempOrder(tempOrder) {
     const isPriceIncludeTax = this.getAppData("is_price_include_tax");
     const taxCountryCode = this.getAppData("tax_country_code");
@@ -745,6 +952,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.currentSalesDetail = null;
+    this.queuedServerOrderChanges = [];
+    this.salesDetailLoadSequence += 1;
     await this.core.effects.emit(`${this.name}:onDestroy`, {});
     super.destroy();
   }
@@ -758,7 +967,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async loadSalesDetail(orderIdOrParams) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    this.salesDetailLoadInFlight = true;
+    const loadSequence = ++this.salesDetailLoadSequence;
+    this.salesDetailLoadInFlightCount += 1;
     try {
       const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
       const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
@@ -777,15 +987,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-        recalcOnHydrate: false
-      });
-      this.currentSalesDetail = sales;
-      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
-      return sales;
+      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(
+        currentTempOrder,
+        remoteRecord,
+        "preserve-local"
+      ) : remoteRecord;
+      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
     } finally {
-      this.salesDetailLoadInFlight = false;
+      this.salesDetailLoadInFlightCount = Math.max(
+        0,
+        this.salesDetailLoadInFlightCount - 1
+      );
+      if (this.salesDetailLoadInFlightCount === 0) {
+        try {
+          await this.drainQueuedServerOrderChanges();
+        } catch (error) {
+          this.logError("drain queued server order changes failed", {
+            error: error instanceof Error ? error.message : String(error)
+          });
+        }
+      }
     }
   }
   /** 获取当前已加载的销售详情（只读快照）。未加载过则返回 null。 */
@@ -1552,6 +1773,20 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     return this.store.order.submitTempOrder(submitParams);
   }
+  async saveSalesOrderDraft(params) {
+    var _a, _b, _c, _d;
+    if (!this.store.order) {
+      throw new Error("BaseSales 解决方案需要 order 模块支持");
+    }
+    return this.store.order.saveTempOrderAsDraft({
+      cacheId: this.cacheId,
+      platform: (params == null ? void 0 : params.platform) ?? ((_a = this.otherParams) == null ? void 0 : _a.platform),
+      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      channel: (params == null ? void 0 : params.channel) ?? this.getSubmitOrderSalesChannel(),
+      type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
+      ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
+    });
+  }
   async submitTempOrderAsync(params) {
     var _a, _b, _c, _d;
     if (!this.store.order) {
@@ -1752,8 +1987,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
     }
   }
-  /** 追加单个支付项到当前订单。 */
+  /**
+   * 同步兼容入口。无法等待 IoT 短号时，按调用当下的 device_id 或 LOCAL 生成。
+   */
   addOrderPayment(payment) {
+    const hasPaymentNumber = String(
+      payment.payment_number || ""
+    ).trim() !== "";
+    return this.addOrderPaymentWithDevicePrefix(
+      payment,
+      hasPaymentNumber ? "LOCAL" : this.getPaymentNumberDevicePrefixSync()
+    );
+  }
+  /** 创建新支付项时读取最新设备短号，不缓存运行时设备信息。 */
+  async addOrderPaymentAsync(payment) {
+    const paymentRecord = payment;
+    const hasPaymentNumber = String(paymentRecord.payment_number || "").trim() !== "";
+    const devicePrefix = hasPaymentNumber ? "LOCAL" : await this.getPaymentNumberDevicePrefixAsync();
+    return this.addOrderPaymentWithDevicePrefix(payment, devicePrefix);
+  }
+  addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
     var _a;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
@@ -1770,21 +2023,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (shopWalletPassId !== void 0 && shopWalletPassId !== null) {
       metadata.shop_wallet_pass_id = shopWalletPassId;
     }
-    if (!metadata.unique_payment_number) {
-      metadata.unique_payment_number = (0, import_utils.createUuidV4)();
-    }
+    const normalizedPaymentRecord = (0, import_payment_utils.ensureOrderPaymentNumber)(
+      paymentRecord,
+      devicePrefix,
+      import_utils.createUuidV4
+    );
     const paymentTimestamp = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
     const paymentTime = paymentRecord.payment_time ?? paymentTimestamp;
     const createdAt = paymentRecord.created_at ?? paymentTimestamp;
     const serviceCharge = paymentRecord.service_charge && typeof paymentRecord.service_charge === "object" ? paymentRecord.service_charge : null;
     const calculatedServiceFee = serviceCharge ? new import_decimal.default(paymentRecord.origin_amount ?? paymentRecord.amount ?? 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : void 0;
     const payments = this.store.order.addOrderPayment({
-      ...paymentRecord,
+      ...normalizedPaymentRecord,
       ...calculatedServiceFee !== void 0 ? { service_fee: calculatedServiceFee } : {},
       metadata,
       payment_time: paymentTime,
       created_at: createdAt
     });
+    if (paymentRecord.status === "payment_pending") {
+      return payments;
+    }
     const amountSnapshot = this.store.order.getOrderAmountSnapshot();
     const syncState = this.store.order.getOrderSyncState();
     if (amountSnapshot) {
@@ -1806,10 +2064,73 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return payments;
   }
   /** 更新当前订单中的指定支付项。 */
-  updateOrderPayment(paymentIdentity, updates) {
+  async updateOrderPayment(paymentIdentity, updates, options = {}) {
+    var _a, _b, _c;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.updateOrderPayment(paymentIdentity, updates);
+    const matchMode = options.matchBy === "compat" || options.matchBy === "legacy" ? "compat" : "payment_number";
+    const previousMatch = (0, import_payment_utils.resolveOrderPaymentIdentity)(
+      this.store.order.getOrderPayments(),
+      paymentIdentity,
+      matchMode
+    );
+    const previousPayment = previousMatch == null ? void 0 : previousMatch.payment;
+    if ((previousPayment == null ? void 0 : previousPayment.status) === "paid" && !options.applyUpdatesWhenPaid) {
+      const currentPayments = this.store.order.getOrderPayments();
+      let syncResult2;
+      if (options.submitWhenPaid && options.forceSubmitIfPaid) {
+        syncResult2 = await this.syncPaymentsToOrder({
+          payments: currentPayments,
+          paymentStatus: this.getPaymentStatusForSync(currentPayments),
+          submitWhenPaid: true,
+          smallTicketDataFlag: options.smallTicketDataFlag ?? 1
+        });
+      }
+      return {
+        updated: false,
+        payment: previousPayment,
+        payments: currentPayments,
+        summary: ((_a = this.store.order.getOrderAmountSnapshot()) == null ? void 0 : _a.summary) || null,
+        ...syncResult2 !== void 0 ? { syncResult: syncResult2 } : {}
+      };
+    }
+    const result = await this.store.order.updateOrderPayment(paymentIdentity, updates, {
+      matchBy: matchMode
+    });
+    let draftResult;
+    let draftError;
+    if (options.persistDraft !== false) {
+      try {
+        draftResult = await this.saveSalesOrderDraft();
+      } catch (error) {
+        draftError = error;
+        this.logError("updateOrderPayment: 保存支付草稿失败", {
+          paymentIdentity,
+          error: error instanceof Error ? error.message : String(error)
+        });
+        if (!options.submitWhenPaid)
+          throw error;
+      }
+    }
+    const becamePaid = (previousPayment == null ? void 0 : previousPayment.status) !== "paid" && ((_b = result.payment) == null ? void 0 : _b.status) === "paid";
+    const shouldSubmit = Boolean(
+      options.submitWhenPaid && ((_c = result.payment) == null ? void 0 : _c.status) === "paid" && (becamePaid || options.forceSubmitIfPaid)
+    );
+    let syncResult;
+    if (shouldSubmit) {
+      syncResult = await this.syncPaymentsToOrder({
+        payments: result.payments,
+        paymentStatus: this.getPaymentStatusForSync(result.payments),
+        submitWhenPaid: true,
+        smallTicketDataFlag: options.smallTicketDataFlag ?? 1
+      });
+    }
+    return {
+      ...result,
+      ...draftResult !== void 0 ? { draftResult } : {},
+      ...draftError !== void 0 ? { draftError } : {},
+      ...syncResult !== void 0 ? { syncResult } : {}
+    };
   }
   /** 删除当前订单中的指定支付项。 */
   deleteOrderPayment(paymentIdentity) {
@@ -1823,6 +2144,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.updateVoucherOrderPayments(payments, options);
   }
+  async updateVoucherOrderPaymentsAsync(payments, options) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.updateVoucherOrderPaymentsAsync(payments, options);
+  }
   confirmPendingVoucherPayments() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -2,7 +2,7 @@
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
  * - 纯函数：不依赖任何运行时模块/插件，便于单测与 view-model 适配
- * - products 保留 tempOrder / 后端详情原字段，仅做浅拷贝，避免丢失 product_sku 等协议字段
+ * - products 保留 tempOrder / 后端详情原字段，仅规范化集合身份并浅拷贝，避免丢失 product_sku 等协议字段
  * - bookings 平铺保留服务端原顺序，同时输出 byProductUid 反查表与 rootBooking
  * - header 收敛"非数组顶层字段"，便于 ticketBooking view-model 直接消费
  *
@@ -82,8 +82,13 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
+export interface ISalesPaymentMetadata extends Record<string, any> {
+    /** 刷卡机设备快照；OS 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+}
 export interface ISalesPayment {
     order_payment_id?: number | null;
+    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -95,7 +100,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: Record<string, any> | null;
+    metadata?: ISalesPaymentMetadata | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {
@@ -130,7 +135,7 @@ export interface ISalesDetail {
     customer: ISalesDetailCustomer | null;
     /** 服务端 summary（仅输出） */
     summary: Record<string, any>;
-    /** 原始响应快照，方便 UI 兜底使用 */
+    /** 规范化后的响应快照，方便 UI 兜底使用 */
     raw: Record<string, any>;
 }
 /**
@@ -138,7 +143,7 @@ export interface ISalesDetail {
  *
  * 注意：
  * - 入参允许是 `{ data: OrderData }` 或直接 `OrderData`，自动识别。
- * - products 保留原字段；字段补齐由 OrderModule hydrate 负责。
+ * - products/bookings/payments 在此补齐集合身份；其余 runtime 字段由 OrderModule hydrate 负责。
  * - 不做远程请求；不修改入参；返回新对象。
  */
 export declare function parseSalesResponse(input: Record<string, any> | null | undefined): ISalesDetail;

package/lib/solution/BaseSales/utils/parseSalesResponse.js

@@ -22,6 +22,7 @@ __export(parseSalesResponse_exports, {
   parseSalesResponse: () => parseSalesResponse
 });
 module.exports = __toCommonJS(parseSalesResponse_exports);
+var import_orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
 var HEADER_KEYS = [
   "order_id",
   "order_number",
@@ -121,14 +122,12 @@ function indexBookingsByProductUid(bookings) {
   return result;
 }
 function parseSalesResponse(input) {
-  const raw = input && typeof input === "object" && input.data && input.order_id == null ? input.data : input || {};
+  const sourceRaw = input && typeof input === "object" && input.data && input.order_id == null ? input.data : input || {};
+  const raw = (0, import_orderCollectionIdentity.normalizeOrderCollections)(sourceRaw).order;
   const productsRaw = Array.isArray(raw == null ? void 0 : raw.products) ? raw.products : [];
-  const products = productsRaw.map((p, index) => {
+  const products = productsRaw.map((p) => {
     const row = { ...p || {} };
     const metadata = row.metadata && typeof row.metadata === "object" ? { ...row.metadata } : {};
-    if (!metadata.unique_identification_number) {
-      metadata.unique_identification_number = `sales-product-${row.product_id ?? "unknown"}-${row.product_variant_id ?? 0}-${index}`;
-    }
     delete metadata.price_schema_version;
     delete row.identity_key;
     return { ...row, metadata };

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