@pisell/private-materials 6.4.50 → 6.4.52

package/lib/components/checkout/components/CashPaymentModule/index.d.ts

@@ -13,10 +13,12 @@ export interface CashPaymentModuleProps {
         roundingDifference: number;
     }>;
     balanceDueAmount?: string;
+    balanceDueTotalAmount?: string;
     syncingLock?: boolean;
 }
 export declare function CashPaymentModule({ amountSymbol, orderInfo, onPaymentComplete, customAmount, amountButtons, // 按钮列表，默认5个推荐金额
 disabled, // 禁用状态
-roundingFunction, balanceDueAmount, // 剩余支付金额
+roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
+balanceDueTotalAmount, // 完整订单剩余待付金额
 syncingLock, }: CashPaymentModuleProps): JSX.Element;
 export default CashPaymentModule;

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

@@ -52,7 +52,9 @@ function CashPaymentModule({
   // 禁用状态
   roundingFunction,
   balanceDueAmount = "0",
-  // 剩余支付金额
+  // 当前阶段剩余支付金额（定金或普通支付）
+  balanceDueTotalAmount = "0",
+  // 完整订单剩余待付金额
   syncingLock = false
   // 是否锁定
 }) {
@@ -71,7 +73,7 @@ function CashPaymentModule({
   };
   (0, import_react.useEffect)(() => {
     handleKeyboardConfirm(customAmount || "");
-  }, [customAmount, balanceDueAmount]);
+  }, [customAmount, balanceDueAmount, orderInfo == null ? void 0 : orderInfo.isDeposit]);
   const isAmountButtonsDisabled = disabled || Number(customAmount || 0) === 0;
   const isInputDisabled = disabled || Number(customAmount || 0) === 0;
   const handleCashPayInternal = () => {
@@ -120,7 +122,8 @@ function CashPaymentModule({
     } else {
       const cleanValue = finalValue.replace(/[$\s]/g, "");
       const numValue = parseFloat(cleanValue);
-      const balanceDue = parseFloat(balanceDueAmount);
+      debugger;
+      const balanceDue = parseFloat((orderInfo == null ? void 0 : orderInfo.isDeposit) ? balanceDueTotalAmount || "0" : balanceDueAmount);
       const shouldApplyRounding = Math.abs(numValue - balanceDue) < 0.01;
       let finalAmount = numValue;
       let roundingDiff = 0;

package/lib/components/eftposPay/linkly/hooks/normal.js

@@ -63,18 +63,18 @@ var useLinklyPayOrRefund = (handleCheck) => {
       content: [{ key: "response", value: JSON.stringify(res) }]
     });
     const status = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.status;
-    if (status === 0) {
+    if (status == 0) {
       numRef.current = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.session_id;
       dispatch((0, import_store.updateState)({ number: numRef.current }));
       dispatch((0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.Cancel }));
       setTimeout(() => {
         var _a2;
         (_a2 = resultQueryRef.current) == null ? void 0 : _a2.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
     dispatch((0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.Empty }));
-    if (status === 1) {
+    if (status == 1) {
       (_c = handleLinklySuccessRef.current) == null ? void 0 : _c.call(handleLinklySuccessRef, res);
       return;
     }

package/lib/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/eftposPay/linkly/hooks/useTimeQuery.ts
@@ -24,15 +34,16 @@ __export(useTimeQuery_exports, {
 module.exports = __toCommonJS(useTimeQuery_exports);
 var import_react = require("react");
 var import_utils = require("@pisell/utils");
+var import_dayjs = __toESM(require("dayjs"));
 var import_store = require("../../store");
 var import_hooks = require("../../hooks");
 var import_const = require("../../const");
 var import_const2 = require("../const");
-var GlobalTimeout = 1e3 * 60;
+var GlobalTimeout = 1e3 * 60 * 2;
 var RequestTimeout = 1e3 * 5;
 var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
   const dispatch = (0, import_store.useDispatch)();
-  const { numRef, modeRef, deviceRef } = (0, import_hooks.useStoreRef)();
+  const { numRef, modeRef, deviceRef, orderIdRef } = (0, import_hooks.useStoreRef)();
   const fail = (0, import_hooks.useFail)(0);
   const failRef = (0, import_react.useRef)(fail);
   const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
@@ -80,30 +91,44 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         console.log("Success: 全局超时或不需要处理结果，终止查询");
         return;
       }
-      _log("Success" /* Success */, result);
       isQueryFinishedRef.current = true;
       const data = (result == null ? void 0 : result.data) || {};
-      if (data.status === 1) {
+      if (data.status == 1) {
         console.log("交易成功，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易成功`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         handleLinklySuccess(result);
         return;
       }
-      if (data.status !== void 0 && (data == null ? void 0 : data.status) === 0) {
+      if ((data == null ? void 0 : data.status) == 0 && (data == null ? void 0 : data.signature_flag) != 1) {
         console.log("交易状态为0需要继续查询");
+        _log("Querying" /* Querying */, result);
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       if (data.status < 0) {
         console.log("交易失败，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易失败`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         result.code = import_const.PayStatus.Unknown;
         (_a2 = failRef.current) == null ? void 0 : _a2.call(failRef, result, false);
         return;
       }
-      if (data.signature_flag === 1) {
+      if (data.signature_flag == 1) {
         console.log("交易需要签名，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易需要签名`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         gotoSignature();
         return;
@@ -120,7 +145,18 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
         _log("AbortError" /* AbortError */);
         console.log("Error: 请求被取消，将继续查询");
         isQueryFinishedRef.current = false;
-        _resultQuery();
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
+        return;
+      }
+      if (!(error == null ? void 0 : error.code) || `${error.code}` === import_const.PayStatus.Timeout) {
+        _log("NetworkError" /* NetworkError */);
+        console.log("Error: 网关类报错，将继续查询");
+        isQueryFinishedRef.current = false;
+        setTimeout(() => {
+          _resultQuery();
+        }, 1500);
         return;
       }
       _log("Error" /* Error */, error);
@@ -185,23 +221,29 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       session_id: numRef.current
     };
     const content = [
-      { key: "queryId", value: JSON.stringify(queryIdRef.current) },
+      {
+        key: "description",
+        value: JSON.stringify({
+          queryId: queryIdRef.current,
+          orderId: orderIdRef.current,
+          type,
+          date: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+        })
+      },
       { key: "params", value: JSON.stringify(params) }
     ];
-    if (type === "Success" /* Success */) {
-      content.push({ key: "response", value: JSON.stringify(res) });
-    } else if (type === "Error" /* Error */) {
+    if (type === "Error" /* Error */) {
       content.push({ key: "error", value: JSON.stringify(res) });
+    } else {
+      content.push({ key: "response", value: JSON.stringify(res) });
     }
     (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-结果查询--${type}`,
+      title: `Linkly-${isPay ? "Pay" : "Refund"}-交易结果轮询`,
       content
     });
   };
   const run = () => {
     reset();
-    console.log("开始查询linkly结果---->>>>>>>");
-    _log("Start" /* Start */);
     globalTimeoutIdRef.current = setTimeout(() => {
       var _a;
       console.log("全局超时，终止所有重试");
@@ -212,6 +254,8 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = (0, import_utils.getUniqueId)();
+    console.log("开始查询linkly结果---->>>>>>>");
+    _log("Start" /* Start */);
     return _resultQuery();
   };
   return { run, stop: reset };

package/lib/components/eftposPay/payo/config.js

@@ -148,15 +148,15 @@ var POS = ({
     const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
       {
         ...(custom == null ? void 0 : custom.platform) ? {
-          "operator_id": custom.operator_id,
-          "operator_type": custom.operator_type,
-          "platform": custom.platform,
-          "custom_payment_id": custom.custom_payment_id,
-          "service_charge": {
-            "amount": payRef.current.surMoney,
-            "percentage": payRef.current.surPercentRate
+          operator_id: custom.operator_id,
+          operator_type: custom.operator_type,
+          platform: custom.platform,
+          custom_payment_id: custom.custom_payment_id,
+          service_charge: {
+            amount: payRef.current.surMoney,
+            percentage: payRef.current.surPercentRate
           },
-          "original_amount": payRef.current.amount
+          original_amount: payRef.current.amount
         } : {},
         order_id: orderIdRef.current,
         amount: payRef.current.total,
@@ -215,7 +215,7 @@ var POS = ({
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      if (err && `${err.code}` === import_const.PayStatus.Timeout) {
+      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
         checkApi();
         return;
       }

package/lib/components/eftposPay/serve.js

@@ -52,7 +52,7 @@ var payData = async (params, config) => import_utils.request.getRequest().post("
 var refundData = async (params, config) => import_utils.request.getRequest().post("/shop/pay/card-reader/refund", params, config);
 var addTransaction = async (params, config) => import_utils.request.getRequest().post("/shop/pay/card-reader/transaction", params, config);
 var editTransaction = async (id, params, config) => import_utils.request.getRequest().put(`/shop/pay/card-reader/transaction/${id}`, params, config);
-var linklyPayQuery = async (params, config) => import_utils.request.getRequest().get("/shop/shop/linkly/pay/query", params, config);
+var linklyPayQuery = async (params, config) => import_utils.request.getRequest().get("/shop/linkly/pay/query", params, config);
 var linklyRefundQuery = async (params, config) => import_utils.request.getRequest().get("/shop/linkly/refund/query", params, config);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/index.d.ts

@@ -17,4 +17,6 @@ import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
 import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController };
+import PinModal from './pinModal';
+import PinVerifyModal from './pinVerifyModal';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };

package/lib/components/index.js

@@ -36,6 +36,8 @@ __export(components_exports, {
   BookingNotes: () => import_notes.default,
   EditBookingModal: () => import_editBookingModal.default,
   Login: () => import_login.default,
+  PinModal: () => import_pinModal.default,
+  PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   RuleSetting: () => import_ruleSetting.default,
@@ -69,6 +71,8 @@ var import_pisellSelectCustomerModal = __toESM(require("./pisellSelectCustomerMo
 var import_subTotal = __toESM(require("./subTotal"));
 var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
 var import_stepController = __toESM(require("./stepController"));
+var import_pinModal = __toESM(require("./pinModal"));
+var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -78,6 +82,8 @@ var import_stepController = __toESM(require("./stepController"));
   BookingNotes,
   EditBookingModal,
   Login,
+  PinModal,
+  PinVerifyModal,
   PisellSelectCustomerModal,
   ProductExtension,
   RuleSetting,

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -171,6 +171,7 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
     return defaultReturnParams;
   }
   const displayBox = document.getElementById("threeds-container");
+  displayBox.innerHTML = "";
   let iframe = document.createElement("iframe");
   iframe.classList.add("hidden_TDS_From");
   iframe.name = "threeDSMethodIframe";
@@ -286,6 +287,7 @@ var checkTDSAuth = async (step2, step3, callback) => {
 };
 var createChallengeIframe = (challengeData, callback) => {
   const displayBox = document.getElementById("threeds-container");
+  displayBox.innerHTML = "";
   let iframe = document.createElement("iframe");
   iframe.classList.add("tdsv2challengeIframe");
   iframe.name = "challengeIframe";

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

@@ -11,6 +11,8 @@ export interface WalletPassListProps {
         name: string;
     };
     onChangeDebounce?: boolean;
+    loading?: boolean;
+    onLoadingChange?: (loading: boolean) => void;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;

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

@@ -37,16 +37,20 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_ahooks = require("ahooks");
 var import_icons = require("@ant-design/icons");
+var import_pinVerifyModal = __toESM(require("../../../../pinVerifyModal"));
 var import_MultiModeSearch = __toESM(require("./MultiModeSearch"));
 var import_List = __toESM(require("./List"));
 var import_serve = require("./serve");
 var import_utils2 = require("./utils");
 var import_utils3 = require("../../utils");
 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;
+  var _a, _b, _c, _d, _e;
   const { onWalletPassChange, walletPass, walletSetting } = props;
+  const context = (0, import_useEngineContext.default)();
+  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);
@@ -60,7 +64,8 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
   });
   const isAutoSelect = (0, import_react.useRef)(false);
   const listRef = (0, import_react.useRef)(null);
-  const searchValRef = (0, import_react.useRef)("");
+  const searchValRef = (0, import_react.useRef)(null);
+  const pinVerifyModalRef = (0, import_react.useRef)(null);
   const { cards: walletPassSelectCards, amount } = currentWalletPass || {};
   const [currentCustomerWalletPass, otherCustomerWalletPass] = (0, import_react.useMemo)(() => {
     const current = [];
@@ -98,9 +103,9 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     return codes;
   }, [addList, selectValue]);
   const refreshList = (0, import_ahooks.useMemoizedFn)(() => {
-    var _a2, _b;
+    var _a2, _b2;
     if ((order == null ? void 0 : order.order_id) && (order == null ? void 0 : order.customer_id)) {
-      (_b = listRef.current) == null ? void 0 : _b.init(
+      (_b2 = listRef.current) == null ? void 0 : _b2.init(
         {
           order_id: order.order_id,
           available: 2,
@@ -146,52 +151,86 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       refreshList();
     });
   };
-  const searchList = async (val, isSelectChange) => {
+  const searchList = async ({ code, customer_pin_key }, isSelectChange) => {
     var _a2;
     if (!(order == null ? void 0 : order.order_id)) return;
-    const result = await (0, import_serve.searchMachineCodeList)({
-      order_id: order.order_id,
-      code: val,
-      prepare_payments,
-      filter_prepare_wallet_pass: 1,
-      sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store"
-    });
-    if (!result) {
-      if (!isSelectChange) {
-        (0, import_materials.PisellToast)({
-          content: import_utils.locales.getText("tocPay.text.walletSearchEmpty")
-        });
+    setLoading(true);
+    try {
+      const result = await (0, import_serve.searchMachineCodeList)({
+        order_id: order.order_id,
+        code,
+        prepare_payments,
+        // filter_prepare_wallet_pass: 1,
+        sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
+        customer_pin_key
+      });
+      if (!result) {
+        if (!isSelectChange) {
+          (0, import_materials.PisellToast)({
+            content: import_utils.locales.getText("tocPay.text.walletSearchEmpty")
+          });
+        }
+        return;
+      }
+      if (isSelectChange && !searchValRef.current) {
+        return;
       }
-      return;
+      setSearchData(
+        (0, import_utils2.formatMachineCodeServer2CardList)(
+          [...searchSelectData.details, ...result],
+          searchSelectData.ids
+        )
+      );
+      if (result.length) {
+        if (result.length === 1 && result[0].unified_available_status && isAutoSelect.current) {
+          setSearchSelectData({
+            ids: [result[0].id],
+            details: result
+          });
+        }
+        setSearchOpen(true);
+        searchValRef.current = { code, customer_pin_key };
+      }
+    } finally {
+      setLoading(false);
     }
-    setSearchData(
-      (0, import_utils2.formatMachineCodeServer2CardList)(
-        [...searchSelectData.details, ...result],
-        searchSelectData.ids
-      )
-    );
-    if (result.length) {
-      if (result.length === 1 && result[0].unified_available_status && isAutoSelect.current) {
-        setSearchSelectData({
-          ids: [result[0].id],
-          details: result
-        });
+  };
+  const searchWalletCodeFn = async (val) => {
+    var _a2;
+    setLoading(true);
+    try {
+      const result = await (0, import_serve.searchWalletCode)({ code: val, with_customer: 1 });
+      console.log(result, "result");
+      if (!result) {
+        searchList({ code: val });
+        return;
       }
-      setSearchOpen(true);
-      searchValRef.current = val;
+      (_a2 = pinVerifyModalRef.current) == null ? void 0 : _a2.open({
+        wallet_code: result.code,
+        wallet_detail_id: result.id,
+        failed_count: result.failed_count,
+        check_max_count: result.check_max_count,
+        customer: result.customer
+      });
+    } finally {
+      setLoading(false);
     }
   };
   const handleSearch = (0, import_ahooks.useMemoizedFn)((val) => {
     if (!val || searchOpen) return;
     isAutoSelect.current = true;
-    searchList(val);
+    if ((0, import_utils2.getIsWalletCode)(val) && isWalletCode) {
+      searchWalletCodeFn(val);
+    } else {
+      searchList({ code: val });
+    }
   });
   (0, import_react.useImperativeHandle)(ref, () => ({
     init
   }));
   const handleSearchModalClose = () => {
     setSearchOpen(false);
-    searchValRef.current = "";
+    searchValRef.current = null;
     setSearchSelectData({
       ids: [],
       details: []
@@ -309,7 +348,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       okText: import_utils.locales.getText("tocPay.text.select"),
       onOk: handleSelectOk,
       okButtonProps: {
-        disabled: ((_a = searchSelectData.ids) == null ? void 0 : _a.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(
@@ -318,9 +357,18 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         walletSetting,
         data: searchData,
         value: searchSelectData.ids,
-        onChange: handleAddChange
+        onChange: handleAddChange,
+        loading
       }
     ))
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_pinVerifyModal.default,
+    {
+      ref: pinVerifyModalRef,
+      onSuccess: (params) => {
+        searchList({ customer_pin_key: params == null ? void 0 : params.customer_pin_key });
+      }
+    }
   ));
 });
 var WalletPass_default = (0, import_react.memo)(WalletPass);

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

@@ -84,14 +84,15 @@ export declare const getRecommendMachineCodeList: (order_id: number) => Promise<
  */
 export declare const searchMachineCodeList: (params: {
     order_id: number | string;
-    code: string;
+    code?: string;
     sale_channel: string;
     prepare_payments: {
         voucher_id: number;
         amount: number;
         tag: string;
     }[];
-    filter_prepare_wallet_pass: 1 | 0;
+    filter_prepare_wallet_pass?: 1 | 0;
+    customer_pin_key?: string;
 }) => Promise<WalletPassDataType[]>;
 /**
  * walletpass支付
@@ -110,4 +111,39 @@ export declare const walletPassPay: (params: {
         };
     }[];
 }) => Promise<WalletPassDataType[]>;
+/**
+ * 搜索wallet code
+ */
+export declare const searchWalletCode: (params: {
+    code: string;
+    with_customer: 1 | 0;
+}) => Promise<{
+    code: string;
+    id: number;
+    status: 'enable' | 'disable' | 'expired';
+    expired_at: string;
+    customer: Record<string, any>;
+    check_max_count: number;
+    failed_count: number;
+}>;
+/**
+ * 验证pin码
+ */
+export declare const verifyPinCode: (params: {
+    wallet_detail_id: number;
+    pin: string;
+}) => Promise<{
+    status: number;
+    customer_id: number;
+    msg: string;
+    customer_pin_key: string;
+}>;
+/**
+ * 获取pin码
+ */
+export declare const getPin: (params: {
+    wallet_detail_id: number;
+}) => Promise<{
+    pin: string;
+}>;
 export {};

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

@@ -20,8 +20,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   getMachineCodeList: () => getMachineCodeList,
+  getPin: () => getPin,
   getRecommendMachineCodeList: () => getRecommendMachineCodeList,
   searchMachineCodeList: () => searchMachineCodeList,
+  searchWalletCode: () => searchWalletCode,
+  verifyPinCode: () => verifyPinCode,
   walletPassPay: () => walletPassPay
 });
 module.exports = __toCommonJS(serve_exports);
@@ -45,10 +48,25 @@ var walletPassPay = async (params) => {
   const { data } = await import_utils.request.getRequest().post(`/h5/pay/order/wallet-pass-pay/${order_id}`, others);
   return data;
 };
+var searchWalletCode = async (params) => {
+  const { data } = await import_utils.request.getRequest().post(`/h5/wallet/detail/search`, params);
+  return data;
+};
+var verifyPinCode = async (params) => {
+  const { data } = await import_utils.request.getRequest().post(`/h5/wallet/detail/pin/validate`, params);
+  return data;
+};
+var getPin = async (params) => {
+  const { data } = await import_utils.request.getRequest().get(`/h5/wallet/detail/pin`, params);
+  return data;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getMachineCodeList,
+  getPin,
   getRecommendMachineCodeList,
   searchMachineCodeList,
+  searchWalletCode,
+  verifyPinCode,
   walletPassPay
 });

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

@@ -1,3 +1,9 @@
 import { WalletPassDataType } from './serve';
 export declare const formatMachineCodeServer2CardList: (data: WalletPassDataType[], selectId?: number[]) => any;
 export declare const getDataByIds: (arr: any[], ids: number[]) => any[];
+/**
+ * 判断是否是wallet code
+ * @param val
+ * @returns
+ */
+export declare const getIsWalletCode: (val: string) => boolean;

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

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   formatMachineCodeServer2CardList: () => formatMachineCodeServer2CardList,
-  getDataByIds: () => getDataByIds
+  getDataByIds: () => getDataByIds,
+  getIsWalletCode: () => getIsWalletCode
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
@@ -64,8 +65,12 @@ var formatMachineCodeServer2CardList = (data, selectId = []) => {
 var getDataByIds = (arr, ids) => {
   return arr.filter((item) => ids.includes(item.id));
 };
+var getIsWalletCode = (val) => {
+  return val.startsWith("WL");
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatMachineCodeServer2CardList,
-  getDataByIds
+  getDataByIds,
+  getIsWalletCode
 });

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

@@ -49,7 +49,7 @@ var formatWalletPassParams = (payGroup) => {
   const payments = (walletPass == null ? void 0 : walletPass.cards.map((item) => {
     return {
       amount: getAvailableMaxAmount(item),
-      wallet_pass_use_value: item.available_max_par_value,
+      wallet_pass_use_value: item.recommended_usage_par_value,
       voucher_id: item.id,
       tag: item.tag,
       wallet_pass_usage_unit: item.wallet_pass_usage_unit