@pisell/private-materials 6.3.109 → 6.3.111

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

@@ -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);
@@ -53,6 +53,13 @@ var PaymentMethods = function PaymentMethods(props, ref) {
   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 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 _payGroup$walletPass;
@@ -365,7 +372,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/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);
@@ -929,6 +952,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'),

package/es/components/pay/toC/locales.d.ts

@@ -17,6 +17,7 @@ declare const _default: {
         'tocPay.text.enterCVV': string;
         'tocPay.text.enterValidCVV': string;
         'tocPay.text.addCard': string;
+        'tocPay.text.secureCardPayment': string;
         'tocPay.text.creditorDebitCard': string;
         'tocPay.text.addCreditOrDebitCard': string;
         'tocPay.text.cardNumber': string;
@@ -29,7 +30,11 @@ declare const _default: {
         'tocPay.text.enterEnglishName': string;
         'tocPay.text.incorrectName': string;
         'tocPay.text.saveCardForNextTime': string;
+        'tocPay.text.saveCardEncryption': string;
         'tocPay.text.secureBankInfo': string;
+        'tocPay.text.merchantAuthorizationBefore': string;
+        'tocPay.text.merchantAuthorizationAfter': string;
+        'tocPay.text.threeDSecureProtection': string;
         'tocPay.text.pay': string;
         'tocPay.text.surcharge': string;
         'tocPay.text.done': string;
@@ -48,6 +53,14 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.checkingCard': string;
+        'tocPay.text.processingPayment': string;
+        'tocPay.text.securityCheckRequired': string;
+        'tocPay.text.doNotClosePage': string;
+        'tocPay.text.stopWaitingTitle': string;
+        'tocPay.text.stopWaitingDesc': string;
+        'tocPay.text.continueWaiting': string;
+        'tocPay.text.viewOrder': string;
         'tocPay.text.walletPass': string;
         'tocPay.text.toUse': string;
         'tocPay.text.searchResult': string;
@@ -100,6 +113,16 @@ declare const _default: {
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
         'tocPay.text.domestic': string;
         'tocPay.text.rest-of-world': string;
+        'tocPay.text.tdsErrorTitle': string;
+        'tocPay.text.tdsErrorDesc': string;
+        'tocPay.text.bankVerifyFailedTitle': string;
+        'tocPay.text.bankVerifyFailedDesc': string;
+        'tocPay.text.useAnotherCard': string;
+        'tocPay.text.useAnotherPayment': string;
+        'tocPay.text.payLater': string;
+        'tocPay.text.paymentTroubleContact': (phone: string, email: string) => string;
+        'tocPay.text.pendingPaymentDesc': string;
+        'tocPay.text.pendingPaymentOk': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -119,6 +142,7 @@ declare const _default: {
         'tocPay.text.enterCVV': string;
         'tocPay.text.enterValidCVV': string;
         'tocPay.text.addCard': string;
+        'tocPay.text.secureCardPayment': string;
         'tocPay.text.creditorDebitCard': string;
         'tocPay.text.addCreditOrDebitCard': string;
         'tocPay.text.cardNumber': string;
@@ -131,7 +155,11 @@ declare const _default: {
         'tocPay.text.enterEnglishName': string;
         'tocPay.text.incorrectName': string;
         'tocPay.text.saveCardForNextTime': string;
+        'tocPay.text.saveCardEncryption': string;
         'tocPay.text.secureBankInfo': string;
+        'tocPay.text.merchantAuthorizationBefore': string;
+        'tocPay.text.merchantAuthorizationAfter': string;
+        'tocPay.text.threeDSecureProtection': string;
         'tocPay.text.pay': string;
         'tocPay.text.surcharge': string;
         'tocPay.text.done': string;
@@ -150,6 +178,14 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.checkingCard': string;
+        'tocPay.text.processingPayment': string;
+        'tocPay.text.securityCheckRequired': string;
+        'tocPay.text.doNotClosePage': string;
+        'tocPay.text.stopWaitingTitle': string;
+        'tocPay.text.stopWaitingDesc': string;
+        'tocPay.text.continueWaiting': string;
+        'tocPay.text.viewOrder': string;
         'tocPay.text.walletPass': string;
         'tocPay.text.toUse': string;
         'tocPay.text.searchResult': string;
@@ -201,6 +237,16 @@ declare const _default: {
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
         'tocPay.text.domestic': string;
         'tocPay.text.rest-of-world': string;
+        'tocPay.text.tdsErrorTitle': string;
+        'tocPay.text.tdsErrorDesc': string;
+        'tocPay.text.bankVerifyFailedTitle': string;
+        'tocPay.text.bankVerifyFailedDesc': string;
+        'tocPay.text.useAnotherCard': string;
+        'tocPay.text.useAnotherPayment': string;
+        'tocPay.text.payLater': string;
+        'tocPay.text.paymentTroubleContact': (phone: string, email: string) => string;
+        'tocPay.text.pendingPaymentDesc': string;
+        'tocPay.text.pendingPaymentOk': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -220,6 +266,7 @@ declare const _default: {
         'tocPay.text.enterCVV': string;
         'tocPay.text.enterValidCVV': string;
         'tocPay.text.addCard': string;
+        'tocPay.text.secureCardPayment': string;
         'tocPay.text.creditorDebitCard': string;
         'tocPay.text.addCreditOrDebitCard': string;
         'tocPay.text.cardNumber': string;
@@ -232,7 +279,11 @@ declare const _default: {
         'tocPay.text.enterEnglishName': string;
         'tocPay.text.incorrectName': string;
         'tocPay.text.saveCardForNextTime': string;
+        'tocPay.text.saveCardEncryption': string;
         'tocPay.text.secureBankInfo': string;
+        'tocPay.text.merchantAuthorizationBefore': string;
+        'tocPay.text.merchantAuthorizationAfter': string;
+        'tocPay.text.threeDSecureProtection': string;
         'tocPay.text.pay': string;
         'tocPay.text.surcharge': string;
         'tocPay.text.done': string;
@@ -251,6 +302,14 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.checkingCard': string;
+        'tocPay.text.processingPayment': string;
+        'tocPay.text.securityCheckRequired': string;
+        'tocPay.text.doNotClosePage': string;
+        'tocPay.text.stopWaitingTitle': string;
+        'tocPay.text.stopWaitingDesc': string;
+        'tocPay.text.continueWaiting': string;
+        'tocPay.text.viewOrder': string;
         'tocPay.text.walletPass': string;
         'tocPay.text.toUse': string;
         'tocPay.text.searchResult': string;
@@ -302,6 +361,16 @@ declare const _default: {
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
         'tocPay.text.domestic': string;
         'tocPay.text.rest-of-world': string;
+        'tocPay.text.tdsErrorTitle': string;
+        'tocPay.text.tdsErrorDesc': string;
+        'tocPay.text.bankVerifyFailedTitle': string;
+        'tocPay.text.bankVerifyFailedDesc': string;
+        'tocPay.text.useAnotherCard': string;
+        'tocPay.text.useAnotherPayment': string;
+        'tocPay.text.payLater': string;
+        'tocPay.text.paymentTroubleContact': (phone: string, email: string) => string;
+        'tocPay.text.pendingPaymentDesc': string;
+        'tocPay.text.pendingPaymentOk': string;
     };
     ja: {
         'tocPay.text.checkout': string;
@@ -321,6 +390,7 @@ declare const _default: {
         'tocPay.text.enterCVV': string;
         'tocPay.text.enterValidCVV': string;
         'tocPay.text.addCard': string;
+        'tocPay.text.secureCardPayment': string;
         'tocPay.text.creditorDebitCard': string;
         'tocPay.text.addCreditOrDebitCard': string;
         'tocPay.text.cardNumber': string;
@@ -333,7 +403,11 @@ declare const _default: {
         'tocPay.text.enterEnglishName': string;
         'tocPay.text.incorrectName': string;
         'tocPay.text.saveCardForNextTime': string;
+        'tocPay.text.saveCardEncryption': string;
         'tocPay.text.secureBankInfo': string;
+        'tocPay.text.merchantAuthorizationBefore': string;
+        'tocPay.text.merchantAuthorizationAfter': string;
+        'tocPay.text.threeDSecureProtection': string;
         'tocPay.text.pay': string;
         'tocPay.text.surcharge': string;
         'tocPay.text.done': string;
@@ -352,6 +426,14 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.checkingCard': string;
+        'tocPay.text.processingPayment': string;
+        'tocPay.text.securityCheckRequired': string;
+        'tocPay.text.doNotClosePage': string;
+        'tocPay.text.stopWaitingTitle': string;
+        'tocPay.text.stopWaitingDesc': string;
+        'tocPay.text.continueWaiting': string;
+        'tocPay.text.viewOrder': string;
         'tocPay.text.walletPass': string;
         'tocPay.text.toUse': string;
         'tocPay.text.searchResult': string;
@@ -404,6 +486,16 @@ declare const _default: {
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
         'tocPay.text.domestic': string;
         'tocPay.text.rest-of-world': string;
+        'tocPay.text.tdsErrorTitle': string;
+        'tocPay.text.tdsErrorDesc': string;
+        'tocPay.text.bankVerifyFailedTitle': string;
+        'tocPay.text.bankVerifyFailedDesc': string;
+        'tocPay.text.useAnotherCard': string;
+        'tocPay.text.useAnotherPayment': string;
+        'tocPay.text.payLater': string;
+        'tocPay.text.paymentTroubleContact': (phone: string, email: string) => string;
+        'tocPay.text.pendingPaymentDesc': string;
+        'tocPay.text.pendingPaymentOk': string;
     };
     pt: {
         'tocPay.text.checkout': string;
@@ -423,6 +515,7 @@ declare const _default: {
         'tocPay.text.enterCVV': string;
         'tocPay.text.enterValidCVV': string;
         'tocPay.text.addCard': string;
+        'tocPay.text.secureCardPayment': string;
         'tocPay.text.creditorDebitCard': string;
         'tocPay.text.addCreditOrDebitCard': string;
         'tocPay.text.cardNumber': string;
@@ -435,7 +528,11 @@ declare const _default: {
         'tocPay.text.enterEnglishName': string;
         'tocPay.text.incorrectName': string;
         'tocPay.text.saveCardForNextTime': string;
+        'tocPay.text.saveCardEncryption': string;
         'tocPay.text.secureBankInfo': string;
+        'tocPay.text.merchantAuthorizationBefore': string;
+        'tocPay.text.merchantAuthorizationAfter': string;
+        'tocPay.text.threeDSecureProtection': string;
         'tocPay.text.pay': string;
         'tocPay.text.surcharge': string;
         'tocPay.text.done': string;
@@ -454,6 +551,14 @@ declare const _default: {
         'tocPay.text.continuePay': string;
         'tocPay.text.leave': string;
         'tocPay.text.getParamsFail': string;
+        'tocPay.text.checkingCard': string;
+        'tocPay.text.processingPayment': string;
+        'tocPay.text.securityCheckRequired': string;
+        'tocPay.text.doNotClosePage': string;
+        'tocPay.text.stopWaitingTitle': string;
+        'tocPay.text.stopWaitingDesc': string;
+        'tocPay.text.continueWaiting': string;
+        'tocPay.text.viewOrder': string;
         'tocPay.text.walletPass': string;
         'tocPay.text.toUse': string;
         'tocPay.text.searchResult': string;
@@ -506,6 +611,16 @@ declare const _default: {
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
         'tocPay.text.domestic': string;
         'tocPay.text.rest-of-world': string;
+        'tocPay.text.tdsErrorTitle': string;
+        'tocPay.text.tdsErrorDesc': string;
+        'tocPay.text.bankVerifyFailedTitle': string;
+        'tocPay.text.bankVerifyFailedDesc': string;
+        'tocPay.text.useAnotherCard': string;
+        'tocPay.text.useAnotherPayment': string;
+        'tocPay.text.payLater': string;
+        'tocPay.text.paymentTroubleContact': (phone: string, email: string) => string;
+        'tocPay.text.pendingPaymentDesc': string;
+        'tocPay.text.pendingPaymentOk': string;
     };
 };
 export default _default;