@pisell/pisellos 2.2.265 → 2.2.267

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");
@@ -315,11 +313,11 @@ 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) {
+    const appPlugin = this.core.getPlugin("app");
+    if (!appPlugin) {
       throw new Error("Order 模块需要 app 插件支持");
     }
-    const app = this.appPlugin.getApp();
+    const app = appPlugin.getApp();
     this.logger = app.logger;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
@@ -1055,40 +1053,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 +2484,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 +2507,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 +2520,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 +2679,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 +2730,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;
@@ -2843,7 +2790,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
    */
   async appendProductLineToTempOrder(tempOrder, product, booking) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2854,7 +2801,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       productToAdd,
       (0, import_utils3.normalizeOrderProduct)(productToAdd)
     );
-    const incomingBookingUid = productToAdd.booking_uid ?? ((_a = productToAdd.metadata) == null ? void 0 : _a.booking_uid);
+    const isWeighingProduct = Number(((_a = normalizedIncoming.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1;
+    const netWeight = Number((_b = normalizedIncoming.product_sku) == null ? void 0 : _b.net_weight);
+    if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
+      throw new Error("[Order] 称重商品净重必须大于 0");
+    }
+    const incomingBookingUid = productToAdd.booking_uid ?? ((_c = productToAdd.metadata) == null ? void 0 : _c.booking_uid);
     if (incomingBookingUid !== void 0 && incomingBookingUid !== null && String(incomingBookingUid) !== "") {
       normalizedIncoming.booking_uid = String(incomingBookingUid);
       normalizedIncoming.metadata = {
@@ -2870,7 +2822,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
+    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
@@ -2922,7 +2874,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder.products = [...tempOrder.products, normalizedIncoming];
     } else {
       const targetProduct = matchedProduct;
-      const targetUid = (_b = targetProduct.metadata) == null ? void 0 : _b.unique_identification_number;
+      const targetUid = (_d = targetProduct.metadata) == null ? void 0 : _d.unique_identification_number;
       const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
         targetProduct,
         (0, import_utils3.normalizeOrderProduct)({
@@ -3613,38 +3565,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 +3765,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;
@@ -4227,12 +4142,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 +4162,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 +4275,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 +4348,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

@@ -468,8 +468,6 @@ export interface SubmitSalesOrderParams {
 export interface PaymentItemData {
     /** 当前支付项的唯一 ID */
     uuid: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型代码 */
@@ -492,22 +490,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 +523,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;
@@ -693,14 +673,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: {
@@ -758,15 +730,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.js

@@ -965,9 +965,6 @@ function buildSubmitPayload(params) {
     ...tempOrderRest,
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || "Walk-In",
-    country_calling_code: String(tempOrder.country_calling_code ?? ""),
-    phone: String(tempOrder.phone ?? ""),
-    email: String(tempOrder.email ?? ""),
     order_number: tempOrder.order_number ?? null,
     shop_order_number: tempOrder.shop_order_number ?? null,
     shop_full_order_number: tempOrder.shop_full_order_number ?? null,
@@ -1023,7 +1020,9 @@ function mapPaymentItemToOrderPayment(paymentItem) {
   const item = paymentItem;
   const customPaymentId = item.custom_payment_id ?? item.id;
   const metadata = item.metadata && typeof item.metadata === "object" ? { ...item.metadata } : {};
-  const paymentNumber = item.payment_number;
+  if (item.uuid && !metadata.unique_payment_number) {
+    metadata.unique_payment_number = String(item.uuid);
+  }
   const paymentMetadataKeys = [
     "rounding_rule",
     "shop_wallet_pass_id",
@@ -1040,7 +1039,6 @@ function mapPaymentItemToOrderPayment(paymentItem) {
   const createdAt = item.created_at ?? timestamp;
   return {
     ...item.order_payment_id !== void 0 ? { order_payment_id: item.order_payment_id } : {},
-    ...paymentNumber !== void 0 && paymentNumber !== null && paymentNumber !== "" ? { payment_number: String(paymentNumber) } : {},
     amount: String(item.amount ?? "0.00"),
     code: String(item.code || ""),
     custom_payment_id: Number(customPaymentId ?? 0),

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

@@ -20,7 +20,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     protected defaultVersion: string;
     request: RequestPlugin;
     private app;
-    private appPlugin;
     private store;
     window: WindowPlugin;
     private dbManager;
@@ -41,7 +40,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
-    private getPaymentNumberAppData;
     /**
      * 记录信息日志
      */

package/lib/modules/Payment/index.js

@@ -31,9 +31,6 @@ var import_cash = require("./cash");
 var import_eftpos = require("./eftpos");
 var import_walletpass = require("./walletpass");
 var import_decimal = require("decimal.js");
-var import_payment_utils = require("../Order/payment-utils");
-var import_utils2 = require("../Order/utils");
-var import_payment_number = require("../../utils/payment-number");
 __reExport(Payment_exports, require("./types"), module.exports);
 function formatAmount(amount) {
   try {
@@ -115,15 +112,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.otherParams = options.otherParams || {};
     this.request = core.getPlugin("request");
-    this.appPlugin = core.getPlugin("app");
+    const appPlugin = core.getPlugin("app");
     this.window = core.getPlugin("window");
     if (!this.request) {
       throw new Error("支付模块需要 request 插件支持");
     }
-    if (!this.appPlugin) {
+    if (!appPlugin) {
       throw new Error("支付模块需要 app 插件支持");
     }
-    this.app = this.appPlugin.getApp();
+    this.app = appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
     this.registerNetworkHandlers();
@@ -139,14 +136,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
-  getPaymentNumberAppData(key) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
-    if (typeof getData === "function")
-      return getData(key);
-    const coreData = (_g = (_e = (_d = (_c = this.app) == null ? void 0 : _c.models) == null ? void 0 : _d.getStore) == null ? void 0 : (_f = _e.call(_d)).getDataByModel) == null ? void 0 : _g.call(_f, "core", "core");
-    return coreData == null ? void 0 : coreData[key];
-  }
   /**
    * 记录信息日志
    */
@@ -532,20 +521,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      const paymentUuid = paymentItem.uuid || ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) || (0, import_utils.getUniqueId)("payment_");
+      let paymentUuid;
+      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
+        paymentUuid = paymentItem.metadata.unique_payment_number;
+      } else {
+        paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      }
       const currentTime = formatDateTime(/* @__PURE__ */ new Date());
-      const hasPaymentNumber = String(paymentItem.payment_number || "").trim() !== "";
-      const paymentNumberDevicePrefix = hasPaymentNumber ? "LOCAL" : await (0, import_payment_number.resolvePaymentNumberDevicePrefix)(
-        (key) => this.getPaymentNumberAppData(key)
-      );
-      const paymentNumber = (0, import_payment_utils.ensureOrderPaymentNumber)(
-        paymentItem,
-        paymentNumberDevicePrefix,
-        import_utils2.createUuidV4
-      ).payment_number;
       const newPaymentItem = {
         uuid: paymentUuid,
-        payment_number: paymentNumber,
         custom_payment_id: normalizeCustomPaymentId(paymentItem),
         name: paymentItem.name,
         code: paymentItem.code,
@@ -565,8 +549,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         updated_at: currentTime,
         // 更新时间
         metadata: {
-          ...paymentItem.metadata
+          ...paymentItem.metadata,
           // 保留传入的所有 metadata 字段
+          unique_payment_number: paymentUuid
+          // 设置唯一支付号为支付项的 uuid
         }
       };
       order.payment.push(newPaymentItem);
@@ -781,12 +767,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         if ("amount" in formattedParams && formattedParams.amount !== void 0) {
           formattedParams.amount = formatAmount(formattedParams.amount);
         }
-        if (formattedParams.metadata && typeof formattedParams.metadata === "object") {
-          formattedParams.metadata = {
-            ...paymentItem.metadata || {},
-            ...formattedParams.metadata
-          };
-        }
         Object.assign(paymentItem, formattedParams);
         this.recalculateOrderAmount(order);
         await this.dbManager.update("order", order);
@@ -844,7 +824,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const paymentData = {
         payments: order.payment.map((payment) => ({
           uuid: payment.uuid,
-          payment_number: payment.payment_number,
           amount: payment.amount,
           code: payment.code,
           custom_payment_id: payment.custom_payment_id,
@@ -1088,7 +1067,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           roundedValue = this.standardRound(baseValue, true);
           break;
         case import_types.RoundingRule.StandardDown:
-        case "standard_down":
+        case "standard_rounding_midpoint_down":
           roundedValue = this.standardRound(baseValue, false);
           break;
         case import_types.RoundingRule.AlwaysUp: