@pisell/private-materials 6.6.9 → 6.6.10

package/es/components/checkout/hooks/useWalletPass.js

@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState, useEffect, useMemo, useRef } from 'react';
-import { useMemoizedFn } from 'ahooks';
+import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { uniqueByKey, locales } from '@pisell/utils';
 import { useToast } from '@pisell/materials';
 import dayjs from 'dayjs';
@@ -36,21 +36,33 @@ import { useShopDiscountModule } from "../../ticketBooking/hooks/pisellos/useSho
 export var useWalletPass = function useWalletPass(props) {
   var onSelectChange = props.onSelectChange,
     customAmount = props.customAmount,
-    clientId = props.clientId;
+    clientId = props.clientId,
+    totalAmount = props.totalAmount;
   var logger = usePaymentLogger();
   var _useActiveExecute = useActiveExecute(),
     executeIfActive = _useActiveExecute.executeIfActive;
 
-  // 钱包推荐列表
+  // 钱包推荐列表（推荐选中的券）
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     walletRecommendList = _useState2[0],
     setWalletRecommendList = _useState2[1];
-  // 用户识别码列表
+  // 用户识别码列表（全部券列表，包括可用和不可用）
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     userIdentificationCodes = _useState4[0],
     setUserIdentificationCodes = _useState4[1];
+  // 可计算的券列表（transformList）
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    transformList = _useState6[0],
+    setTransformList = _useState6[1];
+  // 不适用的券列表（noApplicableVoucher）
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    noApplicableVoucher = _useState8[0],
+    setNoApplicableVoucher = _useState8[1];
+
   // 保存初始顺序的数组
   var initialOrderedDataRef = useRef([]);
 
@@ -60,31 +72,34 @@ export var useWalletPass = function useWalletPass(props) {
   // 跟踪执行过 handleConfirmEditAmount 的 data.id
   var confirmedEditAmountIdsRef = useRef([]);
 
-  // 保存setTimeout的引用，用于清理
-  var timeoutRef = useRef(null);
-
-  // 搜索用户识别码列表
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    searchIdentificationCodeList = _useState6[0],
-    setSearchIdentificationCodeList = _useState6[1];
-  var _useState7 = useState({}),
-    _useState8 = _slicedToArray(_useState7, 2),
-    orderInfo = _useState8[0],
-    setOrderInfo = _useState8[1];
-
-  // 当前选中的钱包
+  // 搜索用户识别码列表（addList）
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    selectedWallet = _useState10[0],
-    setSelectedWallet = _useState10[1];
+    searchIdentificationCodeList = _useState10[0],
+    setSearchIdentificationCodeList = _useState10[1];
+  var _useState11 = useState({}),
+    _useState12 = _slicedToArray(_useState11, 2),
+    orderInfo = _useState12[0],
+    setOrderInfo = _useState12[1];
+
+  // 当前选中的钱包（完整对象）
+  var _useState13 = useState([]),
+    _useState14 = _slicedToArray(_useState13, 2),
+    selectedWallet = _useState14[0],
+    setSelectedWallet = _useState14[1];
   var selectedWalletRef = useRef([]);
 
+  // 当前选中的券ID列表（按选中顺序）
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    selectedVoucherIds = _useState16[0],
+    setSelectedVoucherIds = _useState16[1];
+
   // 不可用的钱包数据
-  var _useState11 = useState([]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    disabledWalletData = _useState12[0],
-    setDisabledWalletData = _useState12[1];
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    disabledWalletData = _useState18[0],
+    setDisabledWalletData = _useState18[1];
 
   // 设置钱包但不设置使用默认钱包
   var notSetWalletSelectRef = useRef(false);
@@ -92,7 +107,13 @@ export var useWalletPass = function useWalletPass(props) {
   // 是否显示最佳优惠
   var showBestToastRef = useRef(false);
 
-  // 当前选中的钱包id
+  // 商品列表
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    products = _useState20[0],
+    setProducts = _useState20[1];
+
+  // 当前选中的钱包id（保留兼容性）
   var selectedWalletIds = useMemo(function () {
     return selectedWallet.map(function (item) {
       return item.id;
@@ -102,24 +123,30 @@ export var useWalletPass = function useWalletPass(props) {
   var Toast = useToast();
 
   // 加载状态
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    loading = _useState14[0],
-    setLoading = _useState14[1];
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    loading = _useState22[0],
+    setLoading = _useState22[1];
   // 错误信息
-  var _useState15 = useState(null),
-    _useState16 = _slicedToArray(_useState15, 2),
-    error = _useState16[0],
-    setError = _useState16[1];
-  var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    discountList = _useState18[0],
-    setDiscountList = _useState18[1];
+  var _useState23 = useState(null),
+    _useState24 = _slicedToArray(_useState23, 2),
+    error = _useState24[0],
+    setError = _useState24[1];
+  var _useState25 = useState([]),
+    _useState26 = _slicedToArray(_useState25, 2),
+    discountList = _useState26[0],
+    setDiscountList = _useState26[1];
 
   // 获取checkout模块
   var checkoutModule = pisellos.getModule('checkout');
   var shopDiscount = useShopDiscountModule();
   var paymentModule = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.payment;
+
+  // 获取钱包计算器
+  var walletPassEvaluator = useMemo(function () {
+    var _paymentModule$window, _paymentModule$window2;
+    return paymentModule === null || paymentModule === void 0 || (_paymentModule$window = paymentModule.window) === null || _paymentModule$window === void 0 || (_paymentModule$window2 = _paymentModule$window.getWalletPassEvaluator) === null || _paymentModule$window2 === void 0 ? void 0 : _paymentModule$window2.call(_paymentModule$window);
+  }, []);
   var setWalletSelect = useMemoizedFn(function (data) {
     setSelectedWallet(data);
     selectedWalletRef.current = data;
@@ -276,15 +303,77 @@ export var useWalletPass = function useWalletPass(props) {
     orderedResult.push.apply(orderedResult, _toConsumableArray(newItems));
     return orderedResult;
   });
+
+  // 合并计算数据源：transformList + searchIdentificationCodeList（addList）
+  var allVouchersForCalculation = useMemo(function () {
+    return [].concat(_toConsumableArray(transformList || []), _toConsumableArray(searchIdentificationCodeList || []));
+  }, [transformList, searchIdentificationCodeList]);
+
+  // 根据选中的券ID获取选中的券对象列表（保持选中顺序）
+  var selectedVouchers = useMemo(function () {
+    return selectedVoucherIds.map(function (id) {
+      return allVouchersForCalculation.find(function (v) {
+        return v.id === id;
+      });
+    }).filter(Boolean);
+  }, [selectedVoucherIds, allVouchersForCalculation]);
+
+  // 前端计算展示列表和当前券的详细信息
+  var _useMemo = useMemo(function () {
+      if (!walletPassEvaluator || !allVouchersForCalculation.length || !totalAmount) {
+        return {
+          displayVouchers: [].concat(_toConsumableArray(transformList || []), _toConsumableArray(noApplicableVoucher || [])),
+          displayOtherVouchers: searchIdentificationCodeList || [],
+          selectedWithDetails: [],
+          totalDeduction: 0
+        };
+      }
+
+      // 有选中的券，重新计算（基于 transformList + searchIdentificationCodeList）
+      var result = walletPassEvaluator.recalculateVouchers(allVouchersForCalculation, selectedVouchers, totalAmount, products || []);
+
+      // 分离当前客户的券和其他客户的券（搜索添加的券）
+      var currentCustomerVouchers = [];
+      var otherCustomerVouchers = [];
+      result.allWithUpdatedStatus.forEach(function (voucher) {
+        // 判断是否是搜索添加的券
+        var isSearchVoucher = searchIdentificationCodeList.some(function (item) {
+          return item.id === voucher.id;
+        });
+        if (isSearchVoucher) {
+          otherCustomerVouchers.push(voucher);
+        } else {
+          currentCustomerVouchers.push(voucher);
+        }
+      });
+      return {
+        displayVouchers: [].concat(currentCustomerVouchers, _toConsumableArray(noApplicableVoucher || [])),
+        displayOtherVouchers: otherCustomerVouchers,
+        selectedWithDetails: result.selectedWithDetails,
+        totalDeduction: result.selectedWithDetails.reduce(function (sum, v) {
+          return sum + (v.actualDeduction || 0);
+        }, 0)
+      };
+    }, [selectedVouchers, allVouchersForCalculation, transformList, searchIdentificationCodeList, noApplicableVoucher, totalAmount, products]),
+    displayVouchers = _useMemo.displayVouchers,
+    displayOtherVouchers = _useMemo.displayOtherVouchers,
+    selectedWithDetails = _useMemo.selectedWithDetails,
+    totalDeduction = _useMemo.totalDeduction;
+
+  // 监听 selectedWithDetails 变化，自动通知外部
+  useUpdateEffect(function () {
+    notifySelectChange(selectedWithDetails);
+    setLoading(false);
+  }, [selectedWithDetails]);
   var data = useMemo(function () {
-    // 使用初始顺序作为基础，保持原有顺序
-    return formatMachineCodeServer2CardList(uniqueByKey(mergeDataWithInitialOrder([].concat(_toConsumableArray(selectedWallet), _toConsumableArray(userIdentificationCodes))), 'id'), selectedWalletIds);
-  }, [userIdentificationCodes, selectedWalletIds, selectedWallet]);
+    // 使用前端计算后的数据
+    return formatMachineCodeServer2CardList(uniqueByKey(mergeDataWithInitialOrder([].concat(_toConsumableArray(selectedWallet), _toConsumableArray(displayVouchers), _toConsumableArray(displayOtherVouchers))), 'id'), selectedVoucherIds);
+  }, [displayVouchers, displayOtherVouchers, selectedVoucherIds, selectedWallet]);
 
-  // 获取钱包推荐列表
-  var fetchWalletRecommendList = useMemoizedFn( /*#__PURE__*/function () {
+  // 获取用户识别码列表
+  var fetchUserIdentificationCodes = useMemoizedFn( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var result;
+      var result, newData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -292,66 +381,31 @@ export var useWalletPass = function useWalletPass(props) {
             setError(null);
             _context.prev = 2;
             _context.next = 5;
-            return paymentModule.wallet.getWalletPassRecommendListAsync(params);
+            return paymentModule.wallet.getUserIdentificationCodeListAsync(params);
           case 5:
             result = _context.sent;
-            setWalletRecommendList(result);
+            newData = uniqueByKey([].concat(_toConsumableArray(result), _toConsumableArray(selectedWalletRef.current)), 'id'); // const orderedData = mergeDataWithInitialOrder(newData);
+            setUserIdentificationCodes(newData);
             return _context.abrupt("return", result);
-          case 10:
-            _context.prev = 10;
+          case 11:
+            _context.prev = 11;
             _context.t0 = _context["catch"](2);
-            setError(_context.t0 instanceof Error ? _context.t0.message : '获取钱包推荐列表失败');
+            setError(_context.t0 instanceof Error ? _context.t0.message : '获取用户识别码列表失败');
             throw _context.t0;
-          case 14:
-            _context.prev = 14;
+          case 15:
+            _context.prev = 15;
             setLoading(false);
-            return _context.finish(14);
-          case 17:
+            return _context.finish(15);
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 10, 14, 17]]);
+      }, _callee, null, [[2, 11, 15, 18]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);
     };
   }());
-  // 获取用户识别码列表
-  var fetchUserIdentificationCodes = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-      var result, newData;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            setLoading(true);
-            setError(null);
-            _context2.prev = 2;
-            _context2.next = 5;
-            return paymentModule.wallet.getUserIdentificationCodeListAsync(params);
-          case 5:
-            result = _context2.sent;
-            newData = uniqueByKey([].concat(_toConsumableArray(result), _toConsumableArray(selectedWalletRef.current)), 'id'); // const orderedData = mergeDataWithInitialOrder(newData);
-            setUserIdentificationCodes(newData);
-            return _context2.abrupt("return", result);
-          case 11:
-            _context2.prev = 11;
-            _context2.t0 = _context2["catch"](2);
-            setError(_context2.t0 instanceof Error ? _context2.t0.message : '获取用户识别码列表失败');
-            throw _context2.t0;
-          case 15:
-            _context2.prev = 15;
-            setLoading(false);
-            return _context2.finish(15);
-          case 18:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[2, 11, 15, 18]]);
-    }));
-    return function (_x2) {
-      return _ref2.apply(this, arguments);
-    };
-  }());
 
   // 获取缓存数据
   var getCachedWalletRecommendList = useMemoizedFn(function () {
@@ -383,10 +437,32 @@ export var useWalletPass = function useWalletPass(props) {
   var handleSearchIdentificationCodeCompleted = useMemoizedFn(function (data) {
     var currentSearchResults = data.currentSearchResults,
       cachedSearchResults = data.cachedSearchResults;
+    // 使用 walletPassEvaluator.searchVoucherFormat 格式化搜索结果
+    var formattedResults = currentSearchResults;
+    if (walletPassEvaluator && currentSearchResults.length > 0 && totalAmount) {
+      formattedResults = walletPassEvaluator.searchVoucherFormat({
+        vouchers: currentSearchResults,
+        orderTotalAmount: totalAmount,
+        products: products || []
+      });
+    }
+
+    // 格式化缓存的搜索结果（如果存在）
+    var formattedCachedResults = cachedSearchResults || [];
+    if (walletPassEvaluator && cachedSearchResults && cachedSearchResults.length > 0 && totalAmount) {
+      formattedCachedResults = walletPassEvaluator.searchVoucherFormat({
+        vouchers: cachedSearchResults,
+        orderTotalAmount: totalAmount,
+        products: products || []
+      });
+    }
+
+    // 合并缓存的搜索结果和当前搜索结果，并去重
+    var mergedSearchResults = uniqueByKey([].concat(_toConsumableArray(formattedCachedResults || []), _toConsumableArray(formattedResults)), 'id');
     var isAvailableData = [];
     var isDisabledData = [];
-    if (currentSearchResults.length > 0) {
-      currentSearchResults.forEach(function (item) {
+    if (formattedResults.length > 0) {
+      formattedResults.forEach(function (item) {
         if (!!item.unified_available_status) {
           isAvailableData.push(item);
         } else {
@@ -395,34 +471,66 @@ export var useWalletPass = function useWalletPass(props) {
       });
     }
 
-    // 更新不可用钱包数据
-    setDisabledWalletData(isDisabledData);
+    // 更新不可用钱包数据（需要包含所有搜索结果中的不可用数据）
+    var allDisabledData = mergedSearchResults.filter(function (item) {
+      return !item.unified_available_status;
+    });
+    setDisabledWalletData(allDisabledData);
+
+    // 如果只有一个可用券，自动选中
     var newValues = _toConsumableArray(selectedWalletRef.current);
     if (isAvailableData.length === 1) {
       newValues = [].concat(_toConsumableArray(selectedWalletRef.current), isAvailableData);
     }
-    setSearchIdentificationCodeList(cachedSearchResults);
+
+    // 更新搜索结果列表（合并缓存和当前搜索结果，使用去重后的数据）
+    setSearchIdentificationCodeList(mergedSearchResults);
     setWalletSelect(newValues);
-    handleFetchUserIdentificationCodes(newValues.map(function (item) {
+
+    // 更新选中的券ID列表（会触发 useMemo 重新计算 selectedWithDetails）
+    setSelectedVoucherIds(newValues.map(function (item) {
       return item.id;
     }));
+
+    // useUpdateEffect 会自动在 selectedWithDetails 更新后通知外部
   });
   var onOrderCreated = useMemoizedFn(function () {
+    var _paymentModule$wallet, _paymentModule$wallet2;
     var orderInfo = checkoutModule.getOrderOriginalData();
     setOrderInfo(orderInfo);
+
+    // 从缓存获取初始化数据（包含新的数据结构）
     var recommendList = getCachedWalletRecommendList();
     var userIdentificationCodes = getCachedUserIdentificationCodes();
+
+    // 获取 transformList 和 noApplicableVoucher（从 paymentModule 的缓存中）
+    // 这些数据在 initializeWalletDataAsync 中已经计算并缓存
+    var walletInitData = (paymentModule === null || paymentModule === void 0 || (_paymentModule$wallet = paymentModule.wallet) === null || _paymentModule$wallet === void 0 || (_paymentModule$wallet2 = _paymentModule$wallet.getStoredWalletInitData) === null || _paymentModule$wallet2 === void 0 ? void 0 : _paymentModule$wallet2.call(_paymentModule$wallet)) || {};
+    var transformListData = walletInitData.transformList || userIdentificationCodes;
+    var noApplicableVoucherData = walletInitData.noApplicableVoucher || [];
+    var productsData = walletInitData.products || [];
     var initialData = [].concat(_toConsumableArray(recommendList), _toConsumableArray(userIdentificationCodes));
 
     // 设置钱包推荐列表
     setWalletRecommendList(recommendList);
-    // 设置用户识别码列表
-    setUserIdentificationCodes(initialData);
+    // 设置用户识别码列表（全部券）
+    setUserIdentificationCodes(userIdentificationCodes);
+    // 设置可计算的券列表
+    setTransformList(transformListData);
+    // 设置不适用的券列表
+    setNoApplicableVoucher(noApplicableVoucherData);
+    // 设置产品列表
+    setProducts(productsData);
     // 设置初始顺序
     initialOrderedDataRef.current = initialData;
+
     // 设置默认选中钱包
     if (!notSetWalletSelectRef.current) {
       setWalletSelect(recommendList);
+      // 设置默认选中的券ID
+      setSelectedVoucherIds(recommendList.map(function (item) {
+        return item.id;
+      }));
       var _select = paymentModule.wallet.formatWalletPassList2PreparePayments(recommendList).map(function (item) {
         return {
           code: item.tag,
@@ -439,6 +547,7 @@ export var useWalletPass = function useWalletPass(props) {
       onSelectChange === null || onSelectChange === void 0 || onSelectChange(_select);
     } else {
       setWalletSelect([]);
+      setSelectedVoucherIds([]);
       notSetWalletSelectRef.current = false;
       onSelectChange === null || onSelectChange === void 0 || onSelectChange([]);
     }
@@ -485,27 +594,27 @@ export var useWalletPass = function useWalletPass(props) {
     setLoading(false);
   });
   var handlePaymentStarted = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!(params.paymentMethodCode !== 'VOUCHER_BATCH')) {
-              _context3.next = 4;
+            if (!(params.paymentMethodCode !== 'VOUCHER_BATCH' && Number(customAmount || 0) > 0)) {
+              _context2.next = 4;
               break;
             }
             notSetWalletSelectRef.current = true;
-            _context3.next = 4;
+            _context2.next = 4;
             return checkoutModule.initWalletData({
               order_wait_pay_amount: Number(customAmount)
             });
           case 4:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3);
+      }, _callee2);
     }));
-    return function (_x3) {
-      return _ref3.apply(this, arguments);
+    return function (_x2) {
+      return _ref2.apply(this, arguments);
     };
   }());
 
@@ -557,16 +666,6 @@ export var useWalletPass = function useWalletPass(props) {
     };
   }, [paymentModule]);
 
-  // 组件卸载时清理定时器
-  useEffect(function () {
-    return function () {
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
-        timeoutRef.current = null;
-      }
-    };
-  }, []);
-
   // 所有列表 包含推荐列表、用户识别码列表、搜索用户识别码列表
   var allList = useMemo(function () {
     var reversedSearchData = _toConsumableArray(searchIdentificationCodeList).reverse();
@@ -582,12 +681,9 @@ export var useWalletPass = function useWalletPass(props) {
     });
   });
 
-  // 处理获取用户识别码
-  var handleFetchUserIdentificationCodes = useMemoizedFn(function (value, walletRecommendList) {
-    var val = uniqueByKey(walletRecommendList || allList, 'id').filter(function (item) {
-      return value.includes(item.id);
-    });
-    var prepare_payments = paymentModule.wallet.formatWalletPassList2PreparePayments(val);
+  // 纯粹的通知函数，将选中的券详情通知给外部
+  var notifySelectChange = useMemoizedFn(function (selectedDetails) {
+    var prepare_payments = paymentModule.wallet.formatWalletPassList2PreparePayments(selectedDetails);
     var select = prepare_payments.map(function (item) {
       return {
         voucher_id: item.voucher_id,
@@ -597,16 +693,13 @@ export var useWalletPass = function useWalletPass(props) {
     });
     logger === null || logger === void 0 || logger.addLog({
       type: 'info',
-      title: 'useWalletPass_handleFetchUserIdentificationCodes onSelectChange 开始调用',
-      metadata: {}
+      title: 'useWalletPass_notifySelectChange 通知外部选择变化',
+      metadata: {
+        selectedDetails: selectedDetails,
+        select: select
+      }
     });
     onSelectChange === null || onSelectChange === void 0 || onSelectChange(select);
-    fetchUserIdentificationCodes({
-      prepare_payments: prepare_payments,
-      available: 2,
-      filter_prepare_wallet_pass: 1,
-      other_exact_codes: getOtherExactCodes()
-    });
   });
   var handleSearchIdentificationCode = useMemoizedFn(function (value) {
     return paymentModule.wallet.searchIdentificationCodeAsync({
@@ -615,13 +708,46 @@ export var useWalletPass = function useWalletPass(props) {
     });
   });
 
-  // 处理选中钱包
+  // 处理选中钱包（只更新选中ID，触发前端重新计算）
   var handleSelectWallet = useMemoizedFn(function (value) {
-    var val = userIdentificationCodes.filter(function (item) {
+    setLoading(true);
+
+    // 1. 找出被取消选中的券ID
+    var deselectedIds = selectedVoucherIds.filter(function (id) {
+      return !value.includes(id);
+    });
+
+    // 2. 如果有被取消选中的券，检查是否需要重置 edit_current_amount
+    if (deselectedIds.length > 0) {
+      // 找出这些券中有 edit_current_amount 的
+      var needResetIds = deselectedIds.filter(function (id) {
+        var voucher = allVouchersForCalculation.find(function (v) {
+          return v.id === id;
+        });
+        return (voucher === null || voucher === void 0 ? void 0 : voucher.edit_current_amount) !== undefined;
+      });
+
+      // 重置这些券的 edit_current_amount
+      if (needResetIds.length > 0) {
+        updateWalletDataById(needResetIds, {
+          edit_current_amount: undefined
+        });
+
+        // 从 confirmedEditAmountIdsRef 中移除这些ID
+        confirmedEditAmountIdsRef.current = confirmedEditAmountIdsRef.current.filter(function (id) {
+          return !needResetIds.includes(id);
+        });
+      }
+    }
+
+    // 3. 更新选中的券ID列表（会触发 useMemo 重新计算 selectedWithDetails）
+    setSelectedVoucherIds(value);
+
+    // 4. 同时更新 selectedWallet 用于兼容现有逻辑
+    var val = allVouchersForCalculation.filter(function (item) {
       return value.includes(item.id);
     });
     setWalletSelect(val);
-    handleFetchUserIdentificationCodes(value);
   });
 
   // 获取过期钱包id
@@ -644,12 +770,15 @@ export var useWalletPass = function useWalletPass(props) {
 
   // 清除所有选中的钱包
   var clearAllSelectedWallet = useMemoizedFn(function () {
-    logger === null || logger === void 0 || logger.addLog({
-      type: 'info',
-      title: 'useWalletPass_clearAllSelectedWallet onSelectChange 开始调用',
-      metadata: {}
-    });
-    onSelectChange === null || onSelectChange === void 0 || onSelectChange([]);
+    // 1. 重置所有已编辑过金额的券
+    if (confirmedEditAmountIdsRef.current.length > 0) {
+      updateWalletDataById(confirmedEditAmountIdsRef.current, {
+        edit_current_amount: undefined
+      });
+      // 清空已编辑的券ID列表
+      confirmedEditAmountIdsRef.current = [];
+    }
+
     // 如果没有选中钱包，则不处理
     if (selectedWalletIds.length === 0 && selectedDiscountList.length === 0) {
       return;
@@ -672,8 +801,19 @@ export var useWalletPass = function useWalletPass(props) {
       pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.emit('shopDiscount:onSelectedDiscountListChange', detail);
       return;
     }
+
+    // 清空选中的钱包
     setWalletSelect([]);
-    handleFetchUserIdentificationCodes([]);
+    setSelectedVoucherIds([]);
+
+    // 清空时立即通知外部（不等待 useUpdateEffect）
+    logger === null || logger === void 0 || logger.addLog({
+      type: 'info',
+      title: 'useWalletPass_clearAllSelectedWallet 立即通知外部清空',
+      metadata: {}
+    });
+    onSelectChange === null || onSelectChange === void 0 || onSelectChange([]);
+    setLoading(false);
   });
 
   // 判断当前选择是否已是最优选择
@@ -731,9 +871,11 @@ export var useWalletPass = function useWalletPass(props) {
             return item.unified_available_status;
           });
           setWalletSelect(_select2);
-          handleFetchUserIdentificationCodes(_select2.map(function (item) {
+          // 更新选中的券ID列表（会触发 useMemo 重新计算 selectedWithDetails）
+          setSelectedVoucherIds(_select2.map(function (item) {
             return item.id;
-          }), _select2);
+          }));
+          // useUpdateEffect 会自动在 selectedWithDetails 更新后通知外部
           if (_select2.length) {
             Toast === null || Toast === void 0 || Toast.success(locales.getText('wallet-pass-module-best-combination-selected'));
           }
@@ -762,11 +904,14 @@ export var useWalletPass = function useWalletPass(props) {
       if (hasGoodPass && !isBestDiscount) return;
       // 重置为最优选择并显示Toast提示
       setWalletSelect(newWalletRecommendList);
-      handleFetchUserIdentificationCodes(newWalletRecommendList.map(function (item) {
+      // 更新选中的券ID列表（会触发 useMemo 重新计算 selectedWithDetails）
+      setSelectedVoucherIds(newWalletRecommendList.map(function (item) {
         return item.id;
-      }), newWalletRecommendList);
+      }));
+      // useUpdateEffect 会自动在 selectedWithDetails 更新后通知外部
       Toast === null || Toast === void 0 || Toast.success(locales.getText('wallet-pass-module-best-combination-selected'));
     }
+    setLoading(false);
   });
   var handleSelectDiscount = useMemoizedFn(function (value, option) {
     var _detail$discountList, _pisellos$effects2;
@@ -811,6 +956,10 @@ export var useWalletPass = function useWalletPass(props) {
     var newUserIdentificationCodes = updateArrayItemById(userIdentificationCodes, targetId, updateData);
     setUserIdentificationCodes(newUserIdentificationCodes);
 
+    // 更新transformList中对应ID的数据（用于前端计算）
+    var newTransformList = updateArrayItemById(transformList, targetId, updateData);
+    setTransformList(newTransformList);
+
     // 更新searchIdentificationCodeList中对应ID的数据
     var newSearchIdentificationCodeList = updateArrayItemById(searchIdentificationCodeList, targetId, updateData);
     setSearchIdentificationCodeList(newSearchIdentificationCodeList);
@@ -821,6 +970,7 @@ export var useWalletPass = function useWalletPass(props) {
     return {
       newWalletRecommendList: newWalletRecommendList,
       newUserIdentificationCodes: newUserIdentificationCodes,
+      newTransformList: newTransformList,
       newSearchIdentificationCodeList: newSearchIdentificationCodeList,
       newSelectedWallet: newSelectedWallet
     };
@@ -828,70 +978,42 @@ export var useWalletPass = function useWalletPass(props) {
   var handleConfirmEditAmount = useMemoizedFn(function (value, id, data) {
     // 如果金额为0，直接触发 handleSelectWallet 把当前id过滤掉
     if (value === 0) {
-      var filteredIds = selectedWalletIds.filter(function (walletId) {
+      var filteredIds = selectedVoucherIds.filter(function (walletId) {
         return walletId !== data.id;
       });
       handleSelectWallet(filteredIds);
       return;
     }
+    setLoading(true);
 
     // 将执行过的 data.id 添加到跟踪数组中（避免重复）
     if (!confirmedEditAmountIdsRef.current.includes(data.id)) {
       confirmedEditAmountIdsRef.current.push(data.id);
     }
 
-    // 使用通用函数更新所有相关状态
+    // 使用通用函数更新所有相关状态（包括 transformList 和 searchIdentificationCodeList）
+    // 这会触发 useMemo 重新计算 selectedWithDetails
     updateWalletDataById(data.id, {
       edit_current_amount: value
     });
 
-    // 清理之前的定时器
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current);
-    }
-
-    // 设置新的定时器并保存引用
-    timeoutRef.current = setTimeout(function () {
-      handleFetchUserIdentificationCodes(selectedWalletIds);
-      timeoutRef.current = null; // 执行完成后清空引用
-    });
+    // useUpdateEffect 会自动在 selectedWithDetails 更新后通知外部
+    // walletPassEvaluator.recalculateVouchers 会识别 edit_current_amount 字段
   });
   var handleBeforeEditAmount = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(value, index, data) {
-      var result, resultItem;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(value, index, data) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context4.next = 2;
-            return paymentModule.wallet.searchIdentificationCodeAsync({
-              code: data.code,
-              prepare_payments: paymentModule.wallet.formatWalletPassList2PreparePayments(selectedWalletRef.current.filter(function (item) {
-                return item.id !== data.id;
-              }))
-            }, {
-              noCache: true
-            });
-          case 2:
-            result = _context4.sent;
-            // 如果result中有数据，使用result中的数据更新状态
-            if (result.data && result.data.length > 0) {
-              resultItem = result.data.find(function (item) {
-                return item.id === data.id;
-              });
-              if (resultItem) {
-                // 使用通用函数更新所有相关状态
-                updateWalletDataById(data.id, resultItem);
-              }
-            }
-            return _context4.abrupt("return", true);
-          case 5:
+            return _context3.abrupt("return", true);
+          case 1:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
-      }, _callee4);
+      }, _callee3);
     }));
-    return function (_x4, _x5, _x6) {
-      return _ref4.apply(this, arguments);
+    return function (_x3, _x4, _x5) {
+      return _ref3.apply(this, arguments);
     };
   }());
   return {
@@ -915,7 +1037,6 @@ export var useWalletPass = function useWalletPass(props) {
     selectedDiscountList: selectedDiscountList,
     handleSelectDiscount: handleSelectDiscount,
     customerName: customerName,
-    fetchWalletRecommendList: fetchWalletRecommendList,
     fetchUserIdentificationCodes: fetchUserIdentificationCodes,
     getCachedWalletRecommendList: getCachedWalletRecommendList,
     getCachedUserIdentificationCodes: getCachedUserIdentificationCodes,