@pisell/private-materials 6.3.123 → 6.3.125

package/lib/components/pay/toC/PaymentMethods/WalletPass/index.js

@@ -47,14 +47,10 @@ var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var { Amount } = import_materials.PisellText;
 var WalletPass = (0, import_react.forwardRef)((props, ref) => {
-  var _a, _b, _c, _d, _e, _f;
-  const { onWalletPassChange, walletPass, walletSetting, orderDetail, total_amount } = props;
+  var _a, _b, _c, _d, _e;
+  const { onWalletPassChange, walletPass, walletSetting } = props;
   const context = (0, import_useEngineContext.default)();
-  const { walletPassEvaluator } = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) || {};
-  const { detail } = orderDetail;
-  const isWalletCode = (_e = (_d = (_c = (_b = context == null ? void 0 : context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.businessUtils) == null ? void 0 : _d.getAppByModal) == null ? void 0 : _e.call(_d, "wallet");
-  const { cards: recommended, transformList, noApplicableVoucher } = walletPass;
-  const [selectedVoucherIds, setSelectedVoucherIds] = (0, import_react.useState)([]);
+  const isWalletCode = (_d = (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.businessUtils) == null ? void 0 : _c.getAppByModal) == null ? void 0 : _d.call(_c, "wallet");
   const [currentWalletPass, setCurrentWalletPass] = (0, import_react.useState)(walletPass);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -67,69 +63,78 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     details: []
   });
   const isAutoSelect = (0, import_react.useRef)(false);
+  const listRef = (0, import_react.useRef)(null);
   const searchValRef = (0, import_react.useRef)(null);
   const pinVerifyModalRef = (0, import_react.useRef)(null);
-  const allVouchersForCalculation = (0, import_react.useMemo)(() => {
-    return [...transformList || [], ...addList || []];
-  }, [transformList, addList]);
-  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 || !(order == null ? void 0 : order.total_amount)) {
-      return {
-        displayVouchers: [...transformList || [], ...noApplicableVoucher || []],
-        displayOtherVouchers: addList || [],
-        selectedWithDetails: [],
-        totalDeduction: 0
-      };
-    }
-    if (selectedVouchers.length === 0) {
-      return {
-        displayVouchers: [...transformList || [], ...noApplicableVoucher || []],
-        displayOtherVouchers: addList || [],
-        selectedWithDetails: [],
-        totalDeduction: 0
-      };
-    }
-    const result = walletPassEvaluator.recalculateVouchers(
-      allVouchersForCalculation,
-      selectedVouchers,
-      order.total_amount,
-      detail || []
-    );
-    const currentCustomerVouchers = [];
-    const otherCustomerVouchers = [];
-    result.allWithUpdatedStatus.forEach((voucher) => {
-      if (voucher.customer_id === (order == null ? void 0 : order.customer_id)) {
-        currentCustomerVouchers.push(voucher);
+  const { cards: walletPassSelectCards, amount } = currentWalletPass || {};
+  const [currentCustomerWalletPass, otherCustomerWalletPass] = (0, import_react.useMemo)(() => {
+    const current = [];
+    const other = [];
+    (walletPassSelectCards || []).forEach((item) => {
+      if (item.customer_id === (order == null ? void 0 : order.customer_id)) {
+        current.push(item);
       } else {
-        otherCustomerVouchers.push(voucher);
+        other.push(item);
       }
     });
-    return {
-      displayVouchers: [...currentCustomerVouchers, ...noApplicableVoucher || []],
-      displayOtherVouchers: otherCustomerVouchers,
-      selectedWithDetails: result.selectedWithDetails,
-      totalDeduction: result.selectedWithDetails.reduce((sum, v) => sum + (v.actualDeduction || 0), 0)
-    };
-  }, [selectedVouchers, allVouchersForCalculation, transformList, addList, noApplicableVoucher, order == null ? void 0 : order.total_amount, order == null ? void 0 : order.customer_id, detail, walletPassEvaluator]);
+    return [current, other];
+  }, [walletPassSelectCards, order == null ? void 0 : order.customer_id]);
   const prepare_payments = (0, import_react.useMemo)(() => {
     return (0, import_utils3.formatWalletPassList2PreparePayments)(
       (0, import_utils.uniqueByKey)(
-        (selectedWithDetails || []).concat(searchSelectData.details),
+        (walletPassSelectCards || []).concat(searchSelectData.details),
         "id"
       )
     );
-  }, [selectedWithDetails, searchSelectData]);
+  }, [walletPassSelectCards, searchSelectData]);
   const selectValue = (0, import_react.useMemo)(() => {
-    return selectedVoucherIds;
-  }, [selectedVoucherIds]);
-  (0, import_react.useEffect)(() => {
-    if (recommended && recommended.length > 0) {
-      setSelectedVoucherIds(recommended.map((v) => v.id));
+    return (walletPassSelectCards == null ? void 0 : walletPassSelectCards.map((item) => item.id)) || [];
+  }, [walletPassSelectCards]);
+  const otherCustomerWalletPassList = (0, import_react.useMemo)(() => {
+    return (0, import_utils2.formatMachineCodeServer2CardList)(addList, selectValue);
+  }, [addList, selectValue]);
+  const other_exact_codes = (0, import_react.useMemo)(() => {
+    const codes = [];
+    addList.forEach((item) => {
+      if (!selectValue.includes(item.id)) {
+        codes.push(item.code);
+      }
+    });
+    return codes;
+  }, [addList, selectValue]);
+  const refreshList = (0, import_ahooks.useMemoizedFn)(() => {
+    var _a2, _b2;
+    if ((order == null ? void 0 : order.order_id) && (order == null ? void 0 : order.customer_id)) {
+      (_b2 = listRef.current) == null ? void 0 : _b2.init(
+        {
+          order_id: order.order_id,
+          available: 2,
+          prepare_payments,
+          filter_prepare_wallet_pass: 1,
+          sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
+          other_exact_codes
+        },
+        // 已选择的卡片接口中不会返回，所以追加进入列表
+        (val) => {
+          const idMap = val.reduce((pre, cur) => {
+            return {
+              ...pre,
+              [cur.id]: cur
+            };
+          }, {});
+          setAddList((prevState) => {
+            return prevState.map((item) => {
+              if (idMap[item.id]) {
+                return idMap[item.id];
+              }
+              return item;
+            });
+          });
+          return [...currentCustomerWalletPass || [], ...val];
+        }
+      );
     }
-  }, [recommended]);
+  });
   (0, import_react.useEffect)(() => {
     if ((order == null ? void 0 : order.order_id) && searchValRef.current) {
       searchList(searchValRef.current, true);
@@ -140,16 +145,16 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     setOrder(res);
     setOpen(true);
     setCurrentWalletPass(walletPass);
-    if (recommended && recommended.length > 0) {
-      setSelectedVoucherIds(recommended.map((v) => v.id));
-    }
+    setTimeout(() => {
+      refreshList();
+    });
   };
   const searchList = async ({ code, customer_pin_key }, isSelectChange) => {
     var _a2;
     if (!(order == null ? void 0 : order.order_id)) return;
     setLoading(true);
     try {
-      const baseResult = await (0, import_serve.searchMachineCodeList)({
+      const result = await (0, import_serve.searchMachineCodeList)({
         order_id: order.order_id,
         code,
         prepare_payments,
@@ -157,7 +162,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
         customer_pin_key
       });
-      if (!baseResult) {
+      if (!result) {
         if (!isSelectChange) {
           (0, import_materials.PisellToast)({
             content: import_utils.locales.getText("tocPay.text.walletSearchEmpty")
@@ -168,11 +173,6 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       if (isSelectChange && !searchValRef.current) {
         return;
       }
-      let result = walletPassEvaluator.searchVoucherFormat({
-        vouchers: baseResult,
-        orderTotalAmount: order.total_amount,
-        products: detail
-      });
       setSearchData(
         (0, import_utils2.formatMachineCodeServer2CardList)(
           [...searchSelectData.details, ...result],
@@ -235,23 +235,23 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     });
   };
   const handleSelectOk = () => {
-    const otherCustomerSearchVouchers = searchSelectData.details.filter(
-      (item) => item.customer_id !== (order == null ? void 0 : order.customer_id)
+    changeWalletPass(
+      (0, import_utils.uniqueByKey)(
+        [
+          ...walletPassSelectCards || [],
+          ...searchSelectData.details
+        ],
+        "id"
+      )
     );
     setAddList((prevState) => {
       return (0, import_utils.uniqueByKey)(
-        [...prevState, ...otherCustomerSearchVouchers],
+        [...prevState, ...searchSelectData.details],
         "id"
+      ).filter(
+        (item) => !(order == null ? void 0 : order.customer_id) || item.customer_id !== (order == null ? void 0 : order.customer_id)
       );
     });
-    const newSelectedIds = (0, import_utils.uniqueByKey)(
-      [
-        ...selectedWithDetails || [],
-        ...searchSelectData.details
-      ],
-      "id"
-    ).map((v) => v.id);
-    setSelectedVoucherIds(newSelectedIds);
     handleSearchModalClose();
   };
   const handleAddChange = (0, import_ahooks.useMemoizedFn)(
@@ -263,15 +263,26 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       });
     }
   );
+  const changeWalletPass = (cards) => {
+    setCurrentWalletPass == null ? void 0 : setCurrentWalletPass({
+      cards,
+      amount: (0, import_utils3.calcWalletPassListAmount)(cards)
+    });
+    setTimeout(() => {
+      refreshList();
+    });
+  };
   const handleSelectChange = (val, details, type) => {
-    setSelectedVoucherIds(val);
+    let cards = details.map((item) => item.originData);
+    if (type === "other") {
+      cards = currentCustomerWalletPass.concat(cards);
+    } else if (type === "current") {
+      cards = otherCustomerWalletPass.concat(cards);
+    }
+    changeWalletPass(cards);
   };
   const handleRedeem = () => {
-    onWalletPassChange == null ? void 0 : onWalletPassChange({
-      ...currentWalletPass,
-      cards: selectedWithDetails,
-      amount: totalDeduction
-    });
+    onWalletPassChange == null ? void 0 : onWalletPassChange(currentWalletPass);
     setOpen(false);
   };
   const handleWalletClose = () => {
@@ -296,16 +307,16 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       onCancel: () => handleWalletClose(),
       cancelVisible: false,
       destroyOnClose: true,
-      okText: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.redeem"), " ", /* @__PURE__ */ import_react.default.createElement(Amount, { value: totalDeduction })),
+      okText: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.redeem"), " ", /* @__PURE__ */ import_react.default.createElement(Amount, { value: amount })),
       onOk: handleRedeem
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { marginTop: 24 } }, /* @__PURE__ */ import_react.default.createElement(import_MultiModeSearch.default, { onChange: handleSearch }), /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-pass-modal-multi-selection-available" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-pass-modal-multi-selection-available-title" }, /* @__PURE__ */ import_react.default.createElement(import_icons.InfoCircleOutlined, { className: "wallet-pass-modal-multi-selection-available-title-icon" }), import_utils.locales.getText("tocPay.text.multipleSelectionAvailable")), /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-pass-modal-multi-selection-available-desc" }, import_utils.locales.getText(
       "tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment"
-    )(walletSetting.name))), displayOtherVouchers.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    )(walletSetting.name))), otherCustomerWalletPassList.length > 0 && /* @__PURE__ */ import_react.default.createElement(
       import_List.default,
       {
         walletSetting,
-        data: (0, import_utils2.formatMachineCodeServer2CardList)(displayOtherVouchers, selectValue),
+        data: otherCustomerWalletPassList,
         title: import_utils.locales.getText("tocPay.text.couponCodesAdded"),
         onChange: handleOtherChange,
         value: selectValue,
@@ -318,10 +329,9 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         walletSetting,
         title: walletSetting.name,
         onChange: handleCurrentChange,
-        data: (0, import_utils2.formatMachineCodeServer2CardList)(displayVouchers, selectValue),
+        ref: listRef,
         value: selectValue,
         onLoadingChange: setLoading,
-        loading,
         customer_id: order == null ? void 0 : order.customer_id
       }
     ))
