@pisell/private-materials 6.3.125 → 6.3.127

package/es/components/pay/toC/PaymentMethods/SuperPayWxPayH5/index.js

@@ -37,8 +37,9 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
     open = _useState2[0],
     setOpen = _useState2[1];
   var context = useEngineContext();
-  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
-    interaction = _context$appHelper$ut.interaction;
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    interaction = _ref.interaction,
+    token = _ref.token;
 
   // SuperPayWxPayH5支付日志记录器
   var paymentLogger = usePaymentLogger({
@@ -55,13 +56,13 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
    * @Date: 2024-08-16 11:19
    */
   var init = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var _interaction$utils, _interaction$utils$is;
-      var payGroup, values, data;
+      var payGroup, values, data, _token$get;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            payGroup = _ref.payGroup;
+            payGroup = _ref2.payGroup;
             // 记录SuperPayWxPayH5初始化开始
             paymentLogger.addLog({
               key: 'SuperPayWxPayH5初始化开始',
@@ -116,43 +117,47 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
             return getWxPayUrl(payGroup.order_id, values);
           case 17:
             data = _context.sent;
-            if (data !== null && data !== void 0 && data.pay_url) {
-              // 记录获取微信支付链接成功
-              paymentLogger.addLog({
-                key: 'SuperPayWxPayH5获取支付链接成功',
-                value: ""
-              });
-
-              // 设置交易号
-              setPayNumber(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, data === null || data === void 0 ? void 0 : data.pay_number);
-
-              // 记录即将跳转到微信支付
-              paymentLogger.addLog({
-                key: 'SuperPayWxPayH5准备跳转微信支付',
-                value: ""
-              });
-              paymentLogger.sendLogs('SuperPayWxPayH5跳转成功');
+            if (!(data !== null && data !== void 0 && data.pay_url)) {
+              _context.next = 27;
+              break;
+            }
+            // 记录获取微信支付链接成功
+            paymentLogger.addLog({
+              key: 'SuperPayWxPayH5获取支付链接成功',
+              value: ""
+            });
+            _context.next = 22;
+            return setPayNumber(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, data === null || data === void 0 ? void 0 : data.pay_number, token === null || token === void 0 || (_token$get = token.get) === null || _token$get === void 0 ? void 0 : _token$get.call(token));
+          case 22:
+            // 记录即将跳转到微信支付
+            paymentLogger.addLog({
+              key: 'SuperPayWxPayH5准备跳转微信支付',
+              value: ""
+            });
+            paymentLogger.sendLogs('SuperPayWxPayH5跳转成功');
 
-              // 跳转支付
-              window.location.href = data === null || data === void 0 ? void 0 : data.pay_url;
-            } else {
-              // 记录支付链接为空
-              paymentLogger.addLog({
-                key: 'SuperPayWxPayH5支付链接为空',
-                value: {
-                  title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u5FAE\u4FE1\u652F\u4ED8\u94FE\u63A5\u4E3A\u7A7A"),
-                  data: {
-                    response_data: data
-                  }
+            // 跳转支付
+            window.location.href = data === null || data === void 0 ? void 0 : data.pay_url;
+            _context.next = 30;
+            break;
+          case 27:
+            // 记录支付链接为空
+            paymentLogger.addLog({
+              key: 'SuperPayWxPayH5支付链接为空',
+              value: {
+                title: "\u8BA2\u5355".concat(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, " \u5FAE\u4FE1\u652F\u4ED8\u94FE\u63A5\u4E3A\u7A7A"),
+                data: {
+                  response_data: data
                 }
-              });
-              paymentLogger.sendLogs('SuperPayWxPayH5支付链接为空');
-              setOpen(false);
-            }
-            _context.next = 26;
+              }
+            });
+            paymentLogger.sendLogs('SuperPayWxPayH5支付链接为空');
+            setOpen(false);
+          case 30:
+            _context.next = 37;
             break;
-          case 21:
-            _context.prev = 21;
+          case 32:
+            _context.prev = 32;
             _context.t0 = _context["catch"](14);
             // 记录SuperPayWxPayH5处理错误
             paymentLogger.addLog({
@@ -167,14 +172,14 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
             });
             paymentLogger.sendLogs('SuperPayWxPayH5处理失败', _context.t0);
             setOpen(false);
-          case 26:
+          case 37:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[14, 21]]);
+      }, _callee, null, [[14, 32]]);
     }));
     return function init(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useImperativeHandle(ref, function () {

package/es/components/pay/toC/PaymentMethods/WalletPass/MultiModeSearch/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 export interface MultiModeSearchProps {
     onChange: (val: string) => void;
 }
-declare const _default: React.MemoExoticComponent<(props: MultiModeSearchProps) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: MultiModeSearchProps) => JSX.Element>;
 export default _default;

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

@@ -26,7 +26,7 @@ import PinVerifyModal from "../../../../pinVerifyModal";
 import MultiModeSearch from "./MultiModeSearch";
 import List from "./List";
 import { searchMachineCodeList, searchWalletCode } from "./serve";
-import { formatMachineCodeServer2CardList, getIsWalletCode } from "./utils";
+import { formatMachineCodeServer2CardList, formatWalletPassWithUniquePaymentNumber, getIsWalletCode } from "./utils";
 import { calcWalletPassListAmount, formatWalletPassList2PreparePayments } from "../../utils";
 import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
@@ -398,7 +398,7 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     changeWalletPass(cards);
   };
   var handleRedeem = function handleRedeem() {
-    onWalletPassChange === null || onWalletPassChange === void 0 || onWalletPassChange(currentWalletPass);
+    onWalletPassChange === null || onWalletPassChange === void 0 || onWalletPassChange(formatWalletPassWithUniquePaymentNumber(currentWalletPass));
     setOpen(false);
   };
   var handleWalletClose = function handleWalletClose() {

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

@@ -7,3 +7,10 @@ export declare const getDataByIds: (arr: any[], ids: number[]) => any[];
  * @returns
  */
 export declare const getIsWalletCode: (val: string) => boolean;
+export declare const formatWalletPassWithUniquePaymentNumber: (currentWalletPass: {
+    cards: any[];
+    amount: number;
+}) => {
+    cards: any[];
+    amount: number;
+};

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

@@ -1,4 +1,10 @@
-import { formatDate, locales } from '@pisell/utils';
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { formatDate, locales, getUniqueId } from '@pisell/utils';
 import { globalConfig } from '@pisell/materials';
 import { getAvailableMaxAmount } from "../../utils";
 var voucherTime = function voucherTime(data) {
@@ -49,4 +55,15 @@ export var getDataByIds = function getDataByIds(arr, ids) {
  */
 export var getIsWalletCode = function getIsWalletCode(val) {
   return val.startsWith('WL');
+};
+export var formatWalletPassWithUniquePaymentNumber = function formatWalletPassWithUniquePaymentNumber(currentWalletPass) {
+  return _objectSpread(_objectSpread({}, currentWalletPass), {}, {
+    cards: ((currentWalletPass === null || currentWalletPass === void 0 ? void 0 : currentWalletPass.cards) || []).map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        metadata: _objectSpread(_objectSpread({}, item.metadata || {}), {}, {
+          unique_payment_number: getUniqueId()
+        })
+      });
+    })
+  });
 };

