@pisell/private-materials 6.3.122 → 6.3.123

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/WalletPassBlock/index.js

@@ -163,7 +163,9 @@ var WalletPassBlock = function WalletPassBlock(props, ref) {
     ref: walletPassRef,
     walletSetting: walletSetting,
     onWalletPassChange: onWalletPassChange,
-    walletPass: payGroup === null || payGroup === void 0 ? void 0 : payGroup.walletPass
+    walletPass: payGroup === null || payGroup === void 0 ? void 0 : payGroup.walletPass,
+    orderDetail: payGroup === null || payGroup === void 0 ? void 0 : payGroup.orderDetail,
+    total_amount: payGroup === null || payGroup === void 0 ? void 0 : payGroup.total_amount
   }), /*#__PURE__*/React.createElement(WalletAvailable, {
     ref: walletAvailableRef,
     walletSetting: walletSetting,

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

@@ -23,13 +23,14 @@ 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, getOrderBasicDetail, checkPendingPayment } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../hooks/usePaymentLogger";
 import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
+import { getMachineCodeList } from "./PaymentMethods/WalletPass/serve";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
 import { saleChannelMap } from "./status";
 import "./index.less";
@@ -91,6 +92,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 +127,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 +193,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 +204,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 +236,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);
@@ -263,7 +287,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
+      var _order$_order, _state$payGroup2, _paymentListRef$curre, _yield$Promise$all, _yield$Promise$all2, data, allList, orderBasicDetail, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, products, _res, recommended, transformList, noApplicableVoucher, recommendedAmount, _waitAmount2;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -276,46 +300,79 @@ var ToCPay = function ToCPay(props, ref) {
             });
             _context3.prev = 1;
             _context3.next = 4;
-            return getPaymentsAndWalletPass({
+            return Promise.all([getPaymentsAndWalletPass({
               order_id: order.order_id,
               total_amount: order.amount,
               sale_channel: order.sale_channel || 'online-store'
-            });
+            }), getMachineCodeList({
+              order_id: order.order_id,
+              available: 2,
+              prepare_payments: [],
+              filter_prepare_wallet_pass: 1,
+              sale_channel: ((_order$_order = order._order) === null || _order$_order === void 0 ? void 0 : _order$_order.sale_channel) || 'online-store',
+              other_exact_codes: []
+            }), getOrderBasicDetail(order.order_id)]);
           case 4:
-            data = _context3.sent;
-            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 记录获取到的数据
+            _yield$Promise$all = _context3.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
+            data = _yield$Promise$all2[0];
+            allList = _yield$Promise$all2[1];
+            orderBasicDetail = _yield$Promise$all2[2];
+            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass;
+            products = (orderBasicDetail.detail || []).map(function (item) {
+              var _ref5;
+              return _objectSpread(_objectSpread({}, item), {}, {
+                is_price_include_tax: orderBasicDetail.is_price_include_tax,
+                product_bundle: (_ref5 = item.product_bundle || []) === null || _ref5 === void 0 ? void 0 : _ref5.map(function (bundle) {
+                  return _objectSpread(_objectSpread({}, bundle), {}, {
+                    is_price_include_tax: orderBasicDetail.is_price_include_tax
+                  });
+                })
+              });
+            });
+            _res = utils.walletPassEvaluator.getRecommendedVouchers({
+              orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
+              products: products,
+              vouchers: allList || []
+            });
+            recommended = _res.recommended, transformList = _res.transformList, noApplicableVoucher = _res.noApplicableVoucher, recommendedAmount = _res.recommendedAmount; // 记录获取到的数据
             paymentLogger.addLog({
               key: '支付数据获取',
               value: ''
             });
-            withCustomerIdList = (wallet_pass_recommend_list || []).map(function (item) {
-              return _objectSpread(_objectSpread({}, item), {}, {
-                customer_id: customer_id || item.customer_id
-              });
-            }); // 设置交易组
+            _waitAmount2 = new Decimal((order === null || order === void 0 ? void 0 : order.amount) || 0).minus(new Decimal(recommendedAmount)).toNumber(); // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
                 // ...state.payGroup,
                 order_id: order === null || order === void 0 ? void 0 : order.order_id,
                 // total_amount: order?.amount,
+                orderDetail: orderBasicDetail,
                 // 原订单信息
                 _order: order,
                 payment_group_id: order === null || order === void 0 ? void 0 : order.payment_group_id,
                 // 支付方式没有walletPass时walletPass设置null
                 walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
-                  amount: wallet_pass_amount,
-                  cards: withCustomerIdList
+                  // 推荐钱包
+                  cards: recommended,
+                  // 推荐金额
+                  amount: recommendedAmount,
+                  // 不可用钱包
+                  noApplicableVoucher: noApplicableVoucher,
+                  // 转换列表
+                  transformList: transformList
+                  // amount: wallet_pass_amount,
+                  // cards: wallet_pass_recommend_list,
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
-                wait_amount: remain_amount
+                wait_amount: Math.max(0, _waitAmount2)
               }
             });
 
             // 初始化支付列表
-            _context3.next = 11;
+            _context3.next = 18;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list, remain_amount || 0);
-          case 11:
+          case 18:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -326,10 +383,10 @@ var ToCPay = function ToCPay(props, ref) {
               key: '获取支付列表成功',
               value: ''
             });
-            _context3.next = 21;
+            _context3.next = 28;
             break;
-          case 15:
-            _context3.prev = 15;
+          case 22:
+            _context3.prev = 22;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -352,11 +409,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 21:
+          case 28:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 15]]);
+      }, _callee3, null, [[1, 22]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -373,7 +430,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:46
    */
   var handlePaymentByType = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
       var _state$payGroup3;
       var paymentType, currentPayGroup, _paymentMethodsRef$cu;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -433,7 +490,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee4, null, [[3, 12]]);
     }));
     return function handlePaymentByType(_x4, _x5) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -445,7 +502,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:41
    */
   var paymentInit = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
       var _state$payGroup4;
       var orderId, _state$payGroup5, data;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -519,7 +576,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee5, null, [[3, 12]]);
     }));
     return function paymentInit(_x6) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -578,7 +635,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-30 10:23:48
    */
   var getIsShowDetectIncognitoConfirm = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
       var _yield$detectIncognit, isPrivate;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -596,7 +653,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee6);
     }));
     return function getIsShowDetectIncognitoConfirm(_x7) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -608,7 +665,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:25
    */
   var onSubmit = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
       var _state$payGroup10, _state$payGroup11, _state$payGroup12;
       var newPayGroup, _state$payGroup13, _newPayGroup, _newPayGroup2, _state$payGroup14, result, _state$payGroup15;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -686,7 +743,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee7, null, [[2, 20]]);
     }));
     return function onSubmit(_x8) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 
@@ -743,7 +800,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-09 14:25
    */
   var payCallback = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
       var _res$data, _state$payGroup20, _props$callback;
       var orderId, _res$data2;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -783,7 +840,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee8);
     }));
     return function payCallback(_x9) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
 
@@ -929,6 +986,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'),