@pisell/pisellos 0.10.7 → 0.10.9

package/lib/modules/Order/utils.js

@@ -705,7 +705,7 @@ function normalizeSubmitPlatform(platform) {
     return "H5";
   return value;
 }
-function formatSubmitOptionItems(options) {
+function formatSubmitOptionItems(options, formatOptions = {}) {
   if (!Array.isArray(options))
     return [];
   return options.map((d) => {
@@ -716,8 +716,11 @@ function formatSubmitOptionItems(options) {
       option_group_id: d == null ? void 0 : d.option_group_id
     };
     const addPrice = (d == null ? void 0 : d.add_price) ?? (d == null ? void 0 : d.price);
-    if (addPrice !== void 0)
+    if (formatOptions.virtualSettlementMode) {
+      option.add_price = 0;
+    } else if (addPrice !== void 0) {
       option.add_price = String(addPrice);
+    }
     delete option.price;
     return option;
   });
@@ -734,7 +737,7 @@ function toMoneyString(value) {
     return "0.00";
   return String(value);
 }
-function formatSubmitBundleItems(bundle) {
+function formatSubmitBundleItems(bundle, formatOptions = {}) {
   if (!Array.isArray(bundle))
     return [];
   return bundle.map((b) => {
@@ -744,9 +747,9 @@ function formatSubmitBundleItems(bundle) {
       custom_product_bundle_map_id: _customProductBundleMapId,
       ...submitMetadata
     } = existedMetadata;
-    const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
-    const paymentPrice = rawBundle.bundle_payment_price !== void 0 && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== "" ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
-    const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
+    const sellingPrice = formatOptions.virtualSettlementMode ? "0.00" : getBundleSellingMagnitude(rawBundle).toFixed(2);
+    const paymentPrice = formatOptions.virtualSettlementMode ? "0.00" : rawBundle.bundle_payment_price !== void 0 && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== "" ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
+    const priceValue = formatOptions.virtualSettlementMode ? 0 : rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toMoneyString(
       rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee
@@ -759,7 +762,7 @@ function formatSubmitBundleItems(bundle) {
     const bundleMapId = resolveSubmitBundleMapId(rawBundle);
     const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
     return {
-      is_charge_tax: rawBundle.is_charge_tax ?? 0,
+      is_charge_tax: formatOptions.virtualSettlementMode ? 0 : rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
       num,
       quantity: toBundleNumber(rawBundle.quantity ?? rawBundle.num, num),
@@ -770,7 +773,7 @@ function formatSubmitBundleItems(bundle) {
       price_type_ext: rawBundle.price_type_ext ?? rawBundle.custom_price_type_ext ?? "",
       bundle_selling_price: sellingPrice,
       bundle_payment_price: paymentPrice,
-      option: formatSubmitOptionItems(rawBundle.option),
+      option: formatSubmitOptionItems(rawBundle.option, formatOptions),
       bundle_group_id: (rawBundle == null ? void 0 : rawBundle.bundle_group_id) ?? (rawBundle == null ? void 0 : rawBundle.group_id),
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
       bundle_product_id: (rawBundle == null ? void 0 : rawBundle.bundle_product_id) ?? (rawBundle == null ? void 0 : rawBundle._bundle_product_id),
@@ -778,15 +781,15 @@ function formatSubmitBundleItems(bundle) {
       metadata: {
         ...submitMetadata,
         ...hasSubmitBundleDiscounts && bundleMapId !== void 0 ? { custom_product_bundle_map_id: bundleMapId } : {},
-        surcharge_fee: surchargeFee,
-        relation_surcharge_ids: relationSurchargeIds,
-        product_discount_difference: productDiscountDifference
+        surcharge_fee: formatOptions.virtualSettlementMode ? "0.00" : surchargeFee,
+        relation_surcharge_ids: formatOptions.virtualSettlementMode ? [] : relationSurchargeIds,
+        product_discount_difference: formatOptions.virtualSettlementMode ? "" : productDiscountDifference
       }
     };
   });
 }
-function normalizeSubmitProduct(product) {
-  var _a;
+function normalizeSubmitProduct(product, formatOptions = {}) {
+  var _a, _b;
   const { unique_identification_number: _runtimeUid, ...submitProduct } = product;
   const {
     num,
@@ -801,6 +804,8 @@ function normalizeSubmitProduct(product) {
   delete productRest[`product_${"option"}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
+  const hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
+  const bundleEdit = submitProduct.bundle_edit ?? rawMetadata.bundle_edit ?? (hasProductBundle ? 0 : void 0);
   const cleanMetadata = {};
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
@@ -818,8 +823,10 @@ function normalizeSubmitProduct(product) {
     "tax_fee_rounding_remainder",
     "relation_surcharge_ids",
     "discountable_flag",
+    "price_schema_version",
     "parent_unique_identification_number",
-    "product_add_schedule_time"
+    "product_add_schedule_time",
+    "data_variant_ids"
   ];
   for (const key of priceMetaKeys) {
     if (rawMetadata[key] !== void 0) {
@@ -836,21 +843,54 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.holder_config !== void 0) {
     cleanMetadata.holder_config = rawMetadata.holder_config;
   }
+  const virtualPrice = toMoneyString(
+    ((_a = rawMetadata.selected_settlement_snapshot) == null ? void 0 : _a.price) ?? submitProduct.selling_price
+  );
+  if (formatOptions.virtualSettlementMode) {
+    Object.assign(cleanMetadata, {
+      source_product_price: virtualPrice,
+      main_product_original_price: virtualPrice,
+      main_product_selling_price: virtualPrice,
+      main_product_attached_bundle_selling_price: virtualPrice,
+      main_product_attached_bundle_payment_price: virtualPrice,
+      main_product_attached_bundle_surcharge_fee: "0.00",
+      main_product_attached_bundle_tax_fee: "0.00",
+      surcharge_rounding_remainder: "0.00",
+      tax_fee_rounding_remainder: "0.00",
+      relation_surcharge_ids: [],
+      average_discount_amount_rate: "1",
+      product_discount_difference: "",
+      discountable_flag: 0,
+      price_schema_version: 2
+    });
+  }
   const productSku = {
     ...submitProduct.product_sku && typeof submitProduct.product_sku === "object" ? submitProduct.product_sku : {},
-    option: formatSubmitOptionItems((_a = submitProduct.product_sku) == null ? void 0 : _a.option)
+    option: formatSubmitOptionItems(
+      (_b = submitProduct.product_sku) == null ? void 0 : _b.option,
+      formatOptions
+    )
   };
   return {
     ...productRest,
+    ...formatOptions.virtualSettlementMode ? {
+      selling_price: virtualPrice,
+      original_price: virtualPrice,
+      is_charge_tax: 0
+    } : {},
     ...bookingUid ? { booking_uid: bookingUid } : {},
+    ...bundleEdit !== void 0 ? { bundle_edit: bundleEdit } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: collectSubmitProductDiscountList(submitProduct),
-    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
+    discount_list: formatOptions.virtualSettlementMode ? [] : collectSubmitProductDiscountList(submitProduct),
+    product_bundle: formatSubmitBundleItems(
+      submitProduct.product_bundle,
+      formatOptions
+    ),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
     // 由整单折扣均摊层产出；缺省（无折扣）时与 selling_price 同义。
-    payment_price: submitProduct.payment_price ?? submitProduct.selling_price
+    payment_price: formatOptions.virtualSettlementMode ? virtualPrice : submitProduct.payment_price ?? submitProduct.selling_price
   };
 }
 var SUBMIT_BOOKING_METADATA_WHITELIST = [
@@ -953,7 +993,7 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
-  var _a;
+  var _a, _b, _c;
   const {
     tempOrder,
     cacheId,
@@ -967,6 +1007,7 @@ function buildSubmitPayload(params) {
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const bookingUuid = (0, import_orderCollectionIdentity.createUuidV4)();
+  const virtualSettlementMode = ((_b = (_a = tempOrder.metadata) == null ? void 0 : _a.currency_settlement_config) == null ? void 0 : _b.settlement_type) === "virtual_currency";
   const {
     _extend,
     relation_id: _relationId,
@@ -990,7 +1031,7 @@ function buildSubmitPayload(params) {
   } = tempOrder;
   let submitType = type ?? tempOrder.type;
   if (!submitType) {
-    if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
+    if ((_c = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _c.length) {
       submitType = "appointment_booking";
     } else {
       submitType = "virtual";
@@ -1038,12 +1079,15 @@ function buildSubmitPayload(params) {
       const {
         collect_pax: _collectPax,
         table_occupancy_duration: _tableOccupancyDuration,
+        cart_settlement_key: _cartSettlementKey,
+        cart_settlement_snapshot: _cartSettlementSnapshot,
+        legal_currency_snapshot: _legalCurrencySnapshot,
         ...rest
       } = tempOrder.metadata || {};
       return { ...rest };
     })(),
     products: (tempOrder.products || []).map(
-      (product) => normalizeSubmitProduct(product)
+      (product) => normalizeSubmitProduct(product, { virtualSettlementMode })
     )
   };
   if (!enhance)

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

@@ -486,6 +486,8 @@ export interface WalletPassPayment {
     importWalletAssetsSnapshot: (snapshot: WalletAssetsSnapshot) => WalletAssetsState;
     /** 设置单张钱包资产的选择状态并重新计算其实际抵扣额。 */
     selectWalletAsset: (assetId: WalletAssetId, options: SelectWalletAssetOptions) => WalletAssetsState;
+    /** 更新已选钱包资产的手动使用金额，并保持原有选择顺序重新计算。 */
+    updateWalletAssetAmount: (assetId: WalletAssetId, amount: number) => WalletAssetsState;
     /** 精确搜索钱包资产；仅当前券可用时自动选择。 */
     scanWalletAssetAsync: (code: string) => Promise<ScanWalletAssetResult>;
     /** 清空未确认的钱包资产选择。 */

package/lib/modules/Payment/utils.js

@@ -34,7 +34,11 @@ var formatWalletPassList2PreparePayments = (list) => {
   const formatted = (list || []).map((item) => {
     return {
       voucher_id: item.id || 0,
-      amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
+      // 前端策略重算后的 actualDeduction 才是最终可同步金额；
+      // edit_current_amount 只是用户请求值，仍可能被策略和订单剩余金额裁剪。
+      amount: Number(
+        item.actualDeduction ?? 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 || void 0

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

@@ -24,6 +24,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private emitEvent;
     private publishWalletAssetsState;
     private recalculateWalletAssets;
+    /**
+     * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
+     * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
+     */
+    private formatSearchedWalletPaymentAssets;
     /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
     private getSearchedWalletAssetCodes;
     /**
@@ -106,7 +111,13 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     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;

package/lib/modules/Payment/walletpass.js

@@ -52,6 +52,25 @@ function normalizeWalletAssetCode(code) {
 function getWalletAssetCodeKeys(asset) {
   return [asset == null ? void 0 : asset.code, asset == null ? void 0 : asset.encoded].map(normalizeWalletAssetCode).filter(Boolean);
 }
+function withWalletAssetRecalculationBaseAmount(asset) {
+  const existingBaseAmount = Number(
+    asset == null ? void 0 : asset._wallet_asset_recalculation_base_amount
+  );
+  if (Number.isFinite(existingBaseAmount) && existingBaseAmount >= 0) {
+    return asset;
+  }
+  if (!["product_voucher", "gift_card"].includes(asset == null ? void 0 : asset.tag)) {
+    return asset;
+  }
+  const balanceParValue = Number(asset == null ? void 0 : asset.balance_par_value);
+  if (!Number.isFinite(balanceParValue) || balanceParValue < 0) {
+    return asset;
+  }
+  return {
+    ...asset,
+    _wallet_asset_recalculation_base_amount: balanceParValue
+  };
+}
 function isWalletAssetAvailable(asset) {
   if (!asset)
     return false;
@@ -90,6 +109,16 @@ function mergeWalletAssets(...groups) {
   });
   return merged;
 }
+function orderWalletAssetsByIds(assets, orderedIds) {
+  const assetByKey = new Map(
+    assets.map((asset) => [getWalletAssetKey(asset), asset])
+  );
+  const orderedKeys = new Set(orderedIds.map((id) => String(id)));
+  return [
+    ...orderedIds.map((id) => assetByKey.get(String(id))).filter((asset) => asset !== void 0),
+    ...assets.filter((asset) => !orderedKeys.has(getWalletAssetKey(asset)))
+  ];
+}
 function createInitialWalletAssetsState() {
   return {
     status: "idle",
@@ -222,6 +251,42 @@ var WalletPassPaymentImpl = class {
       error: null
     });
   }
+  /**
+   * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
+   * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
+   */
+  formatSearchedWalletPaymentAssets(assets) {
+    var _a, _b, _c, _d;
+    if (!assets.length)
+      return assets;
+    const assetsWithRecalculationBase = assets.map(
+      withWalletAssetRecalculationBaseAmount
+    );
+    const evaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
+    if (!(evaluator == null ? void 0 : evaluator.searchVoucherFormat))
+      return assetsWithRecalculationBase;
+    const hasCalculationProducts = this.walletAssetsCalculationContext.products.length > 0;
+    const products = hasCalculationProducts ? this.walletAssetsCalculationContext.products : ((_c = this.walletParams) == null ? void 0 : _c.products) || [];
+    const orderTotalAmount = Number(
+      hasCalculationProducts ? this.walletAssetsCalculationContext.orderTotalAmount : ((_d = this.walletParams) == null ? void 0 : _d.order_wait_pay_amount) || 0
+    );
+    try {
+      const formattedAssets = evaluator.searchVoucherFormat({
+        orderTotalAmount,
+        products,
+        vouchers: assetsWithRecalculationBase
+      });
+      return formattedAssets;
+    } catch (error) {
+      this.paymentModule.logWarning(
+        "[WalletPass] 搜索资产策略格式化失败，保留接口结果",
+        {
+          error: error instanceof Error ? error.message : String(error)
+        }
+      );
+      return assetsWithRecalculationBase;
+    }
+  }
   /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
   getSearchedWalletAssetCodes() {
     const cachedAssets = this.searchResults.filter(isWalletPaymentAsset);
@@ -245,11 +310,23 @@ var WalletPassPaymentImpl = class {
     );
     if (searchedCodeKeys.size === 0)
       return cachedAssets;
+    const cachedAssetByCode = /* @__PURE__ */ new Map();
+    cachedAssets.forEach((item) => {
+      getWalletAssetCodeKeys(item).forEach((code) => {
+        cachedAssetByCode.set(code, item);
+      });
+    });
     const refreshedAssets = refreshedCandidates.filter(
       (item) => isWalletPaymentAsset(item) && searchedCodeKeys.has(
         String((item == null ? void 0 : item.code) || "").trim().toUpperCase()
       )
-    );
+    ).map((item) => {
+      const cachedAsset = getWalletAssetCodeKeys(item).map((code) => cachedAssetByCode.get(code)).find(Boolean);
+      return withWalletAssetRecalculationBaseAmount({
+        ...cachedAsset,
+        ...item
+      });
+    });
     if (refreshedAssets.length > 0) {
       const replacedCodes = new Set(
         refreshedAssets.map(
@@ -321,6 +398,10 @@ var WalletPassPaymentImpl = class {
       payment_order_id
     };
     this.walletParams = walletParams;
+    this.walletAssetsCalculationContext = {
+      orderTotalAmount: Number(walletParams.order_wait_pay_amount || 0),
+      products: Array.isArray(walletParams.products) ? walletParams.products : []
+    };
     this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
       customer_id: walletParams.customer_id,
       holder_id: walletParams.holder_id,
@@ -472,7 +553,6 @@ var WalletPassPaymentImpl = class {
         vouchers: allList
       });
       const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
-      console.log(res, "resres12");
       this.walletRecommendList = recommended;
       this.walletInitData = {
         transformList,
@@ -535,8 +615,12 @@ var WalletPassPaymentImpl = class {
     const customerWalletPassList = Array.isArray(
       responseData == null ? void 0 : responseData.customer_wallet_pass_list
     ) ? responseData.customer_wallet_pass_list : [];
-    const allList = mergeWalletAssets(
+    const orderedRecalculateList = orderWalletAssetsByIds(
       recalculateList,
+      selectedIds
+    );
+    const allList = mergeWalletAssets(
+      orderedRecalculateList,
       customerWalletPassList
     );
     const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
@@ -552,7 +636,7 @@ var WalletPassPaymentImpl = class {
       )
     };
     const returnedSelectedKeys = new Set(
-      recalculateList.filter(isWalletAssetAvailable).map((item) => getWalletAssetKey(item))
+      allList.map((item) => getWalletAssetKey(item))
     );
     const authoritativeSelectedIds = selectedIds.filter(
       (id) => returnedSelectedKeys.has(String(id))
@@ -830,6 +914,17 @@ var WalletPassPaymentImpl = class {
       const assetId = getWalletAssetId(asset);
       return assetId !== void 0 && assetId !== null && selectionSources[String(assetId)] === "scan";
     }) : [];
+    const manualEditAmountByKey = /* @__PURE__ */ new Map();
+    if (preserveSelection) {
+      this.walletAssetsState.selectedItems.forEach((asset) => {
+        if (typeof (asset == null ? void 0 : asset.edit_current_amount) !== "number")
+          return;
+        manualEditAmountByKey.set(
+          getWalletAssetKey(asset),
+          asset.edit_current_amount
+        );
+      });
+    }
     if (!((_a = businessData.products) == null ? void 0 : _a.length)) {
       this.queuePendingAutoSelectForAssets(scanSelectedAssets);
       this.generateWalletParams(businessData);
@@ -928,12 +1023,16 @@ var WalletPassPaymentImpl = class {
         searchedWalletAssets,
         result.transformList || [],
         result.noApplicableVoucher || []
-      ).map((asset) => ({
-        ...asset,
-        _wallet_asset_recommended: recommendedKeys.has(
-          getWalletAssetKey(asset)
-        )
-      }));
+      ).map((asset) => {
+        const assetKey = getWalletAssetKey(asset);
+        return {
+          ...asset,
+          ...manualEditAmountByKey.has(assetKey) ? {
+            edit_current_amount: manualEditAmountByKey.get(assetKey)
+          } : {},
+          _wallet_asset_recommended: recommendedKeys.has(assetKey)
+        };
+      });
       const latestSelectedIds = preserveSelection ? authoritativeSelectedIds : [];
       const latestSelectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
       const pendingAutoSelectAssets = this.walletAssetsBehavior.autoSelectAfterSearch ? items.filter(
@@ -1047,6 +1146,13 @@ var WalletPassPaymentImpl = class {
       selectionSources: snapshot.state.selectionSources || {}
     });
   }
+  updateWalletAssetEditAmountInCaches(assetKey, amount) {
+    const updateAsset = (asset) => getWalletAssetKey(asset) === assetKey ? { ...asset, edit_current_amount: amount } : asset;
+    this.searchResults = this.searchResults.map(
+      updateAsset
+    );
+    return this.walletAssetsState.items.map(updateAsset);
+  }
   selectWalletAsset(assetId, options) {
     const assetKey = String(assetId);
     const asset = this.walletAssetsState.items.find(
@@ -1062,6 +1168,7 @@ var WalletPassPaymentImpl = class {
     );
     const selectionSources = { ...this.walletAssetsState.selectionSources };
     delete selectionSources[assetKey];
+    let nextItems = this.walletAssetsState.items;
     if (options.selected) {
       if (!asset || !isWalletAssetAvailable(asset)) {
         return this.getWalletAssetsState();
@@ -1070,9 +1177,13 @@ var WalletPassPaymentImpl = class {
       selectionSources[assetKey] = options.source || "manual";
     } else if (asset) {
       this.clearPendingAutoSelectForAsset(asset);
+      nextItems = this.updateWalletAssetEditAmountInCaches(
+        assetKey,
+        void 0
+      );
     }
     const nextState = this.recalculateWalletAssets(
-      this.walletAssetsState.items,
+      nextItems,
       selectedIds,
       selectionSources
     );
@@ -1081,6 +1192,54 @@ var WalletPassPaymentImpl = class {
     }
     return nextState;
   }
+  /**
+   * 更新已选资产的手动金额。只允许在当前实际抵扣额内向下调整，
+   * 金额为 0 时沿用 legacy 行为取消选择。
+   */
+  updateWalletAssetAmount(assetId, amount) {
+    const assetKey = String(assetId);
+    const committedKeys = new Set(
+      this.walletAssetsState.committedIds.map((id) => String(id))
+    );
+    const selectedKeys = new Set(
+      this.walletAssetsState.selectedIds.map((id) => String(id))
+    );
+    const asset = this.walletAssetsState.items.find(
+      (item) => getWalletAssetKey(item) === assetKey
+    );
+    const requestedAmount = Number(amount);
+    if (!asset || committedKeys.has(assetKey) || !selectedKeys.has(assetKey) || !Number.isFinite(requestedAmount) || requestedAmount < 0) {
+      return this.getWalletAssetsState();
+    }
+    const selectedIds = [...this.walletAssetsState.selectedIds];
+    const selectionSources = { ...this.walletAssetsState.selectionSources };
+    if (requestedAmount === 0) {
+      const nextItems2 = this.updateWalletAssetEditAmountInCaches(
+        assetKey,
+        void 0
+      );
+      delete selectionSources[assetKey];
+      this.clearPendingAutoSelectForAsset(asset);
+      return this.recalculateWalletAssets(
+        nextItems2,
+        selectedIds.filter((id) => String(id) !== assetKey),
+        selectionSources
+      );
+    }
+    const currentDeductionAmount = getWalletAssetDeductionAmount(asset);
+    const editAmount = Math.min(requestedAmount, currentDeductionAmount);
+    if (editAmount <= 0)
+      return this.getWalletAssetsState();
+    const nextItems = this.updateWalletAssetEditAmountInCaches(
+      assetKey,
+      editAmount
+    );
+    return this.recalculateWalletAssets(
+      nextItems,
+      selectedIds,
+      selectionSources
+    );
+  }
   async scanWalletAssetAsync(code) {
     const normalizedCode = String(code || "").trim();
     if (!normalizedCode) {
@@ -1109,7 +1268,15 @@ var WalletPassPaymentImpl = class {
         this.walletAssetsState.selectedItems
       )
     });
-    const paymentAssets = result.data.filter(isWalletPaymentAsset);
+    const paymentAssets = this.formatSearchedWalletPaymentAssets(
+      result.data.filter(isWalletPaymentAsset)
+    );
+    if (paymentAssets.length > 0) {
+      this.searchResults = mergeWalletAssets(
+        this.searchResults,
+        paymentAssets
+      );
+    }
     const asset = paymentAssets.find(
       (item) => String((item == null ? void 0 : item.code) || "") === normalizedCode
     ) || paymentAssets[0];
@@ -1128,30 +1295,44 @@ var WalletPassPaymentImpl = class {
       this.walletAssetsState.selectionSources
     );
     const assetId = getWalletAssetId(asset);
-    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
+    const recalculatedAsset = assetId === void 0 ? void 0 : recalculatedState.items.find(
+      (item) => getWalletAssetKey(item) === String(assetId)
+    );
+    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(recalculatedAsset) ? this.selectWalletAsset(assetId, {
       selected: true,
       source: "scan"
     }) : recalculatedState;
     const isSelected = assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId));
+    const selectedStateAsset = assetId === void 0 ? void 0 : selected.items.find(
+      (item) => getWalletAssetKey(item) === String(assetId)
+    );
+    const resolvedAsset = selectedStateAsset || recalculatedAsset || asset;
     if (isSelected) {
-      this.clearPendingAutoSelectForAsset(asset);
+      this.clearPendingAutoSelectForAsset(resolvedAsset);
     } else if (this.walletAssetsBehavior.autoSelectAfterSearch) {
       this.pendingAutoSelectSearchCodes.add(
         normalizeWalletAssetCode(normalizedCode)
       );
-      this.queuePendingAutoSelectForAssets([asset]);
+      this.queuePendingAutoSelectForAssets([resolvedAsset]);
     }
     return {
       type: result.type,
-      asset,
+      asset: resolvedAsset,
       selected: isSelected,
       state: selected
     };
   }
   clearWalletAssetSelection() {
     this.pendingAutoSelectSearchCodes.clear();
+    const selectedKeys = new Set(
+      this.walletAssetsState.selectedIds.map((id) => String(id))
+    );
+    const clearSelectedEditAmount = (asset) => selectedKeys.has(getWalletAssetKey(asset)) ? { ...asset, edit_current_amount: void 0 } : asset;
+    this.searchResults = this.searchResults.map(
+      clearSelectedEditAmount
+    );
     return this.recalculateWalletAssets(
-      this.walletAssetsState.items,
+      this.walletAssetsState.items.map(clearSelectedEditAmount),
       [],
       {}
     );

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

@@ -23,12 +23,25 @@ export interface ProductDataVariant {
     module_data_id: number;
     /** 关联 data_variant_rule.id */
     data_variant_rule_id: number;
+    /** 多货币结算等业务类型 */
+    business_type?: 'multi_currency_settlement' | string;
+    /** 数据状态；多货币结算仅处理 enable 记录 */
+    status?: 'enable' | 'disable' | string;
     /** 命中策略后覆盖到商品上的字段 */
     data: Record<string, any>;
     created_at: string | null;
     updated_at: string | null;
     deleted_at: string | null;
 }
+export interface ProductSettlementOption extends Record<string, any> {
+    settlement_type: 'legal_currency' | 'virtual_currency' | string;
+    currency_product_id?: number;
+    price: string;
+    data_variant_id?: number;
+    data_variant_rule_id: number | string;
+    available: boolean;
+    disabled_reason?: string;
+}
 /**
  * 商品基本信息接口
  */
@@ -61,6 +74,8 @@ export interface ProductData {
     sum_stock: number;
     /** 商品价格 */
     price: string;
+    /** 当前上下文解析出的可选结算货币 */
+    available_settlement_options?: ProductSettlementOption[];
     /** 商品原价 */
     original_price: string;
     /** 商品成本价 */
@@ -237,6 +252,14 @@ export interface ProductData {
     option_group_count: number;
     /** 智能定价变体列表，/product/query with dataVariants 返回 */
     data_variants?: ProductDataVariant[];
+    /**
+     * 商品接口规则计算结果；data_variant_ids 按优先级从高到低排列。
+     * 空数组表示规则已经计算完成但没有命中 Data Variant。
+     */
+    metadata?: {
+        data_variant_ids?: Array<number | string>;
+        [key: string]: any;
+    };
     /** 服务时长 */
     service_times?: any;
 }