@pisell/private-materials 6.4.50 → 6.4.52

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

@@ -4,13 +4,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { useRef } from 'react';
 import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
+import dayjs from 'dayjs';
 import { useDispatch, updateCustom, updateStatus, updateState } from "../../store";
 import { useFail, useStoreRef } from "../../hooks";
 import { ModeEnum, PayStatus, StatusEnum } from "../../const";
 import { LinklyActionStatus } from "../const";
 
 // 全局超时时间
-var GlobalTimeout = 1000 * 60;
+var GlobalTimeout = 1000 * 60 * 2;
 // 单次请求超时时间
 var RequestTimeout = 1000 * 5;
 export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, handleLinklySuccess) {
@@ -18,7 +19,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
   var _useStoreRef = useStoreRef(),
     numRef = _useStoreRef.numRef,
     modeRef = _useStoreRef.modeRef,
-    deviceRef = _useStoreRef.deviceRef;
+    deviceRef = _useStoreRef.deviceRef,
+    orderIdRef = _useStoreRef.orderIdRef;
   var fail = useFail(0);
   var failRef = useRef(fail);
   var isPay = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay;
@@ -82,22 +84,31 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 console.log('Success: 全局超时或不需要处理结果，终止查询');
                 return;
               }
-              _log("Success", result);
               isQueryFinishedRef.current = true;
               var data = (result === null || result === void 0 ? void 0 : result.data) || {};
               // 交易成功，终止查询
