@pisell/pisellos 2.2.265 → 2.2.267

package/lib/server/modules/order/types.d.ts

@@ -213,12 +213,10 @@ export interface OrderBookingItem {
         [key: string]: unknown;
     }[];
 }
-/** 支付记录 metadata */
+/** 支付记录 metadata，常含 unique_payment_number */
 export interface OrderPaymentMetadata {
-    /** 三方支付交易流水号 */
+    /** 设备端本地支付唯一标识 */
     unique_payment_number?: string;
-    /** 刷卡机设备快照；server 不解析内部字段，仅透传并持久化 */
-    card_reader_snapshot?: Record<string, unknown>;
     [key: string]: unknown;
 }
 /**
@@ -227,8 +225,6 @@ export interface OrderPaymentMetadata {
 export interface OrderPaymentItem {
     /** 支付记录 ID；存量/更新时传。来源：OrderPayment.id */
     order_payment_id?: number | null;
-    /** 支付项稳定唯一号；历史支付项允许缺失 */
-    payment_number?: string;
     /** 支付方式 ID（设备端从本地支付方式配置取详情）。来源：OrderPayment.custom_payment_id */
     custom_payment_id?: number;
     /** 支付方式编码。来源：OrderPayment.payment_method */
@@ -253,13 +249,11 @@ export interface OrderPaymentItem {
     created_at?: string | null;
     /** 手续费配置。来源：OrderPayment.service_charge */
     service_charge?: Record<string, unknown> | null;
-    /** 已计算的支付手续费。来源：OrderPayment.service_fee */
-    service_fee?: OrderMoneyString;
     /** Wallet Pass 使用单位 */
     wallet_pass_usage_unit?: unknown[] | null;
     /** Wallet Pass 使用值 */
     wallet_pass_use_value?: number | null;
-    /** 元数据；三方支付成功后可含 unique_payment_number */
+    /** 元数据；含 unique_payment_number。来源：OrderPayment.metadata */
     metadata?: OrderPaymentMetadata | null;
 }
 /**
@@ -419,8 +413,6 @@ export interface OrderData {
     create_date?: string;
     /** 本地待同步标记：1 表示需要后续同步到云端 */
     need_sync?: 0 | 1 | number;
-    /** 本地草稿标记：1 表示仅为 POS 可恢复草稿，不代表已提交云端 */
-    is_draft_order?: 0 | 1 | number;
     /** 兼容：部分场景仍使用顶层 total_amount */
     total_amount?: OrderMoneyString | number;
     /** 扩展字段（物流、标签等）；使用 any 以便筛选与数据源扩展 */

package/lib/solution/BaseSales/index.d.ts

@@ -2,14 +2,14 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
+import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
 export * from './types';
 import { ProductList } from '../../modules/ProductList';
 import { PaymentModule } from '../../modules/Payment';
-import type { PaymentMethod } from '../../modules/Payment/types';
+import type { PaymentMethod, RoundingResult } from '../../modules/Payment/types';
 import type { SalesSummaryModule } from '../../modules/SalesSummary';
 import type { ScheduleModule } from '../../modules/Schedule';
 import { QuotationModule } from '../../modules/Quotation';
@@ -24,19 +24,6 @@ export interface BaseSalesState {
     schedule?: ScheduleModule;
     quotation?: QuotationModule;
 }
-export interface BaseSalesUpdateOrderPaymentOptions extends OrderPaymentUpdateOptions {
-    persistDraft?: boolean;
-    submitWhenPaid?: boolean;
-    forceSubmitIfPaid?: boolean;
-    /** 草稿恢复时，允许将新回调字段合并进已 paid 的支付项。 */
-    applyUpdatesWhenPaid?: boolean;
-    smallTicketDataFlag?: number;
-}
-export interface BaseSalesUpdateOrderPaymentResult extends OrderPaymentUpdateResult {
-    draftResult?: unknown;
-    draftError?: unknown;
-    syncResult?: SyncPaymentsToOrderResult<any>;
-}
 export type BaseSalesPrintLocalOrderReceiptParams = string | number;
 export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -141,8 +128,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     protected readSessionCacheData(): Record<string, any>;
     protected getAppData<T>(key: string): T | undefined;
