@pisell/pisellos 2.2.272 → 2.2.274

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

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

package/dist/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, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions } 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;
@@ -48,11 +35,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
     protected cacheId: string | undefined;
-    /**
-     * 由已在初始化阶段解析过设备短号的业务解决方案写入。
-     * 未设置时，支付编号仍按原逻辑实时读取设备信息。
-     */
-    protected paymentNumberDevicePrefix: string | null;
     /**
      * window / request 暴露为 public：现存外部工具（如 BookingTicket Scan）通过
      * `solution.window` / `solution.request` 直接访问插件，保持原有契约不破坏。
@@ -108,6 +90,16 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private applyQuotationScheduleResolver;
     private loadQuotationForPriceQuery;
     private getPriceQueryProductId;
+    /**
+   * Change Time / customer reprice 必须沿用商品列表的渠道口径。
+   * SalesSdk Provider 通常将渠道存为 platform，因此不能只读取 otherParams.channel。
+   */
+    private getPriceQueryChannel;
+    /**
+     * /product/query 的智能定价评估只读取 strategy_context；
+     * application_code 仅作为接口兼容字段，不能替代 channel / business_code。
+     */
+    private getPriceQueryStrategyContext;
     private getPriceQuerySchedule;
     private loadProductsForPriceQuery;
     private loadProductForPriceQuery;
@@ -146,13 +138,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     protected readSessionCacheData(): Record<string, any>;
     protected getAppData<T>(key: string): T | undefined;
-    /**
-     * 复用业务解决方案初始化时已解析的支付设备短号。
-     * 空值会清除缓存，使后续支付恢复实时读取设备信息的兼容路径。
-     */
-    protected setPaymentNumberDevicePrefix(prefix: unknown): void;
-    private getPaymentNumberDevicePrefixSync;
-    private getPaymentNumberDevicePrefixAsync;
     private syncAppDataToTempOrder;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
@@ -179,7 +164,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 获取附加费用（运费/服务费/税费等）。 */
     getSurcharges(): ISalesSurcharge[];
     getTempOrder(): OrderTempOrder | null;
-    replaceTempOrder(tempOrder: OrderTempOrder): Promise<OrderTempOrder>;
+    replaceTempOrder(tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions): Promise<OrderTempOrder>;
     getOrderIdentity(): import("../../modules/Order/types").OrderIdentitySnapshot | null;
     getOrderSnapshot(): import("../../modules/Order/types").OrderSnapshot | null;
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
@@ -265,13 +250,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;
@@ -290,27 +268,16 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private queueLatestAutoPaymentSync;
     private scheduleQueuedAutoPaymentSyncFlush;
     private flushQueuedAutoPaymentSync;
-    /**
-     * 同步兼容入口。无法等待 IoT 短号时，按调用当下的 device_id 或 LOCAL 生成。
-     */
+    /** 追加单个支付项到当前订单。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
-    /**
-     * 创建新支付项时优先使用业务解决方案初始化阶段缓存的设备短号；
-     * 未缓存的通用 BaseSales 保持实时读取设备信息的兼容语义。
-     */
-    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;
@@ -333,16 +300,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>;
     /**
      * 发送支付链接。
      *
@@ -359,7 +325,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getQuotationCustomerScopeInfo(): BaseSalesQuotationCustomerScopeInfo;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
-    addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProductQuantity(params: BaseSalesUpdateOrderProductQuantityParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
@@ -375,8 +341,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * @example
      * await baseSales.removeProductsFromOrder([identityA, identityB]);
      */
-    removeProductsFromOrder(identities: BaseSalesOrderProductIdentity[]): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    removeProductFromOrder(identity: BaseSalesOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    removeProductsFromOrder(identities: BaseSalesOrderProductIdentity[], options?: RemoveProductsFromOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    removeProductFromOrder(identity: BaseSalesOrderProductIdentity, options?: RemoveProductsFromOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     /**
      * 注入促销评估器到底层 OrderModule。
      *