@@ -337,7 +347,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       okText: import_utils.locales.getText("tocPay.text.select"),
       onOk: handleSelectOk,
       okButtonProps: {
-        disabled: ((_f = searchSelectData.ids) == null ? void 0 : _f.length) === 0
+        disabled: ((_e = searchSelectData.ids) == null ? void 0 : _e.length) === 0
       }
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { marginTop: 24 } }, /* @__PURE__ */ import_react.default.createElement(

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

@@ -56,12 +56,6 @@ export declare type WalletPassDataType = {
     metadata?: {
         validity_type: string;
     };
-    /** 前端计算 可用最大金额 */
-    _available_max_amount?: number;
-    /** 前端计算 统一可用状态 */
-    _unified_available_status?: 0 | 1;
-    /** 前端计算 禁用原因 */
-    reason?: string;
 };
 declare type Shop = {
     id: number;

package/lib/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -53,8 +53,8 @@ var formatMachineCodeServer2CardList = (data, selectId = []) => {
       showDetail: false,
       showQrCode: false,
       code: item.code,
-      disabled: (0, import_utils.isNumber)(item._unified_available_status) ? !item._unified_available_status : !item.unified_available_status,
-      disabledReason: (0, import_utils.isNumber)(item._unified_available_status) ? item.reason : (_b = item.unified_messages) == null ? void 0 : _b.title,
+      disabled: !item.unified_available_status,
+      disabledReason: (_b = item.unified_messages) == null ? void 0 : _b.title,
       cover: (_c = item.product) == null ? void 0 : _c.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

package/lib/components/pay/toC/WalletPassBlock/index.js

@@ -166,9 +166,7 @@ var WalletPassBlock = (props, ref) => {
       ref: walletPassRef,
       walletSetting,
       onWalletPassChange,
-      walletPass: payGroup == null ? void 0 : payGroup.walletPass,
-      orderDetail: payGroup == null ? void 0 : payGroup.orderDetail,
-      total_amount: payGroup == null ? void 0 : payGroup.total_amount
+      walletPass: payGroup == null ? void 0 : payGroup.walletPass
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_WalletAvailable.default,

package/lib/components/pay/toC/index.js

@@ -49,7 +49,6 @@ var import_usePaymentLogger = __toESM(require("../../../hooks/usePaymentLogger")
 var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
-var import_serve2 = require("./PaymentMethods/WalletPass/serve");
 var import_utils3 = require("./utils");
 var import_status = require("./status");
 var import_index = require("./index.less");
@@ -170,7 +169,7 @@ var ToCPay = (props, ref) => {
     }
   };
   const _getPaymentsAndWalletPass = async (order) => {
-    var _a2, _b2, _c2;
+    var _a2, _b2;
     paymentLogger.addLog({
       key: "获取支付列表开始",
       value: {
@@ -178,22 +177,11 @@ var ToCPay = (props, ref) => {
       }
     });
     try {
-      const [data, allList, orderBasicDetail] = await Promise.all([
-        (0, import_serve.getPaymentsAndWalletPass)({
-          order_id: order.order_id,
-          total_amount: order.amount,
-          sale_channel: order.sale_channel || "online-store"
-        }),
-        (0, import_serve2.getMachineCodeList)({
-          order_id: order.order_id,
-          available: 2,
-          prepare_payments: [],
-          filter_prepare_wallet_pass: 1,
-          sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
-          other_exact_codes: []
-        }),
-        (0, import_serve.getOrderBasicDetail)(order.order_id)
-      ]);
+      const data = await (0, import_serve.getPaymentsAndWalletPass)({
+        order_id: order.order_id,
+        total_amount: order.amount,
+        sale_channel: order.sale_channel || "online-store"
+      });
       const {
         remain_amount = 0,
         wallet_pass_recommend_list,
@@ -201,60 +189,39 @@ var ToCPay = (props, ref) => {
         payment_list,
         walletPass
       } = data || {};
-      const products = (orderBasicDetail.detail || []).map((item) => {
-        var _a3;
-        return {
-          ...item,
-          is_price_include_tax: orderBasicDetail.is_price_include_tax,
-          product_bundle: (_a3 = item.product_bundle || []) == null ? void 0 : _a3.map((bundle) => {
-            return {
-              ...bundle,
-              is_price_include_tax: orderBasicDetail.is_price_include_tax
-            };
-          })
-        };
-      });
-      const res = utils.walletPassEvaluator.getRecommendedVouchers({
-        orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
-        products,
-        vouchers: allList || []
-      });
-      const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
       paymentLogger.addLog({
         key: "支付数据获取",
         value: ""
       });
-      const waitAmount2 = new import_decimal.Decimal((order == null ? void 0 : order.amount) || 0).minus(new import_decimal.Decimal(recommendedAmount)).toNumber();
+      const withCustomerIdList = (wallet_pass_recommend_list || []).map(
+        (item) => {
+          return {
+            ...item,
+            customer_id: customer_id || item.customer_id
+          };
+        }
+      );
       dispatch({
         type: "setPayGroup",
         payload: {
           // ...state.payGroup,
           order_id: order == null ? void 0 : order.order_id,
           // total_amount: order?.amount,
-          orderDetail: orderBasicDetail,
           // 原订单信息
           _order: order,
           payment_group_id: order == null ? void 0 : order.payment_group_id,
           // 支付方式没有walletPass时walletPass设置null
           walletPass: walletPass ? {
-            ...(_b2 = state.payGroup) == null ? void 0 : _b2.walletPass,
+            ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
             ...walletPass,
-            // 推荐钱包
-            cards: recommended,
-            // 推荐金额
-            amount: recommendedAmount,
-            // 不可用钱包
-            noApplicableVoucher,
-            // 转换列表
-            transformList
-            // amount: wallet_pass_amount,
-            // cards: wallet_pass_recommend_list,
+            amount: wallet_pass_amount,
+            cards: withCustomerIdList
           } : null,
           total_amount: order == null ? void 0 : order.amount,
-          wait_amount: Math.max(0, waitAmount2)
+          wait_amount: remain_amount
         }
       });
-      await ((_c2 = paymentListRef.current) == null ? void 0 : _c2.init(payment_list, remain_amount || 0));
+      await ((_b2 = paymentListRef.current) == null ? void 0 : _b2.init(payment_list, remain_amount || 0));
       setTimeout(() => {
         setLoading(false);
       }, 100);

package/lib/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,6 +29,12 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
     front_order_uuid?: string;
-    orderDetail: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/pay/toC/serve.d.ts

@@ -62,23 +62,6 @@ export declare const getWalletNameAndPopupStatus: (values: {
  * @description: 获取支付结果
  */
 export declare const getPaymentResult: (values: any) => Promise<any>;
-declare type OrderBasicDetail = {
-    id: number;
-    status: string;
-    payment_status: string;
-    order_time: string;
-    detail: any[];
-    product_unpaid_total_pay_amount: number;
-    product_paid_total_pay_amount: number;
-    is_price_include_tax: 1 | 0;
-};
-/**
- * @title: 查询订单基础信息和订单商品信息
- * @description: 查询订单基础信息和订单商品信息
- * @param {string} order_id
- * @return {*}
- */
-export declare const getOrderBasicDetail: (order_id: string) => Promise<OrderBasicDetail>;
 /**
  * @title: 检测订单是否有正在处理中的交易
  * @param {object} values - { order_id: string }
@@ -89,4 +72,3 @@ export declare const checkPendingPayment: (values: {
 }) => Promise<{
     has_pending: boolean;
 }>;
-export {};

package/lib/components/pay/toC/serve.js

@@ -20,7 +20,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   checkPendingPayment: () => checkPendingPayment,
-  getOrderBasicDetail: () => getOrderBasicDetail,
   getPaymentInit: () => getPaymentInit,
   getPaymentList: () => getPaymentList,
   getPaymentResult: () => getPaymentResult,
@@ -79,10 +78,6 @@ var getWalletNameAndPopupStatus = async (values) => {
   return data;
 };
 var getPaymentResult = (values) => import_utils.request.getRequest().get(`/h5/pay/order/payment/result`, values);
-var getOrderBasicDetail = async (order_id) => {
-  const { data } = await import_utils.request.getRequest().get(`/h5/order/order/${order_id}/basic-detail`, {});
-  return data;
-};
 var checkPendingPayment = async (values) => {
   var _a;
   const { data } = await import_utils.request.getRequest().post(`/h5/pay/payment/check`, values);
@@ -94,7 +89,6 @@ var checkPendingPayment = async (values) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkPendingPayment,
-  getOrderBasicDetail,
   getPaymentInit,
   getPaymentList,
   getPaymentResult,

package/lib/components/pay/toC/utils.d.ts

@@ -22,7 +22,7 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
     order_id: string;
     payment_group_id: number;
     payments: {
-        amount: string | number;
+        amount: string;
         wallet_pass_use_value: any;
         voucher_id: any;
         tag: any;
@@ -48,7 +48,7 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
  */
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
-export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string | number;
+export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
 export declare const clientPayment: (params: {
     order_id: number;
     type: "aliPay" | "wxPay" | 'google_pay';

package/lib/components/pay/toC/utils.js

@@ -43,9 +43,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = require("decimal.js");
 var import_status = require("./status");
-var import_utils = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
-var import_utils2 = require("@pisell/utils");
+var import_utils = require("@pisell/utils");
 var calcWalletPassListAmount = (list) => {
   return list.reduce((pre, cur) => pre.add(new import_decimal.Decimal(String(getAvailableMaxAmount(cur) || 0))), new import_decimal.Decimal("0")).toNumber();
 };
@@ -98,9 +97,6 @@ var formatFranchiseeRoute = (url, history) => {
   return url;
 };
 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 clientPayment = (params) => {
@@ -117,7 +113,7 @@ var clientPayment = (params) => {
   });
 };
 var getUniqueIdempotencyToken = () => {
-  return `${(0, import_dayjs.default)().format("YYYYMMDDHHmmssSSS")}-${(0, import_utils2.getUniqueId)()}`;
+  return `${(0, import_dayjs.default)().format("YYYYMMDDHHmmssSSS")}-${(0, import_utils.getUniqueId)()}`;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/shoppingCart/components/Empty/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Empty: (props: any) => import("react").JSX.Element;
 export default Empty;

package/lib/hooks/usePaymentLogger.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/lib/plus/selectHolder/components/ErrorTip/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => import("react").JSX.Element;
 export default ErrorTip;

package/lib/pro/Login2.0/components/phoneValidation.js

@@ -68,7 +68,8 @@ var validatePhoneNumber = async (value, getText) => {
       }
       break;
     case "1":
-      if (!/^\d{10}$/.test(phone)) {
+      const usCanadaReg = /^[2-9]\d{2}[2-9]\d{6}$/;
+      if (!usCanadaReg.test(phone)) {
         throw new Error(getText("pisell-phone-validation-us-canada"));
       }
       break;
@@ -78,7 +79,8 @@ var validatePhoneNumber = async (value, getText) => {
       }
       break;
     case "61":
-      if (!/^(\+?0)?4\d{8}$/.test(phone)) {
+      const auReg = /^0?[2-578]\d{8}$/;
+      if (!auReg.test(phone)) {
         throw new Error(getText("pisell-phone-validation-australia"));
       }
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.123",
+  "version": "6.3.125",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -77,7 +77,7 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.5",
-    "@pisell/materials": "6.3.31",
+    "@pisell/materials": "6.3.27",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.8"
   },