-    private getPaymentNumberDevicePrefixSync;
-    private getPaymentNumberDevicePrefixAsync;
     private syncAppDataToTempOrder;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
@@ -255,13 +240,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
-    saveSalesOrderDraft<T = any>(params?: {
-        platform?: string;
-        businessCode?: string;
-        channel?: string;
-        type?: string;
-        enhancePayload?: SubmitPayloadEnhancer;
-    }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
@@ -280,24 +258,16 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private queueLatestAutoPaymentSync;
     private scheduleQueuedAutoPaymentSyncFlush;
     private flushQueuedAutoPaymentSync;
-    /**
-     * 同步兼容入口。无法等待 IoT 短号时，按调用当下的 device_id 或 LOCAL 生成。
-     */
+    /** 追加单个支付项到当前订单。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
-    /** 创建新支付项时读取最新设备短号，不缓存运行时设备信息。 */
-    addOrderPaymentAsync(payment: OrderPaymentSource): Promise<OrderPaymentData[]>;
-    private addOrderPaymentWithDevicePrefix;
     /** 更新当前订单中的指定支付项。 */
-    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: BaseSalesUpdateOrderPaymentOptions): Promise<BaseSalesUpdateOrderPaymentResult>;
+    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
     /** 删除当前订单中的指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
     updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
     }): OrderPaymentData[];
-    updateVoucherOrderPaymentsAsync(payments: OrderPaymentSource[], options?: {
-        status?: 'paid' | 'payment_pending';
-    }): Promise<OrderPaymentData[]>;
     confirmPendingVoucherPayments(): OrderPaymentData[];
     discardPendingVoucherPayments(): OrderPaymentData[];
     private getWalletProductList;
@@ -320,16 +290,15 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getPaymentMethodsAsync(): Promise<PaymentMethod[]>;
     /** 同步读取初始化时缓存的支付方式列表。 */
     getPaymentMethods(): PaymentMethod[];
