@pisell/pisellos 2.2.276 → 2.2.278

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 6 | 4 | 5;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -445,19 +445,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/core/index.js

@@ -50,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/model/strategy/adapter/walletPass/evaluator.js

@@ -214,7 +214,6 @@ var WalletPassEvaluator = class {
         }
         const rawText = this.getText(reasonCode);
         const currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_g = (_f = this.otherParams) == null ? void 0 : _f.getData) == null ? void 0 : _g.call(_f, "shop_symbol")) || "" : "";
-        console.log(currency, "currency12345");
         const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue, currency) : rawText;
         results.push({
           voucher,
@@ -416,7 +415,6 @@ var WalletPassEvaluator = class {
    * 计算适用商品的总金额和数量
    */
   calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-    console.log(products, "products1234");
     let total = 0;
     let count = 0;
     if (applicableProductIds !== null && applicableProductIds.length === 0) {

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -26,6 +26,11 @@ export interface Voucher {
     recommended_usage_amount: number;
     /** 后端计算推荐使用金额（仅商品） 不包含税费附加费 */
     recommended_pure_product_usage_amount: number;
+    /**
+     * 扫码资产自身可供前端重新计算的金额基准。
+     * 后端 recommended_usage_amount 会包含当前已选券上下文，取消勾选后不能继续把它当作资产永久上限。
+     */
+    _wallet_asset_recalculation_base_amount?: number;
     /** 实际抵扣金额 */
     actualDeduction: number;
     /** 抵扣详情 */

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -43,6 +43,21 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
+var DEFAULT_WALLET_PASS_CALCULATION_CONFIG = {
+  maxDeductionAmount: 99999,
+  maxUsagePerOrder: 0,
+  allowCrossProduct: true,
+  applicableProductLimit: 0,
+  deductTaxAndFee: true,
+  maxPassesPerItem: 0,
+  deductOptionPrice: false
+};
+function getWalletPassCalculationConfig(voucher) {
+  return {
+    ...DEFAULT_WALLET_PASS_CALCULATION_CONFIG,
+    ...(voucher == null ? void 0 : voucher.config) || {}
+  };
+}
 var getProductQuantity = (product) => {
   return product.quantity || product.product_quantity || 1;
 };
@@ -105,9 +120,15 @@ function applyMaxPassUsageIncrements(usageMap, walletPassProductId, maxPassesPer
   });
 }
 var getRecommendedAmount = (voucher) => {
-  console.log("voucher312", voucher);
   const { config, recommended_usage_amount, recommended_pure_product_usage_amount } = voucher;
   const deductTaxAndFee = (config == null ? void 0 : config.deductTaxAndFee) ?? true;
+  const rawRecalculationBaseAmount = voucher._wallet_asset_recalculation_base_amount;
+  if (rawRecalculationBaseAmount !== void 0 && rawRecalculationBaseAmount !== null) {
+    const recalculationBaseAmount = Number(rawRecalculationBaseAmount);
+    if (Number.isFinite(recalculationBaseAmount) && recalculationBaseAmount >= 0) {
+      return recalculationBaseAmount;
+    }
+  }
   return deductTaxAndFee ? recommended_usage_amount : recommended_pure_product_usage_amount ?? recommended_usage_amount;
 };
 var getApplicableProductIds = (voucher) => {
@@ -145,7 +166,6 @@ var getApplicableProducts = (voucher, productsData) => {
   return productsData.filter((p) => applicableProductIds.includes(p.product_id));
 };
 function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, "products123");
   const productsCopy = expandProductsWithBundleItems(products, true);
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const getItemPassUsage = (usageMap, walletPassProductId, lineKey) => {
@@ -218,7 +238,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     return import_decimal.default.min(baseAmount, finalApplicableAmount, remainingOrderAmount);
   };
   const isVoucherAvailable = (voucher, productsData, usedVoucherCounts2, itemPassUsage) => {
-    const { config, id, product_id } = voucher;
+    const { config, product_id } = voucher;
     const recommendedAmount = getRecommendedAmount(voucher);
     if (recommendedAmount <= 0) {
       return { isAvailable: false, reasonCode: "not_meet_the_required_conditions" };
@@ -453,6 +473,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
   const productsForCalc = expandProductsWithBundleItems(products, true);
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const selectedWithDetails = [];
+  const usedVoucherCounts = /* @__PURE__ */ new Map();
   const itemPassUsageMap = /* @__PURE__ */ new Map();
   const getItemPassUsageRecalc = (walletPassProductId, lineKey) => {
     var _a;
@@ -469,8 +490,29 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     });
   };
   selectedVouchers.forEach((selectedVoucher) => {
-    const { config, id } = selectedVoucher;
-    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit, deductTaxAndFee = true, maxPassesPerItem = 0 } = config;
+    const { product_id } = selectedVoucher;
+    const config = getWalletPassCalculationConfig(selectedVoucher);
+    const {
+      maxDeductionAmount,
+      maxUsagePerOrder,
+      allowCrossProduct,
+      applicableProductLimit,
+      deductTaxAndFee,
+      maxPassesPerItem
+    } = config;
+    const usedCount = usedVoucherCounts.get(product_id) || 0;
+    if (maxUsagePerOrder > 0 && usedCount >= maxUsagePerOrder) {
+      selectedWithDetails.push({
+        ...selectedVoucher,
+        config,
+        actualDeduction: 0,
+        deductionDetails: [],
+        _available_max_amount: 0,
+        _unified_available_status: 0,
+        reasonCode: "usage_limit_reached"
+      });
+      return;
+    }
     const unitPriceField = deductTaxAndFee ? "unitPriceWithTax" : "unitPricePure";
     const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     let applicableProducts = getApplicableProducts(
@@ -481,6 +523,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     if (applicableProducts.length === 0) {
       selectedWithDetails.push({
         ...selectedVoucher,
+        config,
         actualDeduction: 0,
         deductionDetails: [],
         _available_max_amount: 0,
@@ -558,6 +601,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     applyMaxPassUsageIncrements(itemPassUsageMap, selectedVoucher.product_id, maxPassesPerItem, deductionDetails);
     selectedWithDetails.push({
       ...selectedVoucher,
+      config,
       actualDeduction: totalDeducted.toNumber(),
       // 转换为数字
       deductionDetails,
@@ -565,12 +609,11 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       // 转换为数字
       _unified_available_status: totalDeducted.greaterThan(0) ? 1 : 0
     });
+    if (totalDeducted.greaterThan(0)) {
+      usedVoucherCounts.set(product_id, usedCount + 1);
+    }
   });
   const selectedIds = new Set(selectedVouchers.map((v) => v.id));
-  const usedVoucherCounts = /* @__PURE__ */ new Map();
-  selectedVouchers.forEach((v) => {
-    usedVoucherCounts.set(v.product_id, (usedVoucherCounts.get(v.product_id) || 0) + 1);
-  });
   const allWithUpdatedStatus = allVouchers.map((voucher) => {
     if (selectedIds.has(voucher.id)) {
       const selectedDetail = selectedWithDetails.find(
@@ -578,8 +621,15 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       );
       return selectedDetail || voucher;
     }
-    const { config, id, product_id } = voucher;
-    const { maxDeductionAmount, allowCrossProduct, applicableProductLimit, deductTaxAndFee = true, maxPassesPerItem = 0 } = config;
+    const { product_id } = voucher;
+    const config = getWalletPassCalculationConfig(voucher);
+    const {
+      maxDeductionAmount,
+      allowCrossProduct,
+      applicableProductLimit,
+      deductTaxAndFee,
+      maxPassesPerItem
+    } = config;
     const unitPriceField = deductTaxAndFee ? "unitPriceWithTax" : "unitPricePure";
     const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     const recommendedAmount = getRecommendedAmount(voucher);
@@ -663,6 +713,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     }
     return {
       ...voucher,
+      config,
       _available_max_amount: calculatedMaxAmount.toNumber(),
       // 转换为数字
       _unified_available_status: isAvailable ? 1 : 0,

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))
@@ -818,6 +902,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);
@@ -916,12 +1011,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(
@@ -1035,6 +1134,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(
@@ -1050,6 +1156,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();
@@ -1058,9 +1165,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
     );
@@ -1069,6 +1180,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) {
@@ -1097,7 +1256,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];
@@ -1116,30 +1283,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/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

@@ -355,6 +355,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         selected: boolean;
         source?: WalletAssetSelectionSource;
     }): Promise<WalletAssetsState>;
+    /** 更新已选钱包资产的手动使用金额，并同步 pending payment。 */
+    updateWalletAssetAmount(params: {
+        assetId: WalletAssetId;
+        amount: number;
+    }): Promise<WalletAssetsState>;
     /** 扫码精确查券；仅可用资产会被自动选中。 */
     scanWalletAsset(code: string): Promise<ScanWalletAssetResult>;
     /** 清空全部未确认钱包选择，已支付钱包项由 Order 模块继续保留。 */