@pisell/pisellos 2.2.277 → 2.2.800

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 以便筛选与数据源扩展 */
@@ -568,19 +560,6 @@ export interface OrderChangedPayload {
     /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
     source?: string;
 }
-export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh';
-/**
- * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
- * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。
- */
-export interface RemoteProductMembershipChangedPayload {
-    order_id: OrderId;
-    source: RemoteProductMembershipChangeSource;
-    added_product_keys: string[];
-    removed_product_keys: string[];
-    previous_product_count: number;
-    current_product_count: number;
-}
 /**
  * OrderSyncMessage - pubsub 同步消息结构
  */
@@ -618,6 +597,5 @@ export interface OrderState {
 export declare enum OrderHooks {
     onOrdersLoaded = "order:onOrdersLoaded",
     onOrdersChanged = "order:onOrdersChanged",
-    onRemoteProductMembershipChanged = "order:onRemoteProductMembershipChanged",
     onOrdersSyncCompleted = "order:onOrdersSyncCompleted"
 }

package/lib/server/modules/order/types.js

@@ -25,7 +25,6 @@ module.exports = __toCommonJS(types_exports);
 var OrderHooks = /* @__PURE__ */ ((OrderHooks2) => {
   OrderHooks2["onOrdersLoaded"] = "order:onOrdersLoaded";
   OrderHooks2["onOrdersChanged"] = "order:onOrdersChanged";
-  OrderHooks2["onRemoteProductMembershipChanged"] = "order:onRemoteProductMembershipChanged";
   OrderHooks2["onOrdersSyncCompleted"] = "order:onOrdersSyncCompleted";
   return OrderHooks2;
 })(OrderHooks || {});

package/lib/server/utils/small-ticket.js

@@ -562,7 +562,7 @@ function buildOptionTitleSuffix(options) {
 function formatBundlePrice(bundle, currencySymbol) {
   const value = bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0;
   const amount = new import_decimal.default(toMoneyNumber(value));
-  const isNegative = bundle.price_type === "markdown" || bundle.price_type === "markup" && bundle.price_type_ext === "product_price";
+  const isNegative = bundle.price_type === "markdown";
   if (isNegative)
     return `-${currencySymbol}${amount.abs().toFixed(2)}`;
   return formatMoney(amount, currencySymbol);

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

@@ -1,15 +1,15 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions } 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, RoundingResult, WalletAssetId, WalletAssetsBehaviorOptions, WalletAssetsSnapshot, WalletAssetsState, WalletAssetSelectionSource, ScanWalletAssetResult } 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` 直接访问插件，保持原有契约不破坏。
@@ -69,7 +51,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private autoPaymentSyncTimer;
     private salesDetailLoadInFlightCount;
     private salesDetailLoadSequence;
-    private walletAssetsRefreshSequence;
     private salesDetailHydrateQueue;
     private serverOrderChangeUnsubscribe;
     private serverOrderChangeHydrateInFlight;
@@ -157,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>;
@@ -276,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;
@@ -301,69 +268,22 @@ 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;
-    private buildWalletInitBusinessData;
     initWalletData(params?: {
         order_wait_pay_amount?: number;
     }): Promise<import("../../modules/Payment").WalletInitializationResult>;
-    private getCommittedWalletAssets;
-    private publishWalletAssetsState;
-    private syncSelectedWalletAssets;
-    /** 读取购物车与 Shared Checkout 共用的钱包资产状态。 */
-    getWalletAssetsState(): WalletAssetsState;
-    /** 导出 Shared Checkout 跨运行时恢复所需的钱包状态与搜索缓存。 */
-    exportWalletAssetsSnapshot(): WalletAssetsSnapshot;
-    /** 配置仅影响 Wallet Assets，不改变 Promotion/Voucher 选择流程。 */
-    configureWalletAssetsBehavior(options: WalletAssetsBehaviorOptions): void;
-    /**
-     * 恢复 Shared Checkout 钱包快照，并把选择重新同步为订单 pending payment。
-     */
-    importWalletAssetsSnapshot(snapshot: WalletAssetsSnapshot): Promise<WalletAssetsState>;
-    /**
-     * 基于当前订单快照刷新钱包资产。商品变化保留并重验选择；客户变化强制清空。
-     */
-    refreshWalletAssets(params?: {
-        order_wait_pay_amount?: number;
-        preserveSelection?: boolean;
-    }): Promise<WalletAssetsState>;
-    /** 选择或取消单张钱包资产，并立即同步 pending wallet payments。 */
-    selectWalletAsset(params: {
-        assetId: WalletAssetId;
-        selected: boolean;
-        source?: WalletAssetSelectionSource;
-    }): Promise<WalletAssetsState>;
-    /** 更新已选钱包资产的手动使用金额，并同步 pending payment。 */
-    updateWalletAssetAmount(params: {
-        assetId: WalletAssetId;
-        amount: number;
-    }): Promise<WalletAssetsState>;
-    /** 扫码精确查券；仅可用资产会被自动选中。 */
-    scanWalletAsset(code: string): Promise<ScanWalletAssetResult>;
-    /** 清空全部未确认钱包选择，已支付钱包项由 Order 模块继续保留。 */
-    clearWalletAssetSelection(): Promise<WalletAssetsState>;
     /**
      * 更新当前订单客户字段。
      *
@@ -380,30 +300,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getPaymentMethodsAsync(): Promise<PaymentMethod[]>;
     /** 同步读取初始化时缓存的支付方式列表。 */
     getPaymentMethods(): PaymentMethod[];
-    private findCashPaymentMethod;
-    private getPendingWalletPaymentAmount;
-    /** 读取现金 action 所需的支付方式、待付金额和快捷金额。 */
-    getCashPaymentConfig(): Promise<BaseSalesCashPaymentConfig>;
-    /**
-     * 确认足额覆盖订单的 pending Wallet 支付并提交订单。
-     *
-     * Order 模块在构造提交参数时将 pending voucher 转为 paid；只有提交成功后
-     * 才同步 Wallet committed 状态。失败时恢复调用前 payments，允许用户重试。
-     */
-    confirmWalletPayment<T = Record<string, any>>(): Promise<BaseSalesConfirmWalletPaymentResult<T>>;
-    /**
-     * 购物车现金直付：写入现金记录并等待支付同步完成。
-     * 同步失败会恢复调用前 payments（包含 Wallet pending 状态）。
-     */
-    payCash(params: BaseSalesPayCashParams): Promise<BaseSalesPayCashResult>;
-    /**
-     * 提交一次已由支付设备确认成功的非 Wallet 支付。
-     *
-     * 与 addOrderPayment 不同，本入口不会启动后台 fire-and-forget 同步；调用方会等待
-     * 本次 payment、当前 pending Wallet 以及订单提交共同完成。任何同步失败都会恢复
-     * 调用前的 payments 与 payment_status，便于 UI 安全解锁并重试。
-     */
-    commitPaymentMethodPayment(params: BaseSalesCommitPaymentMethodParams): Promise<BaseSalesCommitPaymentMethodResult>;
     /**
      * 按当前店铺的现金舍入配置计算金额，供现金支付 UI 使用。
      *