-              if (data.status === 1) {
+              if (data.status == 1) {
                 console.log('交易成功，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u6210\u529F"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 handleLinklySuccess(result);
                 return;
               }
 
               // 交易状态为0，且不需要签名，则继续查询
-              if (data.status !== undefined && (data === null || data === void 0 ? void 0 : data.status) === 0) {
+              if ((data === null || data === void 0 ? void 0 : data.status) == 0 && (data === null || data === void 0 ? void 0 : data.signature_flag) != 1) {
                 console.log('交易状态为0需要继续查询');
+                _log("Querying", result);
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
 
@@ -105,6 +116,13 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               if (data.status < 0) {
                 var _failRef$current;
                 console.log('交易失败，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u5931\u8D25"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 // 交易失败，code码转换为支付失败code码
                 result.code = PayStatus.Unknown;
@@ -113,8 +131,15 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
               }
 
               // 需要签名
-              if (data.signature_flag === 1) {
+              if (data.signature_flag == 1) {
                 console.log('交易需要签名，终止查询');
+                sendWarningLog({
+                  title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u9700\u8981\u7B7E\u540D"),
+                  content: [{
+                    key: 'response',
+                    value: JSON.stringify(result)
+                  }]
+                });
                 reset();
                 gotoSignature();
                 return;
@@ -132,7 +157,20 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
                 _log("AbortError");
                 console.log('Error: 请求被取消，将继续查询');
                 isQueryFinishedRef.current = false;
-                _resultQuery();
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
+                return;
+              }
+
+              // 网关类报错，继续查询
+              if (!(error !== null && error !== void 0 && error.code) || "".concat(error.code) === PayStatus.Timeout) {
+                _log("NetworkError");
+                console.log('Error: 网关类报错，将继续查询');
+                isQueryFinishedRef.current = false;
+                setTimeout(function () {
+                  _resultQuery();
+                }, 1500);
                 return;
               }
               _log("Error", error);
@@ -222,33 +260,36 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
       session_id: numRef.current
     };
     var content = [{
-      key: 'queryId',
-      value: JSON.stringify(queryIdRef.current)
+      key: 'description',
+      value: JSON.stringify({
+        queryId: queryIdRef.current,
+        orderId: orderIdRef.current,
+        type: type,
+        date: dayjs().format('YYYY-MM-DD HH:mm:ss')
+      })
     }, {
       key: 'params',
       value: JSON.stringify(params)
     }];
-    if (type === "Success") {
+    if (type === "Error") {
       content.push({
-        key: 'response',
+        key: 'error',
         value: JSON.stringify(res)
       });
-    } else if (type === "Error") {
+    } else {
       content.push({
-        key: 'error',
+        key: 'response',
         value: JSON.stringify(res)
       });
     }
     sendWarningLog({
-      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u7ED3\u679C\u67E5\u8BE2--").concat(type),
+      title: "Linkly-".concat(isPay ? 'Pay' : 'Refund', "-\u4EA4\u6613\u7ED3\u679C\u8F6E\u8BE2"),
       content: content
     });
   };
   var run = function run() {
     // 重置状态
     reset();
-    console.log('开始查询linkly结果---->>>>>>>');
-    _log("Start");
 
     // 设置全局超时定时器
     globalTimeoutIdRef.current = setTimeout(function () {
@@ -264,6 +305,8 @@ export var useTimeResultQuery = function useTimeResultQuery(api, resultCheck, ha
     startTimeRef.current = Date.now();
     isQueryFinishedRef.current = false;
     queryIdRef.current = getUniqueId();
+    console.log('开始查询linkly结果---->>>>>>>');
+    _log("Start");
     return _resultQuery();
   };
   return {

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

@@ -152,15 +152,15 @@ export var POS = function POS(_ref) {
     controllerRef.current = new AbortController();
     // 支付 or 退款
     var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay(_objectSpread(_objectSpread({}, custom !== null && custom !== 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,
@@ -199,8 +199,8 @@ export var POS = function POS(_ref) {
       if (unloadRef.current || !netRef.current) {
         return;
       }
-      // 支付接口超时 进行支付状态查询
-      if (err && "".concat(err.code) === PayStatus.Timeout) {
+      // 支付接口超时 进行支付状态查询（超时或者其它错误）
+      if (!(err !== null && err !== void 0 && err.code) || "".concat(err.code) === PayStatus.Timeout) {
         checkApi();
         return;
       }

package/es/components/eftposPay/serve.js

@@ -232,7 +232,7 @@ export var linklyPayQuery = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee15$(_context15) {
       while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          return _context15.abrupt("return", request.getRequest().get('/shop/shop/linkly/pay/query', params, config));
+          return _context15.abrupt("return", request.getRequest().get('/shop/linkly/pay/query', params, config));
         case 1:
         case "end":
           return _context15.stop();

package/es/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/es/components/index.js

@@ -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/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -262,7 +262,9 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           }
           return _context3.abrupt("return", defaultReturnParams);
         case 5:
-          displayBox = document.getElementById('threeds-container'); // 创建iframe
+          displayBox = document.getElementById('threeds-container'); // 清空dom中的内容
+          displayBox.innerHTML = '';
+          // 创建iframe
           iframe = document.createElement('iframe'); // iframe.src = "about:blank";
           iframe.classList.add('hidden_TDS_From');
           iframe.name = 'threeDSMethodIframe';
@@ -315,7 +317,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
               }
             }, false);
           }));
-        case 27:
+        case 28:
         case "end":
           return _context3.stop();
       }
@@ -436,7 +438,8 @@ export var checkTDSAuth = /*#__PURE__*/function () {
  */
 export var createChallengeIframe = function createChallengeIframe(challengeData, callback) {
   var displayBox = document.getElementById('threeds-container');
-
+  // 清空dom中的内容
+  displayBox.innerHTML = '';
   // 创建iframe
   var iframe = document.createElement('iframe');
   iframe.classList.add('tdsv2challengeIframe');

package/es/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/es/components/pay/toC/PaymentMethods/WalletPass/index.js

@@ -22,18 +22,22 @@ import { PisellModal, PisellText, PisellToast } from '@pisell/materials';
 import { locales, uniqueByKey } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
 import { InfoCircleOutlined } from '@ant-design/icons';
+import PinVerifyModal from "../../../../pinVerifyModal";
 import MultiModeSearch from "./MultiModeSearch";
 import List from "./List";
-import { searchMachineCodeList } from "./serve";
-import { formatMachineCodeServer2CardList } from "./utils";
+import { searchMachineCodeList, searchWalletCode } from "./serve";
+import { formatMachineCodeServer2CardList, getIsWalletCode } from "./utils";
 import { calcWalletPassListAmount, formatWalletPassList2PreparePayments } from "../../utils";
 import "./index.less";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var Amount = PisellText.Amount;
 var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _searchSelectData$ids;
+  var _context$appHelper, _context$appHelper$ge, _searchSelectData$ids;
   var onWalletPassChange = props.onWalletPassChange,
     walletPass = props.walletPass,
     walletSetting = props.walletSetting;
+  var context = useEngineContext();
+  var isWalletCode = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'wallet');
 
   /** 当前 walletPass信息 弹窗操作时都在内部进行，点击 redeem时同步到外层 */
   var _useState = useState(walletPass),
@@ -87,7 +91,8 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
   var listRef = useRef(null);
 
   /** 当前搜索框搜索值 */
-  var searchValRef = useRef('');
+  var searchValRef = useRef(null);
+  var pinVerifyModalRef = useRef(null);
   var _ref = currentWalletPass || {},
     walletPassSelectCards = _ref.cards,
     amount = _ref.amount;
@@ -207,30 +212,33 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
    * @param val
    */
   var searchList = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(val, isSelectChange) {
-      var _order$_order2;
-      var result;
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3, isSelectChange) {
+      var code, customer_pin_key, _order$_order2, result;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            code = _ref3.code, customer_pin_key = _ref3.customer_pin_key;
             if (order !== null && order !== void 0 && order.order_id) {
-              _context2.next = 2;
+              _context2.next = 3;
               break;
             }
             return _context2.abrupt("return");
-          case 2:
-            _context2.next = 4;
+          case 3:
+            setLoading(true);
+            _context2.prev = 4;
+            _context2.next = 7;
             return searchMachineCodeList({
               order_id: order.order_id,
-              code: val,
+              code: code,
               prepare_payments: prepare_payments,
-              filter_prepare_wallet_pass: 1,
-              sale_channel: ((_order$_order2 = order._order) === null || _order$_order2 === void 0 ? void 0 : _order$_order2.sale_channel) || 'online-store'
+              // filter_prepare_wallet_pass: 1,
+              sale_channel: ((_order$_order2 = order._order) === null || _order$_order2 === void 0 ? void 0 : _order$_order2.sale_channel) || 'online-store',
+              customer_pin_key: customer_pin_key
             });
-          case 4:
+          case 7:
             result = _context2.sent;
             if (result) {
-              _context2.next = 8;
+              _context2.next = 11;
               break;
             }
             if (!isSelectChange) {
@@ -239,7 +247,13 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
               });
             }
             return _context2.abrupt("return");
-          case 8:
+          case 11:
+            if (!(isSelectChange && !searchValRef.current)) {
+              _context2.next = 13;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 13:
             setSearchData(formatMachineCodeServer2CardList([].concat(_toConsumableArray(searchSelectData.details), _toConsumableArray(result)), searchSelectData.ids));
             if (result.length) {
               // 如果搜索结果只有一个并且可用，则直接选中
@@ -250,22 +264,88 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
                 });
               }
               setSearchOpen(true);
-              searchValRef.current = val;
+              searchValRef.current = {
+                code: code,
+                customer_pin_key: customer_pin_key
+              };
             }
-          case 10:
+          case 15:
+            _context2.prev = 15;
+            setLoading(false);
+            return _context2.finish(15);
+          case 18:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[4,, 15, 18]]);
     }));
     return function searchList(_x2, _x3) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var searchWalletCodeFn = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(val) {
+      var _pinVerifyModalRef$cu, result;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            setLoading(true);
+            _context3.prev = 1;
+            _context3.next = 4;
+            return searchWalletCode({
+              code: val,
+              with_customer: 1
+            });
+          case 4:
+            result = _context3.sent;
+            console.log(result, 'result');
+            // 如果搜索不到wallet code则走原始搜索逻辑
+            if (result) {
+              _context3.next = 9;
+              break;
+            }
+            searchList({
+              code: val
+            });
+            return _context3.abrupt("return");
+          case 9:
+            (_pinVerifyModalRef$cu = pinVerifyModalRef.current) === null || _pinVerifyModalRef$cu === void 0 || _pinVerifyModalRef$cu.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
+            });
+            // const pin = await getPin({ wallet_detail_id: result.id });
+            // const pinResult = await verifyPinCode({ wallet_detail_id: result.id, pin: pin.pin });
+            // searchList({ customer_pin_key: pinResult.customer_pin_key });
+            // console.log(pinResult, 'pinResult');
+          case 10:
+            _context3.prev = 10;
+            setLoading(false);
+            return _context3.finish(10);
+          case 13:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[1,, 10, 13]]);
+    }));
+    return function searchWalletCodeFn(_x4) {
+      return _ref5.apply(this, arguments);
     };
   }();
   var handleSearch = useMemoizedFn(function (val) {
     if (!val || searchOpen) return;
     isAutoSelect.current = true;
-    searchList(val);
+
+    // 如果是wallet code 并且安装wallet应用 则搜索wallet code
+    if (getIsWalletCode(val) && isWalletCode) {
+      searchWalletCodeFn(val);
+    } else {
+      searchList({
+        code: val
+      });
+    }
   });
   useImperativeHandle(ref, function () {
     return {
@@ -274,7 +354,7 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var handleSearchModalClose = function handleSearchModalClose() {
     setSearchOpen(false);
-    searchValRef.current = '';
+    searchValRef.current = null;
     setSearchSelectData({
       ids: [],
       details: []
@@ -398,7 +478,15 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     walletSetting: walletSetting,
     data: searchData,
     value: searchSelectData.ids,
-    onChange: handleAddChange
-  }))));
+    onChange: handleAddChange,
+    loading: loading
+  }))), /*#__PURE__*/React.createElement(PinVerifyModal, {
+    ref: pinVerifyModalRef,
+    onSuccess: function onSuccess(params) {
+      searchList({
+        customer_pin_key: params === null || params === void 0 ? void 0 : params.customer_pin_key
+      });
+    }
+  }));
 });
 export default /*#__PURE__*/memo(WalletPass);

