@pisell/pisellos 2.3.37 → 2.3.39

package/lib/modules/Order/index.js

@@ -37,8 +37,6 @@ var import_types = require("./types");
 var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
-var import_payment_utils = require("./payment-utils");
-var import_payment_number = require("../../utils/payment-number");
 var import_cartPromotion = require("../../solution/BaseSales/utils/cartPromotion");
 var import_utils3 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
@@ -302,7 +300,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async initialize(core, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.core = core;
     this.store = options.store;
     if (!this.store.tempOrder) {
@@ -315,19 +313,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.availableWalletIds = [];
     }
     this.request = this.core.getPlugin("request");
-    this.appPlugin = this.core.getPlugin("app");
-    if (!this.appPlugin) {
-      throw new Error("Order 模块需要 app 插件支持");
+    const appPlugin = this.core.getPlugin("app");
+    if (!appPlugin) {
+      console.error("Order 模块需要 app 插件支持");
     }
-    const app = this.appPlugin.getApp();
-    this.logger = app.logger;
+    const app = (_a = appPlugin == null ? void 0 : appPlugin.getApp) == null ? void 0 : _a.call(appPlugin);
+    this.logger = app == null ? void 0 : app.logger;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
     this.cacheId = otherParams.cacheId;
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
-    this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
+    this.rulesHooksOverride = (_b = otherParams.rules) == null ? void 0 : _b.hooks;
     this.moduleHooksOverride = options.hooks;
-    this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
+    this.orderHooks = this.moduleHooksOverride || ((_c = otherParams.order) == null ? void 0 : _c.hooks) || ((_d = otherParams.hooks) == null ? void 0 : _d.order);
     this.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.logInfo("OrderModule initialized successfully");
@@ -836,6 +834,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
   persistTempOrder() {
   }
+  notifyTempOrderChanged() {
+    if (!this.store.tempOrder)
+      return;
+    this.store.tempOrder = {
+      ...this.store.tempOrder,
+      products: [...this.store.tempOrder.products],
+      bookings: this.store.tempOrder.bookings ? [...this.store.tempOrder.bookings] : []
+    };
+    this.persistTempOrder();
+  }
   // ─── TempOrder: 创建 & 获取 ───
   createDefaultTempOrderInstance() {
     return (0, import_utils.createDefaultTempOrder)({
@@ -1055,40 +1063,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const depositPaidAmount = this.calculateDepositPaidAmount(tempOrder.payments || []);
     return depositPaidAmount.lt(depositAmount) ? "deposit" : "normal";
   }
-  getPaymentNumberAppData(key) {
-    var _a, _b, _c, _d, _e;
-    const appPlugin = this.appPlugin;
-    if (!appPlugin)
-      return void 0;
-    const getData = (_a = appPlugin.getData) == null ? void 0 : _a.call(appPlugin);
-    if (typeof getData === "function")
-      return getData(key);
-    const app = appPlugin.getApp();
-    const coreData = (_e = (_c = (_b = app == null ? void 0 : app.models) == null ? void 0 : _b.getStore) == null ? void 0 : (_d = _c.call(_b)).getDataByModel) == null ? void 0 : _e.call(_d, "core", "core");
-    return coreData == null ? void 0 : coreData[key];
-  }
-  getPaymentNumberDevicePrefixSync() {
-    return (0, import_payment_number.resolvePaymentNumberDevicePrefixFromDeviceId)(
-      (key) => this.getPaymentNumberAppData(key)
-    );
-  }
-  getPaymentNumberDevicePrefixAsync() {
-    return (0, import_payment_number.resolvePaymentNumberDevicePrefix)(
-      (key) => this.getPaymentNumberAppData(key)
-    );
-  }
   normalizePaymentSource(payment, options) {
     const paymentRecord = payment;
     const metadata = paymentRecord.metadata && typeof paymentRecord.metadata === "object" ? { ...paymentRecord.metadata } : {};
-    const normalized = (0, import_payment_utils.ensureOrderPaymentNumber)(
-      {
-        ...paymentRecord,
-        metadata,
-        origin_amount: paymentRecord.origin_amount ?? paymentRecord.amount ?? "0.00"
-      },
-      (options == null ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(),
-      import_utils.createUuidV4
-    );
+    if (!metadata.unique_payment_number) {
+      metadata.unique_payment_number = (0, import_utils.createUuidV4)();
+    }
+    const normalized = {
+      ...paymentRecord,
+      metadata,
+      origin_amount: paymentRecord.origin_amount ?? paymentRecord.amount ?? "0.00"
+    };
     if (paymentRecord.status !== void 0) {
       normalized.status = paymentRecord.status;
     } else if ((options == null ? void 0 : options.defaultPaid) !== false) {
@@ -2509,36 +2494,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 用一组支付来源覆盖当前订单支付项。
    *
    * 入参允许来自 PaymentModule 的 PaymentItem，内部统一映射为 Sales 协议：
-   * 新支付来源的 uuid 会作为 payment_number 的唯一号段，id -> custom_payment_id，
+   * uuid -> metadata.unique_payment_number，id -> custom_payment_id，
    * isSynced 等运行态字段不会进入 tempOrder.payments。
    */
   setOrderPayments(payments) {
     const tempOrder = this.ensureTempOrder();
-    tempOrder.payments = (0, import_utils.mapPaymentItemsToOrderPayments)(
-      (payments || []).map((payment) => this.normalizePaymentSource(payment, { defaultPaid: false }))
-    );
+    tempOrder.payments = (0, import_utils.mapPaymentItemsToOrderPayments)(payments);
     this.persistTempOrder();
     return tempOrder.payments;
   }
-  /** 同步兼容入口：按调用当下的 device_id 或 LOCAL 生成支付编号。 */
+  /** 追加单个支付项，并立即持久化当前 tempOrder。 */
   addOrderPayment(payment) {
-    const hasPaymentNumber = String(
-      payment.payment_number || ""
-    ).trim() !== "";
-    return this.addOrderPaymentWithDevicePrefix(
-      payment,
-      hasPaymentNumber ? "LOCAL" : this.getPaymentNumberDevicePrefixSync()
-    );
-  }
-  /** 异步入口：创建支付项时读取最新 IoT 设备短号。 */
-  async addOrderPaymentAsync(payment) {
-    const hasPaymentNumber = String(
-      payment.payment_number || ""
-    ).trim() !== "";
-    const devicePrefix = hasPaymentNumber ? "LOCAL" : await this.getPaymentNumberDevicePrefixAsync();
-    return this.addOrderPaymentWithDevicePrefix(payment, devicePrefix);
-  }
-  addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
     this.logInfo("addOrderPayment", {
       payment
     });
@@ -2551,7 +2517,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           type: orderPaymentType,
           order_payment_type: orderPaymentType
         },
-        { defaultPaid: true, devicePrefix }
+        { defaultPaid: true }
       )
     ]);
     tempOrder.payments = [...tempOrder.payments || [], ...mapped];
@@ -2564,55 +2530,57 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return tempOrder.payments;
   }
   /**
-   * 默认按支付唯一号精确更新；仅显式指定 legacy 时兼容历史支付标识。
-   * metadata 与 transactions 会分别合并，避免覆盖支付会话号和已有交易记录。
+   * 按支付唯一号、后端支付 ID、自定义支付方式 ID 或旧 uuid 更新支付项。
+   *
+   * 该方法服务 PaymentModal 的 void / 编辑场景；更新 metadata 时会做浅合并，
+   * 避免覆盖 unique_payment_number、现金实付/找零等已有元数据。
    */
-  async updateOrderPayment(paymentIdentity, updates, options = {}) {
+  updateOrderPayment(paymentIdentity, updates) {
     const tempOrder = this.ensureTempOrder();
     const identity = String(paymentIdentity);
-    const matchMode = options.matchBy === "compat" || options.matchBy === "legacy" ? "compat" : "payment_number";
-    const matchedPayment = (0, import_payment_utils.resolveOrderPaymentIdentity)(
-      tempOrder.payments || [],
-      identity,
-      matchMode
-    );
-    if (!matchedPayment) {
-      throw new Error(`未找到支付项: ${identity}`);
-    }
-    let updatedPayment = null;
-    tempOrder.payments = (tempOrder.payments || []).map((payment, index) => {
-      if (index !== matchedPayment.index)
+    tempOrder.payments = (tempOrder.payments || []).map((payment) => {
+      var _a;
+      const uniquePaymentNumber = (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
+      const orderPaymentId = payment == null ? void 0 : payment.order_payment_id;
+      const customPaymentId = payment == null ? void 0 : payment.custom_payment_id;
+      const uuid = payment == null ? void 0 : payment.uuid;
+      const matched = [
+        uniquePaymentNumber,
+        orderPaymentId,
+        customPaymentId,
+        uuid
+      ].some((value) => value !== void 0 && String(value) === identity);
+      if (!matched)
         return payment;
-      const nextPayment = (0, import_payment_utils.mergeOrderPaymentRecord)(payment, {
+      return {
+        ...payment,
         ...updates,
-        updated_at: updates.updated_at || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-      });
-      updatedPayment = nextPayment;
-      return nextPayment;
+        metadata: {
+          ...payment.metadata || {},
+          ...updates.metadata || {}
+        }
+      };
     });
     this.persistTempOrder();
-    const summary = await this.recalculateSummary({ createIfMissing: true });
-    this.persistTempOrder();
-    const payments = tempOrder.payments;
-    return {
-      updated: true,
-      payment: payments[matchedPayment.index] || updatedPayment,
-      payments,
-      summary
-    };
+    return tempOrder.payments;
   }
   /** 从当前订单支付项中移除指定支付项。 */
   deleteOrderPayment(paymentIdentity) {
     const tempOrder = this.ensureTempOrder();
     const identity = String(paymentIdentity);
-    const matchedPayment = (0, import_payment_utils.resolveOrderPaymentIdentity)(
-      tempOrder.payments || [],
-      identity,
-      "compat"
-    );
-    if (!matchedPayment)
-      return tempOrder.payments;
-    tempOrder.payments = (tempOrder.payments || []).filter((_, index) => index !== matchedPayment.index);
+    tempOrder.payments = (tempOrder.payments || []).filter((payment) => {
+      var _a;
+      const uniquePaymentNumber = (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
+      const orderPaymentId = payment == null ? void 0 : payment.order_payment_id;
+      const customPaymentId = payment == null ? void 0 : payment.custom_payment_id;
+      const uuid = payment == null ? void 0 : payment.uuid;
+      return ![
+        uniquePaymentNumber,
+        orderPaymentId,
+        customPaymentId,
+        uuid
+      ].some((value) => value !== void 0 && String(value) === identity);
+    });
     this.persistTempOrder();
     return tempOrder.payments;
   }
@@ -2721,10 +2689,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       payments.map(
         (payment) => this.normalizePaymentSource(
           normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)),
-          {
-            defaultPaid: false,
-            devicePrefix: options == null ? void 0 : options.devicePrefix
-          }
+          { defaultPaid: false }
         )
       )
     ).filter((payment) => {
@@ -2775,14 +2740,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return tempOrder.payments;
   }
-  async updateVoucherOrderPaymentsAsync(payments, options) {
-    const needsPaymentNumber = (payments || []).some((payment) => String(payment.payment_number || "").trim() === "");
-    const devicePrefix = needsPaymentNumber ? await this.getPaymentNumberDevicePrefixAsync() : "LOCAL";
-    return this.updateVoucherOrderPayments(payments, {
-      ...options,
-      devicePrefix
-    });
-  }
   async shouldMergeProductToOrder(params) {
     var _a;
     const onBeforeMergeProductToOrder = (_a = this.orderHooks) == null ? void 0 : _a.onBeforeMergeProductToOrder;
@@ -3613,38 +3570,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.saveDraft();
     return tempOrder;
   }
-  async saveTempOrderAsDraft(params) {
-    var _a, _b, _c, _d, _e;
-    const tempOrder = this.ensureTempOrder();
-    this.ensureExternalSaleNumber(tempOrder);
-    this.persistTempOrder();
-    const latestSummary = await this.recalculateSummary({ createIfMissing: true }) || this.store.summary || (0, import_utils.createEmptySummary)();
-    const payload = (0, import_utils.buildSubmitPayload)({
-      tempOrder,
-      cacheId: (params == null ? void 0 : params.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,
-      type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
-      summary: latestSummary,
-      enhance: params == null ? void 0 : params.enhancePayload
-    });
-    if (!payload.created_at) {
-      payload.created_at = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
-    }
-    payload.need_sync = 0;
-    payload.is_draft_order = 1;
-    this.logInfo("saveTempOrderAsDraft calling sales draft", {
-      orderId: payload.order_id,
-      externalSaleNumber: payload.external_sale_number,
-      productsCount: ((_e = payload.products) == null ? void 0 : _e.length) || 0
-    });
-    return this.request.post("/order/sales/draft", payload, {
-      osServer: true,
-      customToast: () => {
-      }
-    });
-  }
   /**
    * 提交当前 Sales tempOrder。
    *
@@ -3845,13 +3770,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async syncPaymentsToOrder(params) {
     const tempOrder = this.ensureTempOrder();
-    const needsPaymentNumber = (params.payments || []).some((payment) => String(payment.payment_number || "").trim() === "");
-    const devicePrefix = needsPaymentNumber ? await this.getPaymentNumberDevicePrefixAsync() : "LOCAL";
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
-      (params.payments || []).map((payment) => this.normalizePaymentSource(payment, {
-        defaultPaid: false,
-        devicePrefix
-      }))
+      params.payments || []
     );
     const shouldConfirmPendingVoucherPayments = params.confirmPendingVoucherPayments ?? params.submitWhenPaid === true;
     const effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
@@ -3873,7 +3793,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       effectivePayments
     );
-    const submitResult = await this.submitTempOrder({
+    const submitParams = {
       payments: effectivePayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
@@ -3887,7 +3807,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         };
         return nextPayload;
       }
-    });
+    };
+    const submitResult = params.checkoutSyncTaskEnabled === false ? await this.submitTempOrderAsync(submitParams) : await this.submitTempOrder(submitParams);
     return { ...completion, submitResult };
   }
   createOrder(params) {
@@ -3904,11 +3825,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       is_deposit: 0,
       relation_products: [],
       relation_forms: [],
+      business_code: params == null ? void 0 : params.business_code,
       ...(params == null ? void 0 : params.extraData) || {}
     };
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
+        var _a2;
         if (!item._origin.duration) {
           const { duration, durationType } = (0, import_utils.generateDuration)(item);
           item._origin.duration = duration;
@@ -3917,6 +3840,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         item._origin.sub_type = (0, import_utils.normalizeBookingSubType)(item._origin);
         const discountList = (0, import_utils.getAllDiscountList)(item);
         item._origin.product.discount_list = discountList;
+        if ((_a2 = params == null ? void 0 : params.extraData) == null ? void 0 : _a2.is_add_holder_info) {
+          (0, import_utils.ensureCartItemOriginHolder)(item, this.window);
+        }
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];
@@ -4227,12 +4153,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     }
     const nextTempOrder = this.normalizeTempOrderForRuntime(raw, { makeEditMark: true });
-    const sourceLastOrderInfo = raw.lastOrderInfo || raw;
-    const isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
-    const syntheticIdentityOptions = {
-      isDraftOrder,
-      externalSaleNumber: nextTempOrder.external_sale_number
-    };
     const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map((s) => ({ ...s || {} })) : (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []);
     this.store.tempOrder = nextTempOrder;
@@ -4253,14 +4173,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
       }
     };
-    this.store.lastOrderInfo = this.withoutSyntheticDraftOrderIdForRuntime(
-      sourceLastOrderInfo,
-      syntheticIdentityOptions
-    );
-    const hadSyntheticDraftOrderId = this.isSyntheticDraftOrderIdForRuntime(raw, syntheticIdentityOptions) || this.isSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
-    if (hadSyntheticDraftOrderId && this.store.syncState !== "submitting") {
-      this.store.syncState = "local";
-    }
+    this.store.lastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
     const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
     const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
@@ -4373,13 +4286,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   normalizeTempOrderForRuntime(raw, options) {
     var _a, _b;
-    const runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
     const nextTempOrder = {
       ...this.createDefaultTempOrderInstance(),
-      ...runtimeRaw || {}
+      ...raw || {}
     };
-    if ((nextTempOrder.order_id === void 0 || nextTempOrder.order_id === null) && (runtimeRaw == null ? void 0 : runtimeRaw.id) !== void 0 && (runtimeRaw == null ? void 0 : runtimeRaw.id) !== null) {
-      nextTempOrder.order_id = runtimeRaw.id;
+    if ((nextTempOrder.order_id === void 0 || nextTempOrder.order_id === null) && (raw == null ? void 0 : raw.id) !== void 0 && (raw == null ? void 0 : raw.id) !== null) {
+      nextTempOrder.order_id = raw.id;
     }
     delete nextTempOrder.summary;
     delete nextTempOrder.lastOrderInfo;
@@ -4447,22 +4359,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
-  isSyntheticDraftOrderIdForRuntime(record, options) {
-    const isDraftOrder = (options == null ? void 0 : options.isDraftOrder) ?? Number((record == null ? void 0 : record.is_draft_order) || 0) === 1;
-    const externalSaleNumber = (record == null ? void 0 : record.external_sale_number) ?? (options == null ? void 0 : options.externalSaleNumber);
-    const orderId = record == null ? void 0 : record.order_id;
-    return Boolean(
-      isDraftOrder && orderId !== void 0 && orderId !== null && orderId !== "" && externalSaleNumber !== void 0 && externalSaleNumber !== null && externalSaleNumber !== "" && String(orderId) === String(externalSaleNumber)
-    );
-  }
-  withoutSyntheticDraftOrderIdForRuntime(record, options) {
-    if (!this.isSyntheticDraftOrderIdForRuntime(record, options))
-      return record;
-    return {
-      ...record,
-      order_id: null
-    };
-  }
   hydrateLinkedBookingIdentity(tempOrder) {
     const bookingUidByProductUid = /* @__PURE__ */ new Map();
     const productByUid = /* @__PURE__ */ new Map();

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

@@ -394,6 +394,7 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
+        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -468,8 +469,6 @@ export interface SubmitSalesOrderParams {
 export interface PaymentItemData {
     /** 当前支付项的唯一 ID */
     uuid: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型代码 */
@@ -492,22 +491,13 @@ export interface PaymentItemData {
 export interface OrderPaymentMetadata {
     rounding_rule?: Record<string, any>;
     unique_payment_number?: string;
-    /** 刷卡机设备快照；OS 不解析内部字段，仅透传并持久化 */
-    card_reader_snapshot?: Record<string, unknown>;
     shop_wallet_pass_id?: number | string;
     actual_paid_amount?: number | string;
     change_given_amount?: number | string;
-    transactions?: OrderPaymentTransaction[];
     [key: string]: any;
 }
-export interface OrderPaymentTransaction {
-    number: string;
-    status: 'success' | 'fail';
-}
 export interface OrderPaymentData {
     order_payment_id?: number | string;
-    /** 支付项稳定唯一号；历史支付项允许缺失 */
-    payment_number?: string;
     amount: string;
     code: string;
     custom_payment_id: number;
@@ -534,15 +524,6 @@ export interface OrderPaymentData {
     created_at?: string;
     updated_at?: string;
 }
-export interface OrderPaymentUpdateOptions {
-    matchBy?: 'payment_number' | 'compat' | 'legacy';
-}
-export interface OrderPaymentUpdateResult {
-    updated: boolean;
-    payment: OrderPaymentData | null;
-    payments: OrderPaymentData[];
-    summary: OrderSummary | null;
-}
 export type OrderPaymentSource = PaymentItem | OrderPaymentData | Record<string, any>;
 export interface MapOrderPaymentsOptions {
     includeVoided?: boolean;
@@ -569,6 +550,12 @@ export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
+    /**
+     * Whether the checkout should be queued as the local `sync_sales` task.
+     * Defaults to true to preserve the WebPOS retry path. Set to false when
+     * the caller must wait for the cloud checkout response before proceeding.
+     */
+    checkoutSyncTaskEnabled?: boolean;
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
@@ -693,14 +680,6 @@ export interface OrderModuleAPI {
         channel?: string;
         type?: string;
     }) => OrderSubmitPayload;
-    saveTempOrderAsDraft: <T = any>(params?: {
-        cacheId?: string;
-        platform?: string;
-        businessCode?: string;
-        channel?: string;
-        type?: string;
-        enhancePayload?: SubmitPayloadEnhancer;
-    }) => Promise<T>;
     applyLocalPrintOrderNumbers: (order?: Record<string, any> | null) => Promise<OrderTempOrder>;
     getTempOrderNote: () => string;
     updateTempOrderNote: {
@@ -731,6 +710,8 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
+    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
+    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;
@@ -758,15 +739,11 @@ export interface OrderModuleAPI {
     getOrderPayments: () => OrderPaymentData[];
     setOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
-    addOrderPaymentAsync: (payment: OrderPaymentSource) => Promise<OrderPaymentData[]>;
-    updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: OrderPaymentUpdateOptions) => Promise<OrderPaymentUpdateResult>;
+    updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>) => OrderPaymentData[];
     deleteOrderPayment: (paymentIdentity: string | number) => OrderPaymentData[];
     updateVoucherOrderPayments: (payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
     }) => OrderPaymentData[];
-    updateVoucherOrderPaymentsAsync: (payments: OrderPaymentSource[], options?: {
-        status?: 'paid' | 'payment_pending';
-    }) => Promise<OrderPaymentData[]>;
     confirmPendingVoucherPayments: (options?: {
         persist?: boolean;
         recalculateSummary?: boolean;

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

@@ -220,9 +220,6 @@ 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/modules/Order/utils.d.ts

@@ -15,6 +15,7 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
+import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -177,6 +178,15 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export interface CartOrderHolder {
+    customer_id?: number;
+    form_id: number | string;
+    form_record: (number | string)[] | null;
+}
+/**
+ * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
+ */
+export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;