package/es/components/pay/toC/PaymentMethods/index.js

@@ -18,7 +18,7 @@ import CustomPayment from "./CustomPayment";
 import { isCustomPayment } from "../PaymentList/status";
 import CashManual from "./CashManual";
 import GooglePay from "./GooglePay";
-import { removePayGroupFromStorage, setPayNumber, syncPayGroupToStorage } from "../payGroup";
+import { clearStashPayGroup, removePayGroupFromStorage, setPayNumber, syncPayGroupToStorage } from "../payGroup";
 import ApplePay from "./ApplePay";
 import GlobePayAliPayH5 from "./GlobePayAliPayH5";
 import GlobePayPaypalH5 from "./GlobePayPaypalH5";
@@ -51,8 +51,9 @@ var PaymentMethods = function PaymentMethods(props, ref) {
   var GlobePayWxH5Ref = useRef(null);
   var GlobePayQrcodeRef = useRef(null);
   var context = useEngineContext();
-  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
-    interaction = _context$appHelper$ut.interaction;
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    interaction = _ref.interaction,
+    token = _ref.token;
 
   // 获取店铺名称，用于信用卡授权说明文案
   var dvaStore = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getStore) === null || _context$appHelper2$g === void 0 || (_context$appHelper2$g = _context$appHelper2$g.call(_context$appHelper2)) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.getState();
