@pisell/private-materials 6.3.126 → 6.3.127

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";
@@ -35,7 +35,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
   return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
 };
 var PaymentMethods = function PaymentMethods(props, ref) {
-  var _context$appHelper, _interaction$utils, _interaction$utils$is;
+  var _context$appHelper, _context$appHelper2, _context$appHelper2$g, _dvaStore$core, _interaction$utils, _interaction$utils$is;
   var MWCreditCardRef = useRef(null);
   var SuperPayAliPayH5Ref = useRef(null);
   var StripePayRef = useRef(null);
@@ -51,16 +51,24 @@ 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();
+  var shop = (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 || (_dvaStore$core = _dvaStore$core.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.shop) || {};
+  var shopName = (shop === null || shop === void 0 ? void 0 : shop.name) || '';
+  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({
@@ -82,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), {}, {
@@ -96,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',
@@ -124,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);
@@ -179,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 () {
@@ -365,7 +398,10 @@ var PaymentMethods = function PaymentMethods(props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: ""
   }, /*#__PURE__*/React.createElement(MWCreditCard, {
-    ref: MWCreditCardRef
+    ref: MWCreditCardRef,
+    shopName: shopName,
+    shopPhone: shopPhone,
+    shopEmail: shopEmail
   }), /*#__PURE__*/React.createElement(SuperPayAliPayH5, {
     ref: SuperPayAliPayH5Ref
   }), /*#__PURE__*/React.createElement(StripePay, {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

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

@@ -23,7 +23,7 @@ import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
 import PaymentList from "./PaymentList";
 import PaymentMethods from "./PaymentMethods";
-import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus } from "./serve";
+import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus, checkPendingPayment } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../hooks/usePaymentLogger";
@@ -91,6 +91,11 @@ var ToCPay = function ToCPay(props, ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     showDetectIncognitoConfirm = _useState12[0],
     setShowDetectIncognitoConfirm = _useState12[1];
+  // 正在处理中的交易提示
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    showPendingPayment = _useState14[0],
+    setShowPendingPayment = _useState14[1];
   // lowCode utils
   var utils = context.appHelper.utils || {};
   // stope
@@ -121,7 +126,7 @@ var ToCPay = function ToCPay(props, ref) {
       payload: _objectSpread(_objectSpread({}, initProps), {}, {
         status: 'init',
         // 将支付回调储存在store, 方便其他模块调用
-        payCallback: props.callback,
+        payCallback: payCallback,
         history: (_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.history,
         front_order_uuid: getUniqueId('front_order_uuid_')
         // 支付组
@@ -187,7 +192,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(initProps) {
-      var renderType, _initProps$order2;
+      var renderType, _initProps$order2, _yield$checkPendingPa, has_pending, _initProps$order3, _initProps$order4;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -198,15 +203,31 @@ var ToCPay = function ToCPay(props, ref) {
             });
             _context2.prev = 2;
             setRenderType(renderType !== null && renderType !== void 0 ? renderType : 'modal');
-            // 打开弹窗
+            // 立即打开弹窗并展示 loading，给用户即时反馈
             setOpen(true);
-
-            // 关闭选择支付方式的loading
             setSubmitLoading(false);
-
-            // 打开加载的loading
             setLoading(true);
 
+            // 检测订单是否有正在处理中的交易
+            _context2.next = 9;
+            return checkPendingPayment({
+              order_id: (_initProps$order2 = initProps.order) === null || _initProps$order2 === void 0 ? void 0 : _initProps$order2.order_id
+            });
+          case 9:
+            _yield$checkPendingPa = _context2.sent;
+            has_pending = _yield$checkPendingPa.has_pending;
+            if (!has_pending) {
+              _context2.next = 16;
+              break;
+            }
+            paymentLogger.addLog({
+              key: '检测到处理中的交易',
+              value: "\u8BA2\u5355".concat((_initProps$order3 = initProps.order) === null || _initProps$order3 === void 0 ? void 0 : _initProps$order3.order_id, " \u5B58\u5728\u5904\u7406\u4E2D\u7684\u4EA4\u6613\uFF0C\u4E2D\u65AD\u652F\u4ED8\u6D41\u7A0B")
+            });
+            setLoading(false);
+            setShowPendingPayment(true);
+            return _context2.abrupt("return");
+          case 16:
             // 1. 初始化store
             _initStore(initProps);
 
@@ -214,39 +235,41 @@ var ToCPay = function ToCPay(props, ref) {
             removePayGroupFromStorage(initProps.order.order_id);
 
             // 获取支付列表和钱包
-            _context2.next = 11;
+            _context2.next = 20;
             return _getPaymentsAndWalletPass(initProps.order);
-          case 11:
-            _context2.next = 13;
+          case 20:
+            _context2.next = 22;
             return getWalletSetting(initProps);
-          case 13:
+          case 22:
             // 记录初始化成功
             paymentLogger.addLog({
               key: '初始化成功',
               value: ""
             });
-            _context2.next = 21;
+            _context2.next = 32;
             break;
-          case 16:
-            _context2.prev = 16;
+          case 25:
+            _context2.prev = 25;
             _context2.t0 = _context2["catch"](2);
             // 记录初始化错误并发送日志
             paymentLogger.addLog({
               key: '初始化错误',
               value: {
-                title: "\u8BA2\u5355".concat(initProps === null || initProps === void 0 || (_initProps$order2 = initProps.order) === null || _initProps$order2 === void 0 ? void 0 : _initProps$order2.order_id, " \u521D\u59CB\u5316\u5931\u8D25: ").concat((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message) || '未知错误'),
+                title: "\u8BA2\u5355".concat(initProps === null || initProps === void 0 || (_initProps$order4 = initProps.order) === null || _initProps$order4 === void 0 ? void 0 : _initProps$order4.order_id, " \u521D\u59CB\u5316\u5931\u8D25: ").concat((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message) || '未知错误'),
                 data: {
                   order: initProps === null || initProps === void 0 ? void 0 : initProps.order
                 }
               }
             });
             paymentLogger.sendLogs('支付初始化失败', _context2.t0);
+            setOpen(false);
+            setLoading(false);
             throw _context2.t0;
-          case 21:
+          case 32:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 16]]);
+      }, _callee2, null, [[2, 25]]);
     }));
     return function init(_x2) {
       return _ref2.apply(this, arguments);
@@ -290,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({
@@ -929,6 +955,18 @@ var ToCPay = function ToCPay(props, ref) {
     onOk: function onOk() {
       setShowInformation(false);
     }
+  }), /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: showPendingPayment,
+    describe: locales.getText('tocPay.text.pendingPaymentDesc'),
+    okText: locales.getText('tocPay.text.pendingPaymentOk'),
+    cancelVisible: false,
+    closable: false,
+    maskClosable: false,
+    onOk: function onOk() {
+      paymentLogger.sendLogs('此订单有一笔支付正在处理中');
+      setShowPendingPayment(false);
+      setOpen(false);
+    }
   }), /*#__PURE__*/React.createElement(PisellModal.Information, {
     open: showDetectIncognitoConfirm,
     describe: locales.getText('tocPay.text.detectIncognitoConfirm'),