-    /** 轻量舍入能力，供现金支付 UI 计算 rounding_amount。 */
+    /**
+     * 按当前店铺的现金舍入配置计算金额，供现金支付 UI 使用。
+     *
+     * 舍入开关取自 CASHMANUAL 支付方式；舍入规则取自
+     * otherParams.order_rounding_setting，金额算法统一由 PaymentModule 维护。
+     */
     roundAmount(params: {
         amount: string | number;
-        interval?: string | number;
-        rule?: 'standard_rounding' | 'standard_down' | 'always_up' | 'always_down' | string;
-    }): {
-        originalAmount: string;
-        roundedAmount: string;
-        roundingDifference: string;
-    };
+    }): Promise<RoundingResult>;
     /**
      * 发送支付链接。
      *

package/lib/solution/BaseSales/index.js

@@ -40,8 +40,6 @@ 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);
@@ -79,11 +77,6 @@ function isBaseSalesHistoricalDiscountEntry(discount) {
     (discount == null ? void 0 : discount.isEditMode) || (discount == null ? void 0 : discount.isDisabled) || (discount == null ? void 0 : discount.order_discount_id) != null
   );
 }
-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",
@@ -157,15 +150,6 @@ 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;
@@ -225,35 +209,6 @@ function normalizeBaseSalesRecordCollections(sourceRecord, options) {
   }
   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) => {
-    const clonedItem = (0, import_lodash_es.cloneDeep)(item);
-    const uid = getBaseSalesMetadataUid(clonedItem, metadataKey);
-    if (!uid) {
-      result.push(clonedItem);
-      return;
-    }
-    const existingIndex = indexByUid.get(uid);
-    if (existingIndex !== void 0) {
-      result[existingIndex] = clonedItem;
-      return;
-    }
-    indexByUid.set(uid, result.length);
-    result.push(clonedItem);
-  };
-  currentValue.forEach(appendOrReplaceByUid);
-  loadedValue.forEach(appendOrReplaceByUid);
-  return result;
-}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
   const normalizedLoadedRecord = normalizeBaseSalesRecordCollections(
     loadedRecord || {},
@@ -282,15 +237,6 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
         );
       }
       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);
-        }
         return [
           ...(0, import_lodash_es.cloneDeep)(currentValue),
           ...(0, import_lodash_es.cloneDeep)(loadedValue)
@@ -309,18 +255,6 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
     (0, import_orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps)
   );
 }
-function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
-  if (!sourceRecord || typeof sourceRecord !== "object")
-    return sourceRecord;
-  const record = { ...sourceRecord };
-  if (Array.isArray(sourceRecord.payments)) {
-    record.payments = sourceRecord.payments.filter((payment) => !(0, import_payment_utils.isPendingOrderPayment)(payment));
-  }
-  if (Array.isArray(sourceRecord.payment)) {
-    record.payment = sourceRecord.payment.filter((payment) => !(0, import_payment_utils.isPendingOrderPayment)(payment));
-  }
-  return record;
-}
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -862,16 +796,6 @@ 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");
@@ -1006,16 +930,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
         throw new Error(message);
       }
-      const remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(
-        preloadedSalesDetail ?? loadedRecord.data
-      );
+      const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-      const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(
+      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(
         currentTempOrder,
         remoteRecord,
         "preserve-local"
       ) : remoteRecord;
-      const record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
       return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(
@@ -1806,20 +1727,6 @@ 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) {
@@ -2020,26 +1927,8 @@ 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 模块未初始化");
@@ -2056,26 +1945,21 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (shopWalletPassId !== void 0 && shopWalletPassId !== null) {
       metadata.shop_wallet_pass_id = shopWalletPassId;
     }
-    const normalizedPaymentRecord = (0, import_payment_utils.ensureOrderPaymentNumber)(
-      paymentRecord,
-      devicePrefix,
-      import_utils.createUuidV4
-    );
+    if (!metadata.unique_payment_number) {
+      metadata.unique_payment_number = (0, 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({
-      ...normalizedPaymentRecord,
+      ...paymentRecord,
       ...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) {
@@ -2097,73 +1981,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return payments;
   }
   /** 更新当前订单中的指定支付项。 */
-  async updateOrderPayment(paymentIdentity, updates, options = {}) {
-    var _a, _b, _c;
+  updateOrderPayment(paymentIdentity, updates) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    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 } : {}
-    };
+    return this.store.order.updateOrderPayment(paymentIdentity, updates);
   }
   /** 删除当前订单中的指定支付项。 */
   deleteOrderPayment(paymentIdentity) {
@@ -2177,11 +1998,6 @@ 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 模块未初始化");
@@ -2328,28 +2144,33 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   getPaymentMethods() {
     return [...this.paymentMethodsCache];
   }
-  /** 轻量舍入能力，供现金支付 UI 计算 rounding_amount。 */
-  roundAmount(params) {
-    const amount = new import_decimal.default(params.amount || 0);
-    const interval = new import_decimal.default(params.interval || 0.05);
-    const rule = params.rule || "standard_rounding";
-    const quotient = amount.div(interval);
-    let roundedQuotient;
-    if (rule === "always_up") {
-      roundedQuotient = quotient.ceil();
-    } else if (rule === "always_down") {
-      roundedQuotient = quotient.floor();
-    } else if (rule === "standard_down") {
-      roundedQuotient = quotient.toDecimalPlaces(0, import_decimal.default.ROUND_HALF_DOWN);
-    } else {
-      roundedQuotient = quotient.toDecimalPlaces(0, import_decimal.default.ROUND_HALF_UP);
+  /**
+   * 按当前店铺的现金舍入配置计算金额，供现金支付 UI 使用。
+   *
+   * 舍入开关取自 CASHMANUAL 支付方式；舍入规则取自
+   * otherParams.order_rounding_setting，金额算法统一由 PaymentModule 维护。
+   */
+  async roundAmount(params) {
+    var _a, _b, _c;
+    const amount = params.amount;
+    const cashManualPayment = this.paymentMethodsCache.find(
+      (paymentMethod) => paymentMethod.code === "CASHMANUAL"
+    );
+    if (!((_a = cashManualPayment == null ? void 0 : cashManualPayment.metadata) == null ? void 0 : _a.order_rounding_switch)) {
+      return {
+        originalAmount: amount.toString(),
+        roundedAmount: amount.toString(),
+        roundingDifference: "0.00"
+      };
     }
-    const roundedAmount = roundedQuotient.times(interval).toDecimalPlaces(2);
-    return {
-      originalAmount: amount.toFixed(2),
-      roundedAmount: roundedAmount.toFixed(2),
-      roundingDifference: roundedAmount.minus(amount).toFixed(2)
-    };
+    if (!this.payment) {
+      throw new Error("payment 模块未初始化");
+    }
+    return this.payment.roundAmountAsync(
+      amount,
+      (_b = this.otherParams.order_rounding_setting) == null ? void 0 : _b.interval,
+      (_c = this.otherParams.order_rounding_setting) == null ? void 0 : _c.type
+    );
   }
   /**
    * 发送支付链接。

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

@@ -332,8 +332,11 @@ function getProductLineNoteSignature(product) {
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
 function getPromotionLineMergeBoundary(product) {
-  var _a;
-  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_edit_for_runtime) !== true)
+  var _a, _b;
+  if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
+    return `weighing:${getOrderProductUid(product)}`;
+  }
+  if (((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_edit_for_runtime) !== true)
     return "";
   return `edit:${getOrderProductUid(product)}`;
 }

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

@@ -82,13 +82,8 @@ 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;
@@ -100,7 +95,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: ISalesPaymentMetadata | null;
+    metadata?: Record<string, any> | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {

package/lib/solution/BookingTicket/index.d.ts

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -1153,8 +1153,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   /** 读取当前 booking config。 */
   getBookingConfig() {
-    var _a;
-    return (_a = this.store.bookingContext) == null ? void 0 : _a.getBookingConfig();
+    return this.store.bookingContext.getBookingConfig();
   }
   /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
   setResources(resources) {

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -44,6 +44,7 @@ module.exports = __toCommonJS(addProductDecision_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_BookingContext = require("../../../modules/BookingContext");
 var import_transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
+var import_weighingProductSku = require("./weighingProductSku");
 function needsSpecDetailModal(item) {
   if (item == null ? void 0 : item.open_sold_weight)
     return true;
@@ -281,11 +282,14 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
   const quantity = (ctx == null ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? 1;
   const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
   const extend = (cacheItem == null ? void 0 : cacheItem._extend) || {};
+  const productSku = (0, import_weighingProductSku.buildProductSkuFromCacheItem)(cacheItem);
   return {
     id: (cacheItem == null ? void 0 : cacheItem.id) ?? (cacheItem == null ? void 0 : cacheItem.product_id),
     product_id: resolvedPid,
     variant_id: (other == null ? void 0 : other.product_variant_id) ?? (other == null ? void 0 : other.variant_id) ?? 0,
     quantity,
+    // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
+    product_sku: productSku ? { ...productSku, option: (other == null ? void 0 : other.option) || [] } : void 0,
     option: (other == null ? void 0 : other.option) || [],
     bundle: (other == null ? void 0 : other.bundle) || ((_c = extend == null ? void 0 : extend.skuValue) == null ? void 0 : _c.bundle) || ((_d = extend == null ? void 0 : extend._skuValue) == null ? void 0 : _d.bundle) || [],
     unique: other == null ? void 0 : other.unique,

package/lib/solution/BookingTicket/utils/weighingProductSku.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
+export declare function buildProductSkuFromCacheItem(cacheItem: Record<string, any> | null | undefined): Record<string, any> | undefined;