package/es/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/es/components/pay/toC/PaymentMethods/WalletPass/serve.js

@@ -111,4 +111,82 @@ export var walletPassPay = /*#__PURE__*/function () {
   return function walletPassPay(_x4) {
     return _ref4.apply(this, arguments);
   };
+}();
+
+/**
+ * 搜索wallet code
+ */
+export var searchWalletCode = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
+    var _yield$request$getReq5, data;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
+          return request.getRequest().post("/h5/wallet/detail/search", params);
+        case 2:
+          _yield$request$getReq5 = _context5.sent;
+          data = _yield$request$getReq5.data;
+          return _context5.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return function searchWalletCode(_x5) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
+/**
+ * 验证pin码
+ */
+export var verifyPinCode = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
+    var _yield$request$getReq6, data;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.next = 2;
+          return request.getRequest().post("/h5/wallet/detail/pin/validate", params);
+        case 2:
+          _yield$request$getReq6 = _context6.sent;
+          data = _yield$request$getReq6.data;
+          return _context6.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return function verifyPinCode(_x6) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+
+/**
+ * 获取pin码
+ */
+export var getPin = /*#__PURE__*/function () {
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
+    var _yield$request$getReq7, data;
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          _context7.next = 2;
+          return request.getRequest().get("/h5/wallet/detail/pin", params);
+        case 2:
+          _yield$request$getReq7 = _context7.sent;
+          data = _yield$request$getReq7.data;
+          return _context7.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
+  return function getPin(_x7) {
+    return _ref7.apply(this, arguments);
+  };
 }();

package/es/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/es/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -38,4 +38,13 @@ export var getDataByIds = function getDataByIds(arr, ids) {
   return arr.filter(function (item) {
     return ids.includes(item.id);
   });
+};
+
+/**
+ * 判断是否是wallet code
+ * @param val 
+ * @returns 
+ */
+export var getIsWalletCode = function getIsWalletCode(val) {
+  return val.startsWith('WL');
 };

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

@@ -41,7 +41,7 @@ export var formatWalletPassParams = function formatWalletPassParams(payGroup) {
   var payments = (walletPass === null || walletPass === void 0 ? void 0 : walletPass.cards.map(function (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