@@ -61,13 +62,13 @@ var PaymentMethods = function PaymentMethods(props, ref) {
   var shopPhone = (shop === null || shop === void 0 ? void 0 : shop.phone) || '';
   var shopEmail = (shop === null || shop === void 0 ? void 0 : shop.contact_email) || '';
   var init = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var _payGroup$walletPass;
       var type, payGroup, waitAmount, cards;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            type = _ref.type, payGroup = _ref.payGroup;
+            type = _ref2.type, payGroup = _ref2.payGroup;
             waitAmount = (payGroup === null || payGroup === void 0 ? void 0 : payGroup.wait_amount) || 0;
             cards = payGroup === null || payGroup === void 0 || (_payGroup$walletPass = payGroup.walletPass) === null || _payGroup$walletPass === void 0 || (_payGroup$walletPass = _payGroup$walletPass.cards) === null || _payGroup$walletPass === void 0 ? void 0 : _payGroup$walletPass.length;
             sendWarningLog({
@@ -89,13 +90,16 @@ var PaymentMethods = function PaymentMethods(props, ref) {
 
             // 仅选择钱包 并且当前选择的支付方式是 线下支付|自定义支付|银行转账, 前置支付钱包
             if (!(cards && (waitAmount <= 0 || isOfflinePayment(type)))) {
-              _context.next = 15;
+              _context.next = 17;
               break;
             }
             _context.prev = 5;
             _context.next = 8;
             return walletPassPay(formatWalletPassParams(payGroup));
           case 8:
+            _context.next = 10;
+            return clearStashPayGroup(payGroup.order_id);
+          case 10:
             // 支付成功后 清空卡片
             syncPayGroupToStorage(_objectSpread(_objectSpread({}, payGroup), {}, {
               walletPass: _objectSpread(_objectSpread({}, payGroup.walletPass), {}, {
@@ -103,10 +107,10 @@ var PaymentMethods = function PaymentMethods(props, ref) {
                 paid: true
               })
             }));
-            _context.next = 15;
+            _context.next = 17;
             break;
-          case 11:
-            _context.prev = 11;
+          case 13:
+            _context.prev = 13;
             _context.t0 = _context["catch"](5);
             sendWarningLog({
               title: '钱包支付失败 catch',
@@ -131,47 +135,54 @@ var PaymentMethods = function PaymentMethods(props, ref) {
                 fn: 'init'
               }
             }));
-          case 15:
+          case 17:
             if (!(waitAmount <= 0)) {
-              _context.next = 18;
+              _context.next = 29;
               break;
             }
-            try {
-              // 清空交易组
-              removePayGroupFromStorage(payGroup.order_id);
-              props.payCallback({
-                key: 'success'
-              });
-            } catch (err) {
-              sendWarningLog({
-                title: '跳转成功页面 catch',
-                content: [{
-                  key: '错误信息',
-                  value: (err === null || err === void 0 ? void 0 : err.message) || '未知错误'
-                }, {
-                  key: '错误堆栈',
-                  value: (err === null || err === void 0 ? void 0 : err.stack) || '无堆栈信息'
-                }, {
-                  key: '错误类型',
-                  value: (err === null || err === void 0 ? void 0 : err.name) || '未知错误类型'
-                }]
-              });
-            }
+            _context.prev = 18;
+            // 清空交易组
+            removePayGroupFromStorage(payGroup.order_id);
+            _context.next = 22;
+            return clearStashPayGroup(payGroup.order_id);
+          case 22:
+            props.payCallback({
+              key: 'success'
+            });
+            _context.next = 28;
+            break;
+          case 25:
+            _context.prev = 25;
+            _context.t1 = _context["catch"](18);
+            sendWarningLog({
+              title: '跳转成功页面 catch',
+              content: [{
+                key: '错误信息',
+                value: (_context.t1 === null || _context.t1 === void 0 ? void 0 : _context.t1.message) || '未知错误'
+              }, {
+                key: '错误堆栈',
+                value: (_context.t1 === null || _context.t1 === void 0 ? void 0 : _context.t1.stack) || '无堆栈信息'
+              }, {
+                key: '错误类型',
+                value: (_context.t1 === null || _context.t1 === void 0 ? void 0 : _context.t1.name) || '未知错误类型'
+              }]
+            });
+          case 28:
             return _context.abrupt("return");
-          case 18:
-            _context.next = 20;
+          case 29:
+            _context.next = 31;
             return onPayByType({
               type: type,
               payGroup: payGroup
             });
-          case 20:
+          case 31:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 11]]);
+      }, _callee, null, [[5, 13], [18, 25]]);
     }));
     return function init(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils), interaction, context);
