@pisell/private-materials 6.9.2 → 6.9.4

package/lib/components/checkout/components/PaymentOptionsModule/PaymentMethodItem.d.ts

@@ -10,6 +10,7 @@ export interface ExtendedPaymentMethod {
     fixed?: number;
     percentage?: number;
     totalAmount?: string;
+    channel_application?: string[];
 }
 export interface PaymentMethodItemProps {
     /** 支付方式数据 */

package/lib/components/checkout/components/PaymentOptionsModule/index.js

@@ -47,7 +47,8 @@ var SHOW_METHODS_CODE = [
   "EFTPOS",
   "EFTPOS_TYRO",
   "EFTPOS_WINDCAVE",
-  "EFTPOS_PAYO"
+  "EFTPOS_PAYO",
+  "EFTPOS_HUIFU"
 ];
 function PaymentOptionsModule({
   amountSymbol,
@@ -76,7 +77,10 @@ function PaymentOptionsModule({
   };
   const displayTitle = typeof title === "string" ? title : title ? String(title) : getText("cards.and.digitals", "Cards & Digitals");
   const filteredPaymentMethods = paymentMethods.filter(
-    (item) => !(item.type === "app" && item.code === "EFTPOS_LINKLY") && (["custom"].includes(item.type) || SHOW_METHODS_CODE.includes(item.code))
+    (item) => {
+      var _a2;
+      return !(item.type === "app" && item.code === "EFTPOS_LINKLY") && ((_a2 = item.channel_application) == null ? void 0 : _a2.includes("pos")) && (["custom"].includes(item.type) || SHOW_METHODS_CODE.includes(item.code));
+    }
   );
   const { run: handlePaymentClick } = (0, import_ahooks.useDebounceFn)(
     (method) => {

package/lib/components/checkout/components/PaymentResultToast/PaymentResultToastProvider.js

@@ -259,7 +259,6 @@ var GlobalToastManager = class {
     if (config.mask) {
       container.setAttribute("data-mask", "true");
     }
-    debugger;
     const dynamicBottomOffset = this.calculateAndCacheBottomOffset();
     container.style.position = "fixed";
     if (config.mask) {

package/lib/components/checkout/components/PaymentResultToast/index.js

@@ -153,8 +153,10 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
       }
     };
     document.addEventListener("mousedown", handleClickOutside);
+    document.addEventListener("pointerup", handleClickOutside);
     return () => {
       document.removeEventListener("mousedown", handleClickOutside);
+      document.removeEventListener("pointerup", handleClickOutside);
     };
   }, [clickOutsideToClose, visible, clearCountdown]);
   const handleClose = (0, import_react.useCallback)(() => {

package/lib/components/checkout/components/WalletPassModule/index.js

@@ -68,6 +68,7 @@ var WalletPassModule = (0, import_react.forwardRef)(
     } = (0, import_useWalletPass.useWalletPass)({
       onSelectChange,
       customAmount,
+      totalAmount: Number(orderInfo == null ? void 0 : orderInfo.totalAmount) || 0,
       clientId
     });
     const [expiredModalVisible, setExpiredModalVisible] = (0, import_react.useState)(false);

package/lib/components/checkout/components/WalletPassModule/utils.d.ts

@@ -1,6 +1,7 @@
 declare type WalletPassDataType = Record<string, any>;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => any;
 export declare const voucherTime: (data: WalletPassDataType, key?: string) => any;
+export declare const getVoucherAvailableStatus: (item: any) => boolean;
 export declare const formatMachineCodeServer2CardList: (data: WalletPassDataType[], selectId?: number[], otherProps?: Record<string, any>) => any;
 export declare const formatDiscountWalletData: (data: any, selectId?: number[]) => any;
 export interface WalletPassUsageUnit {

package/lib/components/checkout/components/WalletPassModule/utils.js

@@ -33,6 +33,7 @@ __export(utils_exports, {
   formatMachineCodeServer2CardList: () => formatMachineCodeServer2CardList,
   getAvailableMaxAmount: () => getAvailableMaxAmount,
   getPointCardAmount: () => getPointCardAmount,
+  getVoucherAvailableStatus: () => getVoucherAvailableStatus,
   isSameContent: () => isSameContent,
   voucherTime: () => voucherTime
 });
@@ -43,6 +44,9 @@ var import_materials = require("@pisell/materials");
 var import_decimal = __toESM(require("decimal.js"));
 var Amount = import_materials.PisellText.Amount;
 var getAvailableMaxAmount = (data) => {
+  if ((0, import_utils.isNumber)(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var voucherTime = (data, key = "expire_date") => {
@@ -55,9 +59,20 @@ var voucherTime = (data, key = "expire_date") => {
   }
   return import_utils.locales.getText("pisell2.text.walletPassPermanent");
 };
+var getVoucherAvailableStatus = (item) => {
+  return item.unified_available_status === 1 && ((0, import_utils.isNumber)(item._unified_available_status) ? !!item._unified_available_status : true);
+};
 var formatMachineCodeServer2CardList = (data, selectId = [], otherProps = {}) => {
   return (data || []).map((item) => {
     var _a, _b;
+    let disabled = false;
+    if (item.unified_available_status === 0) {
+      disabled = true;
+    } else {
+      if ((0, import_utils.isNumber)(item._unified_available_status)) {
+        disabled = !item._unified_available_status;
+      }
+    }
     return {
       id: item.id,
       name: item.product_name,
@@ -74,8 +89,8 @@ var formatMachineCodeServer2CardList = (data, selectId = [], otherProps = {}) =>
       showQrCode: false,
       showStatus: true,
       code: item.code,
-      disabled: !item.unified_available_status,
-      disabledReason: (_a = item.unified_messages) == null ? void 0 : _a.title,
+      disabled,
+      disabledReason: (0, import_utils.isNumber)(item._unified_available_status) && item._unified_available_status !== 1 ? item.reason : (_a = item.unified_messages) == null ? void 0 : _a.title,
       cover: (_b = item.product) == null ? void 0 : _b.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
@@ -153,6 +168,7 @@ var isSameContent = (arr1, arr2) => {
   formatMachineCodeServer2CardList,
   getAvailableMaxAmount,
   getPointCardAmount,
+  getVoucherAvailableStatus,
   isSameContent,
   voucherTime
 });

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -9,6 +9,7 @@ export declare const useWalletPass: (props: {
     }[]) => void) | undefined;
     customAmount?: string | undefined;
     clientId?: number | undefined;
+    totalAmount?: number | undefined;
 }) => {
     walletRecommendList: any[];
     userIdentificationCodes: any[];
@@ -17,7 +18,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;
@@ -29,7 +30,6 @@ export declare const useWalletPass: (props: {
     selectedDiscountList: any;
     handleSelectDiscount: (value: number[], option: any) => void;
     customerName: any;
-    fetchWalletRecommendList: (params: any) => Promise<any>;
     fetchUserIdentificationCodes: (params: any) => Promise<any>;
     getCachedWalletRecommendList: () => any;
     getCachedUserIdentificationCodes: () => any;

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

@@ -44,24 +44,27 @@ var import_utils3 = require("../../booking/utils");
 var import_pisellos = require("../../ticketBooking/hooks/pisellos");
 var import_useShopDiscountModule = require("../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var useWalletPass = (props) => {
-  const { onSelectChange, customAmount, clientId } = props;
+  const { onSelectChange, customAmount, clientId, totalAmount } = props;
   const logger = (0, import_usePaymentLogger.default)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const [walletRecommendList, setWalletRecommendList] = (0, import_react.useState)([]);
   const [userIdentificationCodes, setUserIdentificationCodes] = (0, import_react.useState)(
     []
   );
+  const [transformList, setTransformList] = (0, import_react.useState)([]);
+  const [noApplicableVoucher, setNoApplicableVoucher] = (0, import_react.useState)([]);
   const initialOrderedDataRef = (0, import_react.useRef)([]);
   const initialDiscountOrderRef = (0, import_react.useRef)([]);
   const confirmedEditAmountIdsRef = (0, import_react.useRef)([]);
-  const timeoutRef = (0, import_react.useRef)(null);
   const [searchIdentificationCodeList, setSearchIdentificationCodeList] = (0, import_react.useState)([]);
   const [orderInfo, setOrderInfo] = (0, import_react.useState)({});
   const [selectedWallet, setSelectedWallet] = (0, import_react.useState)([]);
   const selectedWalletRef = (0, import_react.useRef)([]);
+  const [selectedVoucherIds, setSelectedVoucherIds] = (0, import_react.useState)([]);
   const [disabledWalletData, setDisabledWalletData] = (0, import_react.useState)([]);
   const notSetWalletSelectRef = (0, import_react.useRef)(false);
   const showBestToastRef = (0, import_react.useRef)(false);
+  const [products, setProducts] = (0, import_react.useState)([]);
   const selectedWalletIds = (0, import_react.useMemo)(() => {
     return selectedWallet.map((item) => item.id);
   }, [selectedWallet]);
@@ -73,6 +76,10 @@ var useWalletPass = (props) => {
   const checkoutModule = pisellos.getModule("checkout");
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const paymentModule = checkoutModule == null ? void 0 : checkoutModule.payment;
+  const walletPassEvaluator = (0, import_react.useMemo)(() => {
+    var _a, _b;
+    return (_b = (_a = paymentModule == null ? void 0 : paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
+  }, []);
   const setWalletSelect = (0, import_ahooks.useMemoizedFn)((data2) => {
     setSelectedWallet(data2);
     selectedWalletRef.current = data2;
@@ -163,34 +170,61 @@ var useWalletPass = (props) => {
       return orderedResult;
     }
   );
+  const allVouchersForCalculation = (0, import_react.useMemo)(() => {
+    return [...transformList || [], ...searchIdentificationCodeList || []];
+  }, [transformList, searchIdentificationCodeList]);
+  const selectedVouchers = (0, import_react.useMemo)(() => {
+    return selectedVoucherIds.map((id) => allVouchersForCalculation.find((v) => v.id === id)).filter(Boolean);
+  }, [selectedVoucherIds, allVouchersForCalculation]);
+  const { displayVouchers, displayOtherVouchers, selectedWithDetails, totalDeduction } = (0, import_react.useMemo)(() => {
+    if (!walletPassEvaluator || !allVouchersForCalculation.length || !totalAmount) {
+      return {
+        displayVouchers: [...transformList || [], ...noApplicableVoucher || []],
+        displayOtherVouchers: searchIdentificationCodeList || [],
+        selectedWithDetails: [],
+        totalDeduction: 0
+      };
+    }
+    const result = walletPassEvaluator.recalculateVouchers(
+      allVouchersForCalculation,
+      selectedVouchers,
+      totalAmount,
+      products || []
+    );
+    const currentCustomerVouchers = [];
+    const otherCustomerVouchers = [];
+    result.allWithUpdatedStatus.forEach((voucher) => {
+      const isSearchVoucher = searchIdentificationCodeList.some((item) => item.id === voucher.id);
+      if (isSearchVoucher) {
+        otherCustomerVouchers.push(voucher);
+      } else {
+        currentCustomerVouchers.push(voucher);
+      }
+    });
+    return {
+      displayVouchers: [...currentCustomerVouchers, ...noApplicableVoucher || []],
+      displayOtherVouchers: otherCustomerVouchers,
+      selectedWithDetails: result.selectedWithDetails,
+      totalDeduction: result.selectedWithDetails.reduce((sum, v) => sum + (v.actualDeduction || 0), 0)
+    };
+  }, [selectedVouchers, allVouchersForCalculation, transformList, searchIdentificationCodeList, noApplicableVoucher, totalAmount, products]);
+  (0, import_ahooks.useUpdateEffect)(() => {
+    notifySelectChange(selectedWithDetails);
+    setLoading(false);
+  }, [selectedWithDetails]);
   const data = (0, import_react.useMemo)(() => {
     return (0, import_utils2.formatMachineCodeServer2CardList)(
       (0, import_utils.uniqueByKey)(
         mergeDataWithInitialOrder([
           ...selectedWallet,
-          ...userIdentificationCodes
+          ...displayVouchers,
+          ...displayOtherVouchers
         ]),
         "id"
       ),
-      selectedWalletIds
+      selectedVoucherIds
     );
-  }, [userIdentificationCodes, selectedWalletIds, selectedWallet]);
-  const fetchWalletRecommendList = (0, import_ahooks.useMemoizedFn)(async (params) => {
-    setLoading(true);
-    setError(null);
-    try {
-      const result = await paymentModule.wallet.getWalletPassRecommendListAsync(
-        params
-      );
-      setWalletRecommendList(result);
-      return result;
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "获取钱包推荐列表失败");
-      throw err;
-    } finally {
-      setLoading(false);
-    }
-  });
+  }, [displayVouchers, displayOtherVouchers, selectedVoucherIds, selectedWallet]);
   const fetchUserIdentificationCodes = (0, import_ahooks.useMemoizedFn)(async (params) => {
     setLoading(true);
     setError(null);
@@ -233,43 +267,75 @@ var useWalletPass = (props) => {
   });
   const handleSearchIdentificationCodeCompleted = (0, import_ahooks.useMemoizedFn)((data2) => {
     const { currentSearchResults, cachedSearchResults } = data2;
+    let formattedResults = currentSearchResults;
+    if (walletPassEvaluator && currentSearchResults.length > 0 && totalAmount) {
+      formattedResults = walletPassEvaluator.searchVoucherFormat({
+        vouchers: currentSearchResults,
+        orderTotalAmount: totalAmount,
+        products: products || []
+      });
+    }
+    let formattedCachedResults = cachedSearchResults || [];
+    if (walletPassEvaluator && cachedSearchResults && cachedSearchResults.length > 0 && totalAmount) {
+      formattedCachedResults = walletPassEvaluator.searchVoucherFormat({
+        vouchers: cachedSearchResults,
+        orderTotalAmount: totalAmount,
+        products: products || []
+      });
+    }
+    const mergedSearchResults = (0, import_utils.uniqueByKey)(
+      [...formattedCachedResults || [], ...formattedResults],
+      "id"
+    );
     let isAvailableData = [];
     let isDisabledData = [];
-    if (currentSearchResults.length > 0) {
-      currentSearchResults.forEach((item) => {
-        if (!!item.unified_available_status) {
+    if (formattedResults.length > 0) {
+      formattedResults.forEach((item) => {
+        if ((0, import_utils2.getVoucherAvailableStatus)(item)) {
           isAvailableData.push(item);
         } else {
           isDisabledData.push(item);
         }
       });
     }
-    setDisabledWalletData(isDisabledData);
+    const availableData = mergedSearchResults.filter((item) => (0, import_utils2.getVoucherAvailableStatus)(item));
+    const allDisabledData = mergedSearchResults.filter((item) => !(0, import_utils2.getVoucherAvailableStatus)(item));
+    setDisabledWalletData(allDisabledData);
     let newValues = [...selectedWalletRef.current];
     if (isAvailableData.length === 1) {
       newValues = [...selectedWalletRef.current, ...isAvailableData];
     }
-    setSearchIdentificationCodeList(cachedSearchResults);
+    setSearchIdentificationCodeList(availableData);
+    setNoApplicableVoucher(allDisabledData);
     setWalletSelect(newValues);
-    setTimeout(() => {
-      handleFetchUserIdentificationCodes(newValues.map((item) => item.id));
-    }, 200);
+    setSelectedVoucherIds(newValues.map((item) => item.id));
   });
   const onOrderCreated = (0, import_ahooks.useMemoizedFn)(() => {
+    var _a, _b;
     const orderInfo2 = checkoutModule.getOrderOriginalData();
     setOrderInfo(orderInfo2);
     const recommendList = getCachedWalletRecommendList();
     const userIdentificationCodes2 = getCachedUserIdentificationCodes();
+    const walletInitData = ((_b = (_a = paymentModule == null ? void 0 : paymentModule.wallet) == null ? void 0 : _a.getStoredWalletInitData) == null ? void 0 : _b.call(_a)) || {};
+    const transformListData = walletInitData.transformList || userIdentificationCodes2;
+    const noApplicableVoucherData = walletInitData.noApplicableVoucher || [];
+    const productsData = walletInitData.products || [];
     const initialData = [...recommendList, ...userIdentificationCodes2];
     setWalletRecommendList(recommendList);
-    setUserIdentificationCodes(initialData);
+    setUserIdentificationCodes(userIdentificationCodes2);
+    setTransformList(transformListData);
+    setNoApplicableVoucher(noApplicableVoucherData);
+    setProducts(productsData);
     initialOrderedDataRef.current = initialData;
     if (!notSetWalletSelectRef.current) {
       setWalletSelect(recommendList);
+      setSelectedVoucherIds(recommendList.map((item) => item.id));
       const select = paymentModule.wallet.formatWalletPassList2PreparePayments(recommendList).map((item) => ({
         code: item.tag,
         voucher_id: item.voucher_id,
-        amount: item.amount || 0
+        amount: item.amount || 0,
+        wallet_pass_usage_unit: item.wallet_pass_usage_unit,
+        wallet_pass_use_value: item.wallet_pass_use_value
       }));
       logger == null ? void 0 : logger.addLog({
         type: "info",
@@ -279,6 +345,7 @@ var useWalletPass = (props) => {
       onSelectChange == null ? void 0 : onSelectChange(select);
     } else {
       setWalletSelect([]);
+      setSelectedVoucherIds([]);
       notSetWalletSelectRef.current = false;
       onSelectChange == null ? void 0 : onSelectChange([]);
     }
@@ -316,7 +383,7 @@ var useWalletPass = (props) => {
   });
   const handlePaymentStarted = (0, import_ahooks.useMemoizedFn)(
     async (params) => {
-      if (params.paymentMethodCode !== "VOUCHER_BATCH") {
+      if (params.paymentMethodCode !== "VOUCHER_BATCH" && Number(customAmount || 0) > 0) {
         notSetWalletSelectRef.current = true;
         await checkoutModule.initWalletData({
           order_wait_pay_amount: Number(customAmount)
@@ -398,14 +465,6 @@ var useWalletPass = (props) => {
       );
     };
   }, [paymentModule]);
-  (0, import_react.useEffect)(() => {
-    return () => {
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
-        timeoutRef.current = null;
-      }
-    };
-  }, []);
   const allList = (0, import_react.useMemo)(() => {
     const reversedSearchData = [...searchIdentificationCodeList].reverse();
     return [
@@ -425,31 +484,22 @@ var useWalletPass = (props) => {
       )
     ).map((item) => item.code);
   });
-  const handleFetchUserIdentificationCodes = (0, import_ahooks.useMemoizedFn)(
-    (value, walletRecommendList2) => {
-      const val = (0, import_utils.uniqueByKey)(walletRecommendList2 || allList, "id").filter(
-        (item) => value.includes(item.id)
-      );
-      const prepare_payments = paymentModule.wallet.formatWalletPassList2PreparePayments(val);
-      const select = prepare_payments.map((item) => ({
-        voucher_id: item.voucher_id,
-        amount: item.amount,
-        code: item.tag
-      }));
-      logger == null ? void 0 : logger.addLog({
-        type: "info",
-        title: "useWalletPass_handleFetchUserIdentificationCodes onSelectChange 开始调用",
-        metadata: {}
-      });
-      onSelectChange == null ? void 0 : onSelectChange(select);
-      fetchUserIdentificationCodes({
-        prepare_payments,
-        available: 2,
-        filter_prepare_wallet_pass: 1,
-        other_exact_codes: getOtherExactCodes()
-      });
-    }
-  );
+  const notifySelectChange = (0, import_ahooks.useMemoizedFn)((selectedDetails) => {
+    const prepare_payments = paymentModule.wallet.formatWalletPassList2PreparePayments(selectedDetails);
+    const select = prepare_payments.map((item) => ({
+      voucher_id: item.voucher_id,
+      amount: item.amount,
+      code: item.tag,
+      wallet_pass_usage_unit: item.wallet_pass_usage_unit,
+      wallet_pass_use_value: item.wallet_pass_use_value
+    }));
+    logger == null ? void 0 : logger.addLog({
+      type: "info",
+      title: "useWalletPass_notifySelectChange 通知外部选择变化",
+      metadata: { selectedDetails, select }
+    });
+    onSelectChange == null ? void 0 : onSelectChange(select);
+  });
   const handleSearchIdentificationCode = (0, import_ahooks.useMemoizedFn)((value) => {
     return paymentModule.wallet.searchIdentificationCodeAsync({
       code: value,
@@ -459,11 +509,27 @@ var useWalletPass = (props) => {
     });
   });
   const handleSelectWallet = (0, import_ahooks.useMemoizedFn)((value) => {
-    const val = userIdentificationCodes.filter(
+    setLoading(true);
+    const deselectedIds = selectedVoucherIds.filter(
+      (id) => !value.includes(id)
+    );
+    if (deselectedIds.length > 0) {
+      const needResetIds = deselectedIds.filter((id) => {
+        const voucher = allVouchersForCalculation.find((v) => v.id === id);
+        return (voucher == null ? void 0 : voucher.edit_current_amount) !== void 0;
+      });
+      if (needResetIds.length > 0) {
+        updateWalletDataById(needResetIds, { edit_current_amount: void 0 });
+        confirmedEditAmountIdsRef.current = confirmedEditAmountIdsRef.current.filter(
+          (id) => !needResetIds.includes(id)
+        );
+      }
+    }
+    setSelectedVoucherIds(value);
+    const val = allVouchersForCalculation.filter(
       (item) => value.includes(item.id)
     );
     setWalletSelect(val);
-    handleFetchUserIdentificationCodes(value);
   });
   const expiredWalletIds = (0, import_react.useMemo)(() => {
     return (0, import_utils.uniqueByKey)(allList, "id").filter(
@@ -481,12 +547,12 @@ var useWalletPass = (props) => {
   }, [allList]);
   const clearAllSelectedWallet = (0, import_ahooks.useMemoizedFn)(() => {
     var _a;
-    logger == null ? void 0 : logger.addLog({
-      type: "info",
-      title: "useWalletPass_clearAllSelectedWallet onSelectChange 开始调用",
-      metadata: {}
-    });
-    onSelectChange == null ? void 0 : onSelectChange([]);
+    if (confirmedEditAmountIdsRef.current.length > 0) {
+      updateWalletDataById(confirmedEditAmountIdsRef.current, {
+        edit_current_amount: void 0
+      });
+      confirmedEditAmountIdsRef.current = [];
+    }
     if (selectedWalletIds.length === 0 && selectedDiscountList.length === 0) {
       return;
     }
@@ -510,7 +576,14 @@ var useWalletPass = (props) => {
       return;
     }
     setWalletSelect([]);
-    handleFetchUserIdentificationCodes([]);
+    setSelectedVoucherIds([]);
+    logger == null ? void 0 : logger.addLog({
+      type: "info",
+      title: "useWalletPass_clearAllSelectedWallet 立即通知外部清空",
+      metadata: {}
+    });
+    onSelectChange == null ? void 0 : onSelectChange([]);
+    setLoading(false);
   });
   const isCurrentSelectionBest = (0, import_ahooks.useMemoizedFn)(() => {
     if (walletRecommendList.length === 0) return true;
@@ -557,12 +630,9 @@ var useWalletPass = (props) => {
             import_utils.locales.getText("wallet-pass-module-already-best-combination")
           );
         } else {
-          const select = searchIdentificationCodeList.filter((item) => item.unified_available_status);
+          const select = searchIdentificationCodeList.filter((item) => (0, import_utils2.getVoucherAvailableStatus)(item));
           setWalletSelect(select);
-          handleFetchUserIdentificationCodes(
-            select.map((item) => item.id),
-            select
-          );
+          setSelectedVoucherIds(select.map((item) => item.id));
           if (select.length) {
             Toast == null ? void 0 : Toast.success(
               import_utils.locales.getText("wallet-pass-module-best-combination-selected")
@@ -591,14 +661,12 @@ var useWalletPass = (props) => {
     } else {
       if (hasGoodPass && !isBestDiscount) return;
       setWalletSelect(newWalletRecommendList);
-      handleFetchUserIdentificationCodes(
-        newWalletRecommendList.map((item) => item.id),
-        newWalletRecommendList
-      );
+      setSelectedVoucherIds(newWalletRecommendList.map((item) => item.id));
       Toast == null ? void 0 : Toast.success(
         import_utils.locales.getText("wallet-pass-module-best-combination-selected")
       );
     }
+    setLoading(false);
   });
   const handleSelectDiscount = (0, import_ahooks.useMemoizedFn)((value, option) => {
     var _a, _b, _c;
@@ -645,6 +713,12 @@ var useWalletPass = (props) => {
         updateData
       );
       setUserIdentificationCodes(newUserIdentificationCodes);
+      const newTransformList = updateArrayItemById(
+        transformList,
+        targetId,
+        updateData
+      );
+      setTransformList(newTransformList);
       const newSearchIdentificationCodeList = updateArrayItemById(
         searchIdentificationCodeList,
         targetId,
@@ -660,6 +734,7 @@ var useWalletPass = (props) => {
       return {
         newWalletRecommendList,
         newUserIdentificationCodes,
+        newTransformList,
         newSearchIdentificationCodeList,
         newSelectedWallet
       };
@@ -668,44 +743,21 @@ var useWalletPass = (props) => {
   const handleConfirmEditAmount = (0, import_ahooks.useMemoizedFn)(
     (value, id, data2) => {
       if (value === 0) {
-        const filteredIds = selectedWalletIds.filter(
+        const filteredIds = selectedVoucherIds.filter(
           (walletId) => walletId !== data2.id
         );
         handleSelectWallet(filteredIds);
         return;
       }
+      setLoading(true);
       if (!confirmedEditAmountIdsRef.current.includes(data2.id)) {
         confirmedEditAmountIdsRef.current.push(data2.id);
       }
       updateWalletDataById(data2.id, { edit_current_amount: value });
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
-      }
-      timeoutRef.current = setTimeout(() => {
-        handleFetchUserIdentificationCodes(selectedWalletIds);
-        timeoutRef.current = null;
-      });
     }
   );
   const handleBeforeEditAmount = (0, import_ahooks.useMemoizedFn)(
     async (value, index, data2) => {
-      const result = await paymentModule.wallet.searchIdentificationCodeAsync(
-        {
-          code: data2.code,
-          prepare_payments: paymentModule.wallet.formatWalletPassList2PreparePayments(
-            selectedWalletRef.current.filter(
-              (item) => item.id !== data2.id
-            )
-          )
-        },
-        { noCache: true }
-      );
-      if (result.data && result.data.length > 0) {
-        const resultItem = result.data.find((item) => item.id === data2.id);
-        if (resultItem) {
-          updateWalletDataById(data2.id, resultItem);
-        }
-      }
       return true;
     }
   );
@@ -730,7 +782,6 @@ var useWalletPass = (props) => {
     selectedDiscountList,
     handleSelectDiscount,
     customerName,
-    fetchWalletRecommendList,
     fetchUserIdentificationCodes,
     getCachedWalletRecommendList,
     getCachedUserIdentificationCodes,

package/lib/components/checkout/index.less

@@ -1,3 +1,7 @@
+.payment-modal-modal {
+  width: 880px!important;
+}
+
 .payment-modal-wrapper {
   .pisell-lowcode-modal-close {
     display: none;
@@ -42,10 +46,12 @@
       overflow: hidden;
       display: flex;
       flex-direction: column;
+      width: 100%!important;
 
       .pisell-lowcode-modal-body {
         // JavaScript设置: maxHeight: '100%' (基于父元素)
         overflow-y: auto;
+        width: 100%!important;
       }
     }
   }