@pisell/pisellos 2.2.277 → 2.2.800

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

@@ -87,30 +87,12 @@ 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;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -128,7 +110,18 @@ export interface PaymentItem {
     /** Wallet Pass 本次使用值 */
     wallet_pass_use_value?: string | number | null;
     /** 拓展参数字段 */
-    metadata?: PaymentItemMetadata;
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rouding规则 */
+        rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
+    };
     /** rouding金额 */
     rounding_amount?: string;
     /** 三方支付手续费 */
@@ -235,10 +228,6 @@ export interface UpdateOrderParams {
  * 支付项输入类型（允许 amount 为数字）
  */
 export interface PaymentItemInput {
-    /** 调用方已有的支付项运行态 UUID；存在时复用为 payment_number 的唯一号段 */
-    uuid?: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string | number;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -267,7 +256,18 @@ export interface PaymentItemInput {
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
     /** 扩展参数字段 */
-    metadata?: PaymentItemMetadata;
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rounding规则 */
+        rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
+    };
     /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
@@ -302,8 +302,6 @@ export interface PaymentUpdateFields {
     voucher_id?: string;
     /** 该支付项是否已经同步给后端服务器（只有网络请求成功后才为true） */
     isSynced?: boolean;
-    /** 支付项扩展元数据；更新时与原 metadata 浅合并 */
-    metadata?: PaymentItemMetadata;
     /** 同步错误信息（业务错误时记录错误信息，用于区分"未同步"和"同步失败"） */
     syncError?: {
         error: string;
@@ -340,8 +338,6 @@ export interface CashPayment {
     processCashPayment: (amount: number, orderUuid: string) => Promise<void>;
     /** 获取现金余额 */
     getCashBalance: () => Promise<number>;
-    /** 根据币种面额生成现金快捷金额。 */
-    getRecommendedAmount: (money: number, currency: string) => number[];
 }
 /**
  * Eftpos支付接口
@@ -367,62 +363,6 @@ 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[];
-    /** 已搜索但尚未满足订单条件、等待首次可用后自动选中的 Wallet Asset code。 */
-    pendingAutoSelectSearchCodes?: string[];
-    walletParams: WalletDeductionRecommendParams | null;
-    calculationContext: {
-        orderTotalAmount: number;
-        products: any[];
-    };
-}
-export interface WalletAssetsBehaviorOptions {
-    /** 搜索到 Wallet Asset 后，当前或后续首次可用时是否自动选中。 */
-    autoSelectAfterSearch?: boolean;
-}
-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;
@@ -474,26 +414,6 @@ 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;
-    /** 配置仅影响 Wallet Assets 的交互行为。 */
-    configureWalletAssetsBehavior: (options: WalletAssetsBehaviorOptions) => void;
-    /** 导出供 Shared Checkout 跨运行时传递的 Wallet Assets 快照。 */
-    exportWalletAssetsSnapshot: () => WalletAssetsSnapshot;
-    /** 恢复 Shared Checkout 传回的 Wallet Assets 快照。 */
-    importWalletAssetsSnapshot: (snapshot: WalletAssetsSnapshot) => WalletAssetsState;
-    /** 设置单张钱包资产的选择状态并重新计算其实际抵扣额。 */
-    selectWalletAsset: (assetId: WalletAssetId, options: SelectWalletAssetOptions) => WalletAssetsState;
-    /** 更新已选钱包资产的手动使用金额，并保持原有选择顺序重新计算。 */
-    updateWalletAssetAmount: (assetId: WalletAssetId, amount: number) => WalletAssetsState;
-    /** 精确搜索钱包资产；仅当前券可用时自动选择。 */
-    scanWalletAssetAsync: (code: string) => Promise<ScanWalletAssetResult>;
-    /** 清空未确认的钱包资产选择。 */
-    clearWalletAssetSelection: () => WalletAssetsState;
-    /** 同步订单中已经支付、不可撤销的钱包资产。 */
-    setCommittedWalletAssets: (committedIds: WalletAssetId[], committedAssets?: any[]) => WalletAssetsState;
 }
 /**
  * 支付模块API接口
@@ -686,8 +606,7 @@ export declare enum WalletPassHooks {
     OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted",
     OnWalletInitializationStarted = "wallet:onWalletInitializationStarted",
     OnWalletInitializationCompleted = "wallet:onWalletInitializationCompleted",
-    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed",
-    OnWalletAssetsStateChanged = "wallet:onWalletAssetsStateChanged"
+    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed"
 }
 /**
  * 支付钩子事件（统一接口）

package/dist/modules/Payment/types.js

@@ -65,8 +65,6 @@ export var RoundingInterval = /*#__PURE__*/function (RoundingInterval) {
  * 支付方式信息
  */
 
-/** 支付项扩展元数据 */
-
 /**
  * 支付项
  */
@@ -123,20 +121,6 @@ export var RoundingInterval = /*#__PURE__*/function (RoundingInterval) {
  * 钱包支付接口
  */
 
-/**
- * 购物车与结账共享的钱包资产状态。
- *
- * 原始券字段完整保留在 items / selectedItems 中，Payment 只补充统一的
- * 可用性、选择和加载状态，不在此层引入 UI ViewModel。
- */
-
-/**
- * Shared Wallet Assets 的可序列化运行时快照。
- *
- * state 供购物车 / Checkout 直接恢复展示与选择；searchResults 和
- * calculationContext 用于商品变化后继续重验扫码搜索过的 Wallet。
- */
-
 /**
  * 支付模块API接口
  */
@@ -198,7 +182,6 @@ export var WalletPassHooks = /*#__PURE__*/function (WalletPassHooks) {
   WalletPassHooks["OnWalletInitializationStarted"] = "wallet:onWalletInitializationStarted";
   WalletPassHooks["OnWalletInitializationCompleted"] = "wallet:onWalletInitializationCompleted";
   WalletPassHooks["OnWalletInitializationFailed"] = "wallet:onWalletInitializationFailed";
-  WalletPassHooks["OnWalletAssetsStateChanged"] = "wallet:onWalletAssetsStateChanged";
   return WalletPassHooks;
 }({});
 

package/dist/modules/Payment/utils.js

@@ -12,12 +12,9 @@ export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
  */
 export var formatWalletPassList2PreparePayments = function formatWalletPassList2PreparePayments(list) {
   var formatted = (list || []).map(function (item) {
-    var _ref, _item$actualDeduction;
     return {
       voucher_id: item.id || 0,
-      // 前端策略重算后的 actualDeduction 才是最终可同步金额；
-      // edit_current_amount 只是用户请求值，仍可能被策略和订单剩余金额裁剪。
-      amount: Number((_ref = (_item$actualDeduction = item.actualDeduction) !== null && _item$actualDeduction !== void 0 ? _item$actualDeduction : item.edit_current_amount) !== null && _ref !== void 0 ? _ref : getAvailableMaxAmount(item)) || 0,
+      amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
       tag: item.tag || '',
       wallet_pass_usage_unit: item.wallet_pass_usage_unit || {},
       wallet_pass_use_value: item.wallet_pass_use_value || undefined

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

@@ -1,4 +1,4 @@
-import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData, WalletAssetId, WalletAssetsBehaviorOptions, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
+import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData } from './types';
 import type { PaymentModule } from './index';
 /**
  * 钱包支付实现
@@ -10,35 +10,12 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private searchResults;
     private walletParams;
     private walletInitData;
-    private walletAssetsState;
-    private walletAssetsRequestSequence;
-    private walletAssetsBehavior;
-    private pendingAutoSelectSearchCodes;
-    private walletAssetsCalculationContext;
     constructor(paymentModule: PaymentModule);
-    configureWalletAssetsBehavior(options: WalletAssetsBehaviorOptions): void;
     /**
      * 发送事件的辅助方法
      * 支持使用WalletPassHooks或PaymentHooks
      */
     private emitEvent;
-    private publishWalletAssetsState;
-    private recalculateWalletAssets;
-    /**
-     * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
-     * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
-     */
-    private formatSearchedWalletPaymentAssets;
-    /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
-    private getSearchedWalletAssetCodes;
-    /**
-     * 用订单重算接口返回的数据更新扫码 Wallet 缓存。
-     * 接口暂时缺失某个扫码 code 时继续保留旧值，避免列表闪空。
-     */
-    private syncSearchedWalletAssets;
-    private isPendingAutoSelectAsset;
-    private clearPendingAutoSelectForAsset;
-    private queuePendingAutoSelectForAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -80,11 +57,6 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
         noApplicableVoucher: any[];
         products: any[];
     }>;
-    /**
-     * 商品或订单金额变化后，使用聚合接口一次重算已选与剩余 WalletPass。
-     * Walk-In 不发送 customer_id；会员才携带真实 customer_id。
-     */
-    private aggregateRecalculateWalletAssetsAsync;
     getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
     formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
         voucher_id: number;
@@ -101,26 +73,6 @@ 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;
-    private updateWalletAssetEditAmountInCaches;
-    selectWalletAsset(assetId: WalletAssetId, options: SelectWalletAssetOptions): WalletAssetsState;
-    /**
-     * 更新已选资产的手动金额。只允许在当前实际抵扣额内向下调整，
-     * 金额为 0 时沿用 legacy 行为取消选择。
-     */
-    updateWalletAssetAmount(assetId: WalletAssetId, amount: number): 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>;
     /**