@@ -186,182 +197,197 @@ var PaymentMethods = function PaymentMethods(props, ref) {
         var type = result.type,
           pay_number = result.pay_number,
           order_id = result.order_id;
-        if (type && order_id && pay_number) {
-          setPayNumber(order_id, pay_number);
-        }
-        props.payCallback({
-          key: 'success'
-        });
+        void _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          var _token$get;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                if (!(type && order_id && pay_number)) {
+                  _context2.next = 3;
+                  break;
+                }
+                _context2.next = 3;
+                return setPayNumber(order_id, pay_number, token === null || token === void 0 || (_token$get = token.get) === null || _token$get === void 0 ? void 0 : _token$get.call(token));
+              case 3:
+                props.payCallback({
+                  key: 'success'
+                });
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }))();
       });
     }
   }, []);
   var onPayByType = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref5) {
       var type, payGroup, _ApplePayRef$current, _GooglePayRef$current, _MWCreditCardRef$curr, _SuperPayAliPayH5Ref$, _SuperPayWxPayH5Ref$c, _StripePayRef$current, _OfflinePaymentRef$cu, _BankDepositRef$curre, _CashManualRef$curren, _GlobePayAliPayH5Ref$, _GlobePayPaypalH5Ref$, _GlobePayWxH5Ref$curr, _GlobePayQrcodeRef$cu, _CustomPaymentRef$cur;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            type = _ref3.type, payGroup = _ref3.payGroup;
+            type = _ref5.type, payGroup = _ref5.payGroup;
             console.log(type, payGroup);
 
             // 苹果支付
             if (!(type === 'mw.apple')) {
-              _context2.next = 6;
+              _context3.next = 6;
               break;
             }
-            _context2.next = 5;
+            _context3.next = 5;
             return (_ApplePayRef$current = ApplePayRef.current) === null || _ApplePayRef$current === void 0 ? void 0 : _ApplePayRef$current.init({
               payGroup: payGroup
             });
           case 5:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 6:
             if (!(type === 'mw.google')) {
-              _context2.next = 10;
+              _context3.next = 10;
               break;
             }
-            _context2.next = 9;
+            _context3.next = 9;
             return (_GooglePayRef$current = GooglePayRef.current) === null || _GooglePayRef$current === void 0 ? void 0 : _GooglePayRef$current.init({
               payGroup: payGroup
             });
           case 9:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 10:
             if (!(type === 'mw.credit_card')) {
-              _context2.next = 13;
+              _context3.next = 13;
               break;
             }
             (_MWCreditCardRef$curr = MWCreditCardRef.current) === null || _MWCreditCardRef$curr === void 0 || _MWCreditCardRef$curr.init({
               payGroup: payGroup
             });
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 13:
             if (!(type === 'superpay.alipay.h5')) {
-              _context2.next = 17;
+              _context3.next = 17;
               break;
             }
-            _context2.next = 16;
+            _context3.next = 16;
             return (_SuperPayAliPayH5Ref$ = SuperPayAliPayH5Ref.current) === null || _SuperPayAliPayH5Ref$ === void 0 ? void 0 : _SuperPayAliPayH5Ref$.init({
               payGroup: payGroup
             });
           case 16:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 17:
             if (!(type === 'superpay.wechat.h5')) {
-              _context2.next = 21;
+              _context3.next = 21;
               break;
             }
-            _context2.next = 20;
+            _context3.next = 20;
             return (_SuperPayWxPayH5Ref$c = SuperPayWxPayH5Ref.current) === null || _SuperPayWxPayH5Ref$c === void 0 ? void 0 : _SuperPayWxPayH5Ref$c.init({
               payGroup: payGroup
             });
           case 20:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 21:
             if (!(type === 'stripe')) {
-              _context2.next = 24;
+              _context3.next = 24;
               break;
             }
             (_StripePayRef$current = StripePayRef.current) === null || _StripePayRef$current === void 0 || _StripePayRef$current.init({
               payGroup: payGroup
             });
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 24:
             if (!(type === 'pisell.offline_payment')) {
-              _context2.next = 28;
+              _context3.next = 28;
               break;
             }
-            _context2.next = 27;
+            _context3.next = 27;
             return (_OfflinePaymentRef$cu = OfflinePaymentRef.current) === null || _OfflinePaymentRef$cu === void 0 ? void 0 : _OfflinePaymentRef$cu.init({
               payGroup: payGroup
             });
           case 27:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 28:
             if (!(type === 'pisell.bank_deposit')) {
-              _context2.next = 32;
+              _context3.next = 32;
               break;
             }
-            _context2.next = 31;
+            _context3.next = 31;
             return (_BankDepositRef$curre = BankDepositRef.current) === null || _BankDepositRef$curre === void 0 ? void 0 : _BankDepositRef$curre.init({
               payGroup: payGroup
             });
           case 31:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 32:
             if (!(type === 'pisell.other.cashmanual')) {
-              _context2.next = 36;
+              _context3.next = 36;
               break;
             }
-            _context2.next = 35;
+            _context3.next = 35;
             return (_CashManualRef$curren = CashManualRef.current) === null || _CashManualRef$curren === void 0 ? void 0 : _CashManualRef$curren.init({
               payGroup: payGroup
             });
           case 35:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 36:
             if (!(type === 'globepay.alipay.h5')) {
-              _context2.next = 40;
+              _context3.next = 40;
               break;
             }
-            _context2.next = 39;
+            _context3.next = 39;
             return (_GlobePayAliPayH5Ref$ = GlobePayAliPayH5Ref.current) === null || _GlobePayAliPayH5Ref$ === void 0 ? void 0 : _GlobePayAliPayH5Ref$.init({
               payGroup: payGroup
             });
           case 39:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 40:
             if (!(type === 'globepay.paypal.h5')) {
-              _context2.next = 44;
+              _context3.next = 44;
               break;
             }
-            _context2.next = 43;
+            _context3.next = 43;
             return (_GlobePayPaypalH5Ref$ = GlobePayPaypalH5Ref.current) === null || _GlobePayPaypalH5Ref$ === void 0 ? void 0 : _GlobePayPaypalH5Ref$.init({
               payGroup: payGroup
             });
           case 43:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 44:
             if (!(type === 'globepay.wechat.jsapi')) {
-              _context2.next = 48;
+              _context3.next = 48;
               break;
             }
-            _context2.next = 47;
+            _context3.next = 47;
             return (_GlobePayWxH5Ref$curr = GlobePayWxH5Ref.current) === null || _GlobePayWxH5Ref$curr === void 0 ? void 0 : _GlobePayWxH5Ref$curr.init({
               payGroup: payGroup
             });
           case 47:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 48:
             if (!(type === 'globepay.alipay.qrcode' || type === 'globepay.wechat.qrcode')) {
-              _context2.next = 52;
+              _context3.next = 52;
               break;
             }
-            _context2.next = 51;
+            _context3.next = 51;
             return (_GlobePayQrcodeRef$cu = GlobePayQrcodeRef.current) === null || _GlobePayQrcodeRef$cu === void 0 ? void 0 : _GlobePayQrcodeRef$cu.init({
               payGroup: payGroup
             });
           case 51:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 52:
             if (!isCustomPayment(type)) {
-              _context2.next = 56;
+              _context3.next = 56;
               break;
             }
-            _context2.next = 55;
+            _context3.next = 55;
             return (_CustomPaymentRef$cur = CustomPaymentRef.current) === null || _CustomPaymentRef$cur === void 0 ? void 0 : _CustomPaymentRef$cur.init({
               payGroup: payGroup
             });
           case 55:
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 56:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function onPayByType(_x2) {
-      return _ref4.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   useImperativeHandle(ref, function () {

package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,8 +1,8 @@
-import React from 'react';
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {
     walletPass: WalletPassDataType[];
 }
-declare const WalletUseList: (props: WalletUseListProps) => React.JSX.Element;
+declare const WalletUseList: (props: WalletUseListProps) => JSX.Element;
 export default WalletUseList;

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

@@ -313,7 +313,10 @@ var ToCPay = function ToCPay(props, ref) {
             });
             withCustomerIdList = (wallet_pass_recommend_list || []).map(function (item) {
               return _objectSpread(_objectSpread({}, item), {}, {
-                customer_id: customer_id || item.customer_id
+                customer_id: customer_id || item.customer_id,
+                metadata: _objectSpread(_objectSpread({}, item.metadata || {}), {}, {
+                  unique_payment_number: getUniqueId()
+                })
               });
             }); // 设置交易组
             dispatch({