@pisell/pisellos 2.3.39 → 2.3.41

package/lib/modules/Payment/types.d.ts

@@ -40,11 +40,11 @@ export declare enum RoundingRule {
     /** 标准舍入（中点向上） */
     Standard = "standard_rounding",
     /** 标准舍入（中点向下） */
-    StandardDown = "standard_down",
+    StandardDown = "standard_rounding_midpoint_down",
     /** 总是向上舍入 */
-    AlwaysUp = "always_up",
+    AlwaysUp = "round_up",
     /** 总是向下舍入 */
-    AlwaysDown = "always_down"
+    AlwaysDown = "round_down"
 }
 /**
  * 舍入结果
@@ -87,12 +87,30 @@ export interface PaymentMethod {
     /** 其他配置信息 */
     [key: string]: any;
 }
+/** 支付项扩展元数据 */
+export interface PaymentItemMetadata {
+    /** 钱箱 ID */
+    shop_wallet_pass_id?: string;
+    /** 三方支付交易流水号 */
+    unique_payment_number?: string;
+    /** 刷卡机设备快照；PaymentModule 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+    /** rounding 规则 */
+    rounding_rule?: any;
+    /** 实付金额（现金支付时的实际给出金额） */
+    actual_paid_amount?: number;
+    /** 找零金额（现金支付时的找零金额） */
+    change_given_amount?: number;
+    [key: string]: unknown;
+}
 /**
  * 支付项
  */
 export interface PaymentItem {
     /** 当前支付项的唯一 ID */
     uuid: string;
+    /** 支付项稳定唯一号 */
+    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -110,18 +128,7 @@ export interface PaymentItem {
     /** Wallet Pass 本次使用值 */
     wallet_pass_use_value?: string | number | null;
     /** 拓展参数字段 */
-    metadata?: {
-        /** 钱箱 ID */
-        shop_wallet_pass_id?: string;
-        /** 唯一支付号 */
-        unique_payment_number?: string;
-        /** rouding规则 */
-        rounding_rule?: any;
-        /** 实付金额（现金支付时的实际给出金额） */
-        actual_paid_amount?: number;
-        /** 找零金额（现金支付时的找零金额） */
-        change_given_amount?: number;
-    };
+    metadata?: PaymentItemMetadata;
     /** rouding金额 */
     rounding_amount?: string;
     /** 三方支付手续费 */
@@ -228,6 +235,10 @@ export interface UpdateOrderParams {
  * 支付项输入类型（允许 amount 为数字）
  */
 export interface PaymentItemInput {
+    /** 调用方已有的支付项运行态 UUID；存在时复用为 payment_number 的唯一号段 */
+    uuid?: string;
+    /** 支付项稳定唯一号 */
+    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string | number;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -256,18 +267,7 @@ export interface PaymentItemInput {
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
     /** 扩展参数字段 */
-    metadata?: {
-        /** 钱箱 ID */
-        shop_wallet_pass_id?: string;
-        /** 唯一支付号 */
-        unique_payment_number?: string;
-        /** rounding规则 */
-        rounding_rule?: any;
-        /** 实付金额（现金支付时的实际给出金额） */
-        actual_paid_amount?: number;
-        /** 找零金额（现金支付时的找零金额） */
-        change_given_amount?: number;
-    };
+    metadata?: PaymentItemMetadata;
     /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
@@ -302,6 +302,8 @@ export interface PaymentUpdateFields {
     voucher_id?: string;
     /** 该支付项是否已经同步给后端服务器（只有网络请求成功后才为true） */
     isSynced?: boolean;
+    /** 支付项扩展元数据；更新时与原 metadata 浅合并 */
+    metadata?: PaymentItemMetadata;
     /** 同步错误信息（业务错误时记录错误信息，用于区分"未同步"和"同步失败"） */
     syncError?: {
         error: string;
@@ -338,6 +340,8 @@ export interface CashPayment {
     processCashPayment: (amount: number, orderUuid: string) => Promise<void>;
     /** 获取现金余额 */
     getCashBalance: () => Promise<number>;
+    /** 根据币种面额生成现金快捷金额。 */
+    getRecommendedAmount: (money: number, currency: string) => number[];
 }
 /**
  * Eftpos支付接口
@@ -363,6 +367,56 @@ export interface WalletStoredInitData {
     noApplicableVoucher: any[];
     products: any[];
 }
+export type WalletAssetId = string | number;
+export type WalletAssetSelectionSource = 'manual' | 'scan';
+export type WalletAssetsStatus = 'idle' | 'loading' | 'ready' | 'error';
+/**
+ * 购物车与结账共享的钱包资产状态。
+ *
+ * 原始券字段完整保留在 items / selectedItems 中，Payment 只补充统一的
+ * 可用性、选择和加载状态，不在此层引入 UI ViewModel。
+ */
+export interface WalletAssetsState {
+    status: WalletAssetsStatus;
+    items: any[];
+    selectedIds: WalletAssetId[];
+    selectedItems: any[];
+    committedIds: WalletAssetId[];
+    selectionSources: Record<string, WalletAssetSelectionSource>;
+    totalSelectedAmount: number;
+    customerId?: string | number;
+    error: string | null;
+    revision: number;
+}
+/**
+ * Shared Wallet Assets 的可序列化运行时快照。
+ *
+ * state 供购物车 / Checkout 直接恢复展示与选择；searchResults 和
+ * calculationContext 用于商品变化后继续重验扫码搜索过的 Wallet。
+ */
+export interface WalletAssetsSnapshot {
+    state: WalletAssetsState;
+    searchResults: SearchIdentificationCodeItem[];
+    walletParams: WalletDeductionRecommendParams | null;
+    calculationContext: {
+        orderTotalAmount: number;
+        products: any[];
+    };
+}
+export interface RefreshWalletAssetsOptions {
+    /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
+    preserveSelection?: boolean;
+}
+export interface SelectWalletAssetOptions {
+    selected: boolean;
+    source?: WalletAssetSelectionSource;
+}
+export interface ScanWalletAssetResult {
+    type: SearchIdentificationCodeResult['type'];
+    asset?: any;
+    selected: boolean;
+    state: WalletAssetsState;
+}
 export interface WalletPassPayment {
     /** 生成钱包API默认参数 */
     generateWalletParams: (businessData: WalletInitBusinessData) => WalletDeductionRecommendParams;
@@ -414,6 +468,22 @@ export interface WalletPassPayment {
     processWalletPayment: (amount: number, orderUuid: string, voucherId?: string) => Promise<void>;
     /** 获取钱包余额 */
     getWalletBalance: (voucherId: string) => Promise<number>;
+    /** 刷新购物车/结账共享的钱包资产，刷新本身不会默认选券。 */
+    refreshWalletAssetsFromBusinessAsync: (businessData: WalletInitBusinessData, options?: RefreshWalletAssetsOptions) => Promise<WalletAssetsState>;
+    /** 获取共享钱包资产状态快照。 */
+    getWalletAssetsState: () => WalletAssetsState;
+    /** 导出供 Shared Checkout 跨运行时传递的 Wallet Assets 快照。 */
+    exportWalletAssetsSnapshot: () => WalletAssetsSnapshot;
+    /** 恢复 Shared Checkout 传回的 Wallet Assets 快照。 */
+    importWalletAssetsSnapshot: (snapshot: WalletAssetsSnapshot) => WalletAssetsState;
+    /** 设置单张钱包资产的选择状态并重新计算其实际抵扣额。 */
+    selectWalletAsset: (assetId: WalletAssetId, options: SelectWalletAssetOptions) => WalletAssetsState;
+    /** 精确搜索钱包资产；仅当前券可用时自动选择。 */
+    scanWalletAssetAsync: (code: string) => Promise<ScanWalletAssetResult>;
+    /** 清空未确认的钱包资产选择。 */
+    clearWalletAssetSelection: () => WalletAssetsState;
+    /** 同步订单中已经支付、不可撤销的钱包资产。 */
+    setCommittedWalletAssets: (committedIds: WalletAssetId[], committedAssets?: any[]) => WalletAssetsState;
 }
 /**
  * 支付模块API接口
@@ -606,7 +676,8 @@ export declare enum WalletPassHooks {
     OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted",
     OnWalletInitializationStarted = "wallet:onWalletInitializationStarted",
     OnWalletInitializationCompleted = "wallet:onWalletInitializationCompleted",
-    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed"
+    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed",
+    OnWalletAssetsStateChanged = "wallet:onWalletAssetsStateChanged"
 }
 /**
  * 支付钩子事件（统一接口）

package/lib/modules/Payment/types.js

@@ -51,9 +51,9 @@ var TaskRunStatus = /* @__PURE__ */ ((TaskRunStatus2) => {
 })(TaskRunStatus || {});
 var RoundingRule = /* @__PURE__ */ ((RoundingRule2) => {
   RoundingRule2["Standard"] = "standard_rounding";
-  RoundingRule2["StandardDown"] = "standard_down";
-  RoundingRule2["AlwaysUp"] = "always_up";
-  RoundingRule2["AlwaysDown"] = "always_down";
+  RoundingRule2["StandardDown"] = "standard_rounding_midpoint_down";
+  RoundingRule2["AlwaysUp"] = "round_up";
+  RoundingRule2["AlwaysDown"] = "round_down";
   return RoundingRule2;
 })(RoundingRule || {});
 var RoundingInterval = /* @__PURE__ */ ((RoundingInterval2) => {
@@ -73,6 +73,7 @@ var WalletPassHooks = /* @__PURE__ */ ((WalletPassHooks2) => {
   WalletPassHooks2["OnWalletInitializationStarted"] = "wallet:onWalletInitializationStarted";
   WalletPassHooks2["OnWalletInitializationCompleted"] = "wallet:onWalletInitializationCompleted";
   WalletPassHooks2["OnWalletInitializationFailed"] = "wallet:onWalletInitializationFailed";
+  WalletPassHooks2["OnWalletAssetsStateChanged"] = "wallet:onWalletAssetsStateChanged";
   return WalletPassHooks2;
 })(WalletPassHooks || {});
 var PaymentHooks = /* @__PURE__ */ ((PaymentHooks2) => {

package/lib/modules/Payment/walletpass.d.ts

@@ -1,4 +1,4 @@
-import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData } from './types';
+import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData, WalletAssetId, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
 import type { PaymentModule } from './index';
 /**
  * 钱包支付实现
@@ -10,12 +10,22 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private searchResults;
     private walletParams;
     private walletInitData;
+    private walletAssetsState;
+    private walletAssetsRequestSequence;
+    private walletAssetsCalculationContext;
     constructor(paymentModule: PaymentModule);
     /**
      * 发送事件的辅助方法
      * 支持使用WalletPassHooks或PaymentHooks
      */
     private emitEvent;
+    private publishWalletAssetsState;
+    private recalculateWalletAssets;
+    /**
+     * 使用最新订单参数重验扫码搜索过的支付类 Wallet 资产。
+     * 请求失败或暂时无匹配结果时保留旧资产，避免商品变化造成列表闪空。
+     */
+    private revalidateSearchedWalletAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -73,6 +83,20 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     searchIdentificationCodeAsync(params: SearchIdentificationCodeParams, config?: {
         noCache?: boolean;
     }): Promise<SearchIdentificationCodeResult>;
+    /**
+     * 刷新购物车与结账共享的钱包资产。
+     *
+     * 与 legacy initializeWalletDataFromBusinessAsync 不同，这里维护选择状态；
+     * 推荐结果只作为可用性/金额计算输入，不会自动成为 selectedIds。
+     */
+    refreshWalletAssetsFromBusinessAsync(businessData: WalletInitBusinessData, options?: RefreshWalletAssetsOptions): Promise<WalletAssetsState>;
+    getWalletAssetsState(): WalletAssetsState;
+    exportWalletAssetsSnapshot(): WalletAssetsSnapshot;
+    importWalletAssetsSnapshot(snapshot: WalletAssetsSnapshot): WalletAssetsState;
+    selectWalletAsset(assetId: WalletAssetId, options: SelectWalletAssetOptions): WalletAssetsState;
+    scanWalletAssetAsync(code: string): Promise<ScanWalletAssetResult>;
+    clearWalletAssetSelection(): WalletAssetsState;
+    setCommittedWalletAssets(committedIds: WalletAssetId[], committedAssets?: any[]): WalletAssetsState;
     processWalletPayment(amount: number, orderUuid: string, voucherId?: string): Promise<void>;
     getWalletBalance(voucherId: string): Promise<number>;
     /**