@pisell/pisellos 2.2.273 → 2.2.275

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

@@ -165,6 +165,8 @@ export interface OrderCustomerChangePayload {
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入当前订单折扣列表，但不一定能立即应用。 */
+    isAccepted?: boolean;
     discountList: Discount[];
     scannedDiscountList: Discount[];
     type: 'server' | 'clientCalc';
@@ -319,6 +321,24 @@ export interface ReplaceTempOrderOptions {
     saveDraft?: boolean;
 }
 export type AddProductBookingInput = Record<string, any>;
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+export interface AddProductToOrderOptions {
+    insertAfterProductUid?: string;
+}
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+export interface RemoveProductsFromOrderOptions {
+    preserveDisplayPosition?: {
+        remainingProductUid: string;
+        anchorProductUid: string;
+    };
+}
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -713,15 +733,15 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
-    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
+    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
-    removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
-    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
+    removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
     /**

package/dist/modules/Order/types.js

@@ -63,6 +63,17 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 清空时整个 payload 为 null。
  */
 
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */

package/dist/modules/Payment/index.js

@@ -2009,7 +2009,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               baseValue = amount.div(roundingInterval);
               console.log("[PaymentModule] \u820D\u5165\u8BA1\u7B97 - \u539F\u59CB\u91D1\u989D: ".concat(amount.toString(), ", \u95F4\u9694: ").concat(intervalValue, ", \u57FA\u7840\u503C: ").concat(baseValue.toString(), ", \u89C4\u5219: ").concat(rule));
               _context26.t0 = rule;
-              _context26.next = _context26.t0 === RoundingRule.Standard ? 13 : _context26.t0 === 'standard' ? 13 : _context26.t0 === RoundingRule.StandardDown ? 15 : _context26.t0 === 'standard_down' ? 15 : _context26.t0 === RoundingRule.AlwaysUp ? 17 : _context26.t0 === 'always_up' ? 17 : _context26.t0 === RoundingRule.AlwaysDown ? 19 : _context26.t0 === 'always_down' ? 19 : 21;
+              _context26.next = _context26.t0 === RoundingRule.Standard ? 13 : _context26.t0 === 'standard' ? 13 : _context26.t0 === RoundingRule.StandardDown ? 15 : _context26.t0 === 'standard_rounding_midpoint_down' ? 15 : _context26.t0 === RoundingRule.AlwaysUp ? 17 : _context26.t0 === 'always_up' ? 17 : _context26.t0 === RoundingRule.AlwaysDown ? 19 : _context26.t0 === 'always_down' ? 19 : 21;
               break;
             case 13:
               // 标准舍入（中点向上）

package/dist/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"
 }
 /**
  * 舍入结果
@@ -340,6 +340,8 @@ export interface CashPayment {
     processCashPayment: (amount: number, orderUuid: string) => Promise<void>;
     /** 获取现金余额 */
     getCashBalance: () => Promise<number>;
+    /** 根据币种面额生成现金快捷金额。 */
+    getRecommendedAmount: (money: number, currency: string) => number[];
 }
 /**
  * Eftpos支付接口
@@ -365,6 +367,62 @@ 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;
@@ -416,6 +474,24 @@ 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;
+    /** 精确搜索钱包资产；仅当前券可用时自动选择。 */
+    scanWalletAssetAsync: (code: string) => Promise<ScanWalletAssetResult>;
+    /** 清空未确认的钱包资产选择。 */
+    clearWalletAssetSelection: () => WalletAssetsState;
+    /** 同步订单中已经支付、不可撤销的钱包资产。 */
+    setCommittedWalletAssets: (committedIds: WalletAssetId[], committedAssets?: any[]) => WalletAssetsState;
 }
 /**
  * 支付模块API接口
@@ -608,7 +684,8 @@ export declare enum WalletPassHooks {
     OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted",
     OnWalletInitializationStarted = "wallet:onWalletInitializationStarted",
     OnWalletInitializationCompleted = "wallet:onWalletInitializationCompleted",
-    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed"
+    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed",
+    OnWalletAssetsStateChanged = "wallet:onWalletAssetsStateChanged"
 }
 /**
  * 支付钩子事件（统一接口）

package/dist/modules/Payment/types.js

@@ -40,9 +40,9 @@ export var TaskRunStatus = /*#__PURE__*/function (TaskRunStatus) {
  */
 export var RoundingRule = /*#__PURE__*/function (RoundingRule) {
   RoundingRule["Standard"] = "standard_rounding";
-  RoundingRule["StandardDown"] = "standard_down";
-  RoundingRule["AlwaysUp"] = "always_up";
-  RoundingRule["AlwaysDown"] = "always_down";
+  RoundingRule["StandardDown"] = "standard_rounding_midpoint_down";
+  RoundingRule["AlwaysUp"] = "round_up";
+  RoundingRule["AlwaysDown"] = "round_down";
   return RoundingRule;
 }({});
 
@@ -123,6 +123,20 @@ export var RoundingInterval = /*#__PURE__*/function (RoundingInterval) {
  * 钱包支付接口
  */
 
+/**
+ * 购物车与结账共享的钱包资产状态。
+ *
+ * 原始券字段完整保留在 items / selectedItems 中，Payment 只补充统一的
+ * 可用性、选择和加载状态，不在此层引入 UI ViewModel。
+ */
+
+/**
+ * Shared Wallet Assets 的可序列化运行时快照。
+ *
+ * state 供购物车 / Checkout 直接恢复展示与选择；searchResults 和
+ * calculationContext 用于商品变化后继续重验扫码搜索过的 Wallet。
+ */
+
 /**
  * 支付模块API接口
  */
@@ -184,6 +198,7 @@ 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/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, WalletAssetsBehaviorOptions, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
 import type { PaymentModule } from './index';
 /**
  * 钱包支付实现
@@ -10,12 +10,30 @@ 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 资产的扫码 code。 */
+    private getSearchedWalletAssetCodes;
+    /**
+     * 用订单重算接口返回的数据更新扫码 Wallet 缓存。
+     * 接口暂时缺失某个扫码 code 时继续保留旧值，避免列表闪空。
+     */
+    private syncSearchedWalletAssets;
+    private isPendingAutoSelectAsset;
+    private clearPendingAutoSelectForAsset;
+    private queuePendingAutoSelectForAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -57,6 +75,11 @@ 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;
@@ -73,6 +96,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>;
     /**