@pisell/pisellos 2.3.29 → 2.3.31

package/dist/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/dist/server/modules/order/types.js

@@ -72,7 +72,7 @@
 // 3.5 payments
 // ─────────────────────────────────────────────────────────────────
 
-/** 支付记录 metadata，常含 unique_payment_number */
+/** 支付记录 metadata */
 
 /**
  * 支付记录（3.5 payments）

package/dist/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;