@pisell/private-materials 6.6.48 → 6.6.49

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

@@ -44,27 +44,24 @@ 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, totalAmount } = props;
+  const { onSelectChange, customAmount, clientId } = 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]);
@@ -76,10 +73,6 @@ 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;
@@ -170,61 +163,34 @@ 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,
-          ...displayVouchers,
-          ...displayOtherVouchers
+          ...userIdentificationCodes
         ]),
         "id"
       ),
-      selectedVoucherIds
+      selectedWalletIds
     );
-  }, [displayVouchers, displayOtherVouchers, selectedVoucherIds, selectedWallet]);
+  }, [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);
+    }
+  });
   const fetchUserIdentificationCodes = (0, import_ahooks.useMemoizedFn)(async (params) => {
     setLoading(true);
     setError(null);
@@ -267,69 +233,37 @@ 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 (formattedResults.length > 0) {
-      formattedResults.forEach((item) => {
-        if ((0, import_utils2.getVoucherAvailableStatus)(item)) {
+    if (currentSearchResults.length > 0) {
+      currentSearchResults.forEach((item) => {
+        if (!!item.unified_available_status) {
           isAvailableData.push(item);
         } else {
           isDisabledData.push(item);
         }
       });
     }
-    const availableData = mergedSearchResults.filter((item) => (0, import_utils2.getVoucherAvailableStatus)(item));
-    const allDisabledData = mergedSearchResults.filter((item) => !(0, import_utils2.getVoucherAvailableStatus)(item));
-    setDisabledWalletData(allDisabledData);
+    setDisabledWalletData(isDisabledData);
     let newValues = [...selectedWalletRef.current];
     if (isAvailableData.length === 1) {
       newValues = [...selectedWalletRef.current, ...isAvailableData];
     }
-    setSearchIdentificationCodeList(availableData);
-    setNoApplicableVoucher(allDisabledData);
+    setSearchIdentificationCodeList(cachedSearchResults);
     setWalletSelect(newValues);
-    setSelectedVoucherIds(newValues.map((item) => item.id));
+    handleFetchUserIdentificationCodes(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(userIdentificationCodes2);
-    setTransformList(transformListData);
-    setNoApplicableVoucher(noApplicableVoucherData);
-    setProducts(productsData);
+    setUserIdentificationCodes(initialData);
     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,
@@ -345,7 +279,6 @@ var useWalletPass = (props) => {
       onSelectChange == null ? void 0 : onSelectChange(select);
     } else {
       setWalletSelect([]);
-      setSelectedVoucherIds([]);
       notSetWalletSelectRef.current = false;
       onSelectChange == null ? void 0 : onSelectChange([]);
     }
@@ -383,7 +316,7 @@ var useWalletPass = (props) => {
   });
   const handlePaymentStarted = (0, import_ahooks.useMemoizedFn)(
     async (params) => {
-      if (params.paymentMethodCode !== "VOUCHER_BATCH" && Number(customAmount || 0) > 0) {
+      if (params.paymentMethodCode !== "VOUCHER_BATCH") {
         notSetWalletSelectRef.current = true;
         await checkoutModule.initWalletData({
           order_wait_pay_amount: Number(customAmount)
@@ -465,6 +398,14 @@ 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 [
@@ -484,22 +425,33 @@ var useWalletPass = (props) => {
       )
     ).map((item) => item.code);
   });
-  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 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,
+        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_handleFetchUserIdentificationCodes onSelectChange 开始调用",
+        metadata: {}
+      });
+      onSelectChange == null ? void 0 : onSelectChange(select);
+      fetchUserIdentificationCodes({
+        prepare_payments,
+        available: 2,
+        filter_prepare_wallet_pass: 1,
+        other_exact_codes: getOtherExactCodes()
+      });
+    }
+  );
   const handleSearchIdentificationCode = (0, import_ahooks.useMemoizedFn)((value) => {
     return paymentModule.wallet.searchIdentificationCodeAsync({
       code: value,
@@ -509,27 +461,11 @@ var useWalletPass = (props) => {
     });
   });
   const handleSelectWallet = (0, import_ahooks.useMemoizedFn)((value) => {
-    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(
+    const val = userIdentificationCodes.filter(
       (item) => value.includes(item.id)
     );
     setWalletSelect(val);
+    handleFetchUserIdentificationCodes(value);
   });
   const expiredWalletIds = (0, import_react.useMemo)(() => {
     return (0, import_utils.uniqueByKey)(allList, "id").filter(
@@ -547,12 +483,12 @@ var useWalletPass = (props) => {
   }, [allList]);
   const clearAllSelectedWallet = (0, import_ahooks.useMemoizedFn)(() => {
     var _a;
-    if (confirmedEditAmountIdsRef.current.length > 0) {
-      updateWalletDataById(confirmedEditAmountIdsRef.current, {
-        edit_current_amount: void 0
-      });
-      confirmedEditAmountIdsRef.current = [];
-    }
+    logger == null ? void 0 : logger.addLog({
+      type: "info",
+      title: "useWalletPass_clearAllSelectedWallet onSelectChange 开始调用",
+      metadata: {}
+    });
+    onSelectChange == null ? void 0 : onSelectChange([]);
     if (selectedWalletIds.length === 0 && selectedDiscountList.length === 0) {
       return;
     }
@@ -576,14 +512,7 @@ var useWalletPass = (props) => {
       return;
     }
     setWalletSelect([]);
-    setSelectedVoucherIds([]);
-    logger == null ? void 0 : logger.addLog({
-      type: "info",
-      title: "useWalletPass_clearAllSelectedWallet 立即通知外部清空",
-      metadata: {}
-    });
-    onSelectChange == null ? void 0 : onSelectChange([]);
-    setLoading(false);
+    handleFetchUserIdentificationCodes([]);
   });
   const isCurrentSelectionBest = (0, import_ahooks.useMemoizedFn)(() => {
     if (walletRecommendList.length === 0) return true;
@@ -630,9 +559,12 @@ var useWalletPass = (props) => {
             import_utils.locales.getText("wallet-pass-module-already-best-combination")
           );
         } else {
-          const select = searchIdentificationCodeList.filter((item) => (0, import_utils2.getVoucherAvailableStatus)(item));
+          const select = searchIdentificationCodeList.filter((item) => item.unified_available_status);
           setWalletSelect(select);
-          setSelectedVoucherIds(select.map((item) => item.id));
+          handleFetchUserIdentificationCodes(
+            select.map((item) => item.id),
+            select
+          );
           if (select.length) {
             Toast == null ? void 0 : Toast.success(
               import_utils.locales.getText("wallet-pass-module-best-combination-selected")
@@ -661,12 +593,14 @@ var useWalletPass = (props) => {
     } else {
       if (hasGoodPass && !isBestDiscount) return;
       setWalletSelect(newWalletRecommendList);
-      setSelectedVoucherIds(newWalletRecommendList.map((item) => item.id));
+      handleFetchUserIdentificationCodes(
+        newWalletRecommendList.map((item) => item.id),
+        newWalletRecommendList
+      );
       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;
@@ -713,12 +647,6 @@ var useWalletPass = (props) => {
         updateData
       );
       setUserIdentificationCodes(newUserIdentificationCodes);
-      const newTransformList = updateArrayItemById(
-        transformList,
-        targetId,
-        updateData
-      );
-      setTransformList(newTransformList);
       const newSearchIdentificationCodeList = updateArrayItemById(
         searchIdentificationCodeList,
         targetId,
@@ -734,7 +662,6 @@ var useWalletPass = (props) => {
       return {
         newWalletRecommendList,
         newUserIdentificationCodes,
-        newTransformList,
         newSearchIdentificationCodeList,
         newSelectedWallet
       };
@@ -743,21 +670,44 @@ var useWalletPass = (props) => {
   const handleConfirmEditAmount = (0, import_ahooks.useMemoizedFn)(
     (value, id, data2) => {
       if (value === 0) {
-        const filteredIds = selectedVoucherIds.filter(
+        const filteredIds = selectedWalletIds.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;
     }
   );
@@ -782,6 +732,7 @@ var useWalletPass = (props) => {
     selectedDiscountList,
     handleSelectDiscount,
     customerName,
+    fetchWalletRecommendList,
     fetchUserIdentificationCodes,
     getCachedWalletRecommendList,
     getCachedUserIdentificationCodes,

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -301,8 +301,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/WalletPass/index.d.ts

@@ -15,16 +15,11 @@ export interface WalletPassProps {
     walletPass: {
         cards: WalletPassDataType[];
         amount: number;
-        recommended?: WalletPassDataType[];
-        transformList?: WalletPassDataType[];
-        noApplicableVoucher?: WalletPassDataType[];
     };
     walletSetting: {
         name: string;
         popup_status: 0 | 1;
     };
-    orderDetail: any;
-    total_amount: number;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;