@pisell/pisellos 2.2.263 → 2.2.265

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

@@ -213,10 +213,12 @@ export interface OrderBookingItem {
         [key: string]: unknown;
     }[];
 }
-/** 支付记录 metadata，常含 unique_payment_number */
+/** 支付记录 metadata */
 export interface OrderPaymentMetadata {
-    /** 设备端本地支付唯一标识 */
+    /** 三方支付交易流水号 */
     unique_payment_number?: string;
+    /** 刷卡机设备快照；server 不解析内部字段，仅透传并持久化 */
+    card_reader_snapshot?: Record<string, unknown>;
     [key: string]: unknown;
 }
 /**
@@ -225,6 +227,8 @@ 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 */
@@ -249,11 +253,13 @@ 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。来源：OrderPayment.metadata */
+    /** 元数据；三方支付成功后可含 unique_payment_number */
     metadata?: OrderPaymentMetadata | null;
 }
 /**
@@ -413,6 +419,8 @@ 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,7 +2,7 @@ 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, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
+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 { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -24,6 +24,19 @@ 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;
@@ -128,6 +141,8 @@ 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>;
@@ -240,6 +255,13 @@ 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;
@@ -258,16 +280,24 @@ 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>): OrderPaymentData[];
+    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: BaseSalesUpdateOrderPaymentOptions): Promise<BaseSalesUpdateOrderPaymentResult>;
     /** 删除当前订单中的指定支付项。 */
     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;

package/lib/solution/BaseSales/index.js

@@ -40,6 +40,8 @@ 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);
@@ -77,6 +79,11 @@ 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",
@@ -150,6 +157,15 @@ function mergeBaseSalesCollectionItem(kind, currentItem, incomingItem, uidRemaps
   return kind === "product" ? mergeBaseSalesProductSnapshotFields(currentItem, mergedItem) : mergedItem;
 }
 function mergeBaseSalesOrderCollection(kind, currentValue, incomingValue, strategy, uidRemaps) {
+  if (kind === "payment") {
+    return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(
+      currentValue,
+      incomingValue,
+      strategy === "preserve-local" ? { preserveUnmatchedExisting: true } : {
+        preserveUnmatchedExistingWhen: (payment) => (0, import_payment_utils.isIdentifiedPendingOrderPayment)(payment) || !(0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("payment", payment)
+      }
+    );
+  }
   const currentItems = (0, import_orderCollectionIdentity.normalizeOrderCollection)(kind, currentValue, {
     ensureUid: false
   }).items;
@@ -209,6 +225,35 @@ 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 || {},
@@ -237,6 +282,15 @@ 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)
@@ -255,6 +309,18 @@ 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);
@@ -796,6 +862,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");
@@ -930,13 +1006,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
         throw new Error(message);
       }
-      const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
+      const remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(
+        preloadedSalesDetail ?? loadedRecord.data
+      );
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(
+      const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(
         currentTempOrder,
         remoteRecord,
         "preserve-local"
       ) : remoteRecord;
+      const record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
       return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(
@@ -1727,6 +1806,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) {
@@ -1927,8 +2020,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 模块未初始化");
@@ -1945,21 +2056,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) {
@@ -1981,10 +2097,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) {
@@ -1998,6 +2177,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

@@ -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 {

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

package/lib/solution/BookingTicket/index.js

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

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

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/lib/solution/Sales/index.js

@@ -39,6 +39,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 __reExport(Sales_exports, require("./types"), module.exports);
+var UNPAID_PAYMENT_STATUSES = /* @__PURE__ */ new Set(["unpaid", "partially_paid", "payment_processing"]);
 var SalesImpl = class extends import_BaseModule.BaseModule {
   // LoggerManager 实例
   constructor(name, version) {
@@ -258,6 +259,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
   }
+  isUnpaidBooking(booking) {
+    return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
+  }
   countBookingOrders(bookings) {
     const orderIds = /* @__PURE__ */ new Set();
     bookings.forEach((booking) => {
@@ -631,9 +635,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
-    const unpaidBookingList = matchedBookingList.filter(
-      (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid" || this.getBookingOrderPaymentStatus(booking) === "payment_processing"
-    );
+    const unpaidBookingList = matchedBookingList.filter((booking) => this.isUnpaidBooking(booking));
     const bookings = this.pickBookingsForCurrentPoint(
       current,
       this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)

package/lib/utils/payment-number.d.ts

@@ -0,0 +1,9 @@
+export type PaymentNumberAppDataGetter = (key: string) => unknown;
+/**
+ * Resolve the synchronous fallback without caching runtime device data.
+ */
+export declare function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData: PaymentNumberAppDataGetter): string;
+/**
+ * Resolve the latest device segment when a new payment number is generated.
+ */
+export declare function resolvePaymentNumberDevicePrefix(getAppData: PaymentNumberAppDataGetter): Promise<string>;

package/lib/utils/payment-number.js

@@ -0,0 +1,64 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/payment-number.ts
+var payment_number_exports = {};
+__export(payment_number_exports, {
+  resolvePaymentNumberDevicePrefix: () => resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId: () => resolvePaymentNumberDevicePrefixFromDeviceId
+});
+module.exports = __toCommonJS(payment_number_exports);
+function normalizeNonEmptyString(value) {
+  if (value === void 0 || value === null)
+    return null;
+  if (typeof value !== "string" && typeof value !== "number")
+    return null;
+  if (typeof value === "number" && !Number.isFinite(value))
+    return null;
+  const normalized = String(value).trim();
+  return normalized || null;
+}
+function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData) {
+  try {
+    const deviceId = normalizeNonEmptyString(getAppData("device_id"));
+    if (deviceId && deviceId !== "0")
+      return deviceId.slice(-2);
+  } catch {
+  }
+  return "LOCAL";
+}
+async function resolvePaymentNumberDevicePrefix(getAppData) {
+  try {
+    const getAsyncIotDeviceInfo = getAppData("async_iot_device_info");
+    if (typeof getAsyncIotDeviceInfo === "function") {
+      const info = await getAsyncIotDeviceInfo();
+      const shortNumber = normalizeNonEmptyString(
+        info == null ? void 0 : info.short_number
+      );
+      if (shortNumber && shortNumber !== "0")
+        return shortNumber;
+    }
+  } catch {
+  }
+  return resolvePaymentNumberDevicePrefixFromDeviceId(getAppData);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.263",
+  "version": "2.2.265",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",