@pisell/private-materials 6.3.109 → 6.3.110

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -29,12 +29,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pay/toC/PaymentMethods/MWCreditCard/tds2.tsx
 var tds2_exports = {};
 __export(tds2_exports, {
+  cancelCurrentPayment: () => cancelCurrentPayment,
   checkEnrollment: () => checkEnrollment,
   checkPARes: () => checkPARes,
   checkTDSAuth: () => checkTDSAuth,
   createChallengeIframe: () => createChallengeIframe,
   createThreeDSMethodIframe: () => createThreeDSMethodIframe,
   paymentEnd: () => paymentEnd,
+  preCheckEnrollment: () => preCheckEnrollment,
   startPayment: () => startPayment
 });
 module.exports = __toCommonJS(tds2_exports);
@@ -43,6 +45,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_payGroup = require("../../payGroup");
+var import_utils3 = require("../../utils");
 var { REACT_APP_API_ENV } = process.env;
 var paymentInfo = {
   transactionInfo: {
@@ -61,6 +64,11 @@ var paymentInfo = {
 };
 var paymentData = {};
 var postmessageUrl = "merchantwarrior";
+var activeCleanup = null;
+var cancelCurrentPayment = () => {
+  activeCleanup == null ? void 0 : activeCleanup();
+  activeCleanup = null;
+};
 var log = (data) => {
   let _template = {
     module,
@@ -84,7 +92,8 @@ var setHistoryLog = (log2) => {
 var getCurrentTime = () => {
   return (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
 };
-var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
+var startPayment = async ({ orderId, cardInfo, payData }, options) => {
+  const { callback, isCancelled } = options || {};
   let paymentInfo2 = {
     amount: 0,
     order_id: 0
@@ -101,7 +110,11 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
       payDataOrderId: payData == null ? void 0 : payData.order_id,
       payDataPayNumber: payData == null ? void 0 : payData.pay_number
     });
-    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, callback);
+    const step2 = payData ? payData : await checkEnrollment(orderId, cardInfo, { callback, isCancelled });
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
     setHistoryLog({
       msg: "步骤2完成: 提交卡信息到后端",
       time: getCurrentTime(),
@@ -119,6 +132,10 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
       time: getCurrentTime()
     });
     let step3 = await createThreeDSMethodIframe(step2, callback);
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
     paymentData.step3 = step3;
     setHistoryLog({
       msg: "步骤3完成: iframe监听结束",
@@ -134,7 +151,11 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
       order_id: step2 == null ? void 0 : step2.order_id,
       pay_number: step2 == null ? void 0 : step2.pay_number
     });
-    const step4 = await checkTDSAuth(step2, step3, callback);
+    const step4 = await checkTDSAuth(step2, step3, { callback, isCancelled });
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
     setHistoryLog({
       msg: "步骤4完成: checkTDSAuth 返回",
       time: getCurrentTime(),
@@ -150,6 +171,10 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
         time: getCurrentTime()
       });
       const step5 = await createChallengeIframe(step4, callback);
+      if (isCancelled == null ? void 0 : isCancelled()) {
+        closeIframe();
+        return;
+      }
       paymentData.step5 = step5;
       setHistoryLog({
         msg: "步骤5完成: challenge iframe结束",
@@ -160,12 +185,20 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
         time: getCurrentTime()
       });
       await checkPARes(step2, step4, step5);
+      if (isCancelled == null ? void 0 : isCancelled()) {
+        closeIframe();
+        return;
+      }
       setHistoryLog({
         msg: "步骤6完成: check_pares接口返回",
         time: getCurrentTime()
       });
     }
-    callback({ key: "hideModal" });
+    if (isCancelled == null ? void 0 : isCancelled()) {
+      closeIframe();
+      return;
+    }
+    callback == null ? void 0 : callback({ key: "hideModal" });
     setHistoryLog({
       msg: "支付成功",
       time: getCurrentTime()
@@ -183,11 +216,17 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
     setHistoryLog({
       msg: "支付异常",
       time: getCurrentTime(),
-      error: err
+      error: err,
+      errorCode: err == null ? void 0 : err.code
     });
-    callback({ key: "hideModal" });
     closeIframe();
+    if (isCancelled == null ? void 0 : isCancelled()) return;
+    callback == null ? void 0 : callback({ key: "hideModal" });
     if (err === 0) return;
+    if ((err == null ? void 0 : err.code) === 700500) {
+      callback == null ? void 0 : callback({ key: "bankVerifyFailed" });
+      return false;
+    }
     paymentData.error = err;
     paymentEnd(
       {
@@ -199,11 +238,34 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
     return false;
   }
 };
-var checkEnrollment = async (orderId, cardInfo, callback) => {
+var preCheckEnrollment = async (orderId, cardInfo) => {
+  try {
+    const { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
+      ...cardInfo
+    });
+    (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
+    if (!(data == null ? void 0 : data.pay_info)) {
+      throw new Error("Card does not support 3DS verification");
+    }
+    return data;
+  } catch (err) {
+    log({
+      msg: err,
+      data: {
+        orderId,
+        cardInfo
+      }
+    });
+    throw err;
+  }
+};
+var checkEnrollment = async (orderId, cardInfo, options) => {
+  const { callback, isCancelled } = options || {};
   try {
     let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/" + orderId, {
       ...cardInfo
     });
+    if (isCancelled == null ? void 0 : isCancelled()) return 0;
     (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
     if (!(data == null ? void 0 : data.pay_info)) {
       return null;
@@ -217,7 +279,8 @@ var checkEnrollment = async (orderId, cardInfo, callback) => {
         cardInfo
       }
     });
-    callback({ key: "hideModal" });
+    if (isCancelled == null ? void 0 : isCancelled()) return 0;
+    callback == null ? void 0 : callback({ key: "hideModal" });
     closeIframe();
     (0, import_materials.PisellToast)({
       content: (err == null ? void 0 : err.message) || "",
@@ -291,9 +354,15 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
       });
     }, ((_a2 = threeDSMethodData == null ? void 0 : threeDSMethodData.pay_info) == null ? void 0 : _a2.tdsMethodTimeoutMS) || 1e4);
     window.addEventListener("message", handleMessage, false);
+    activeCleanup = () => {
+      window.removeEventListener("message", handleMessage);
+      if (timer) clearTimeout(timer);
+      rej(0);
+    };
   });
 };
-var checkTDSAuth = async (step2, step3, callback) => {
+var checkTDSAuth = async (step2, step3, options) => {
+  const { callback, isCancelled } = options || {};
   try {
     const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
     const { threeDSServerTransID, threeDSCompInd } = step3;
@@ -302,15 +371,18 @@ var checkTDSAuth = async (step2, step3, callback) => {
     if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
       isPre = true;
     }
+    const request_unique_idempotency_token = (0, import_utils3.getUniqueIdempotencyToken)();
     setHistoryLog({
       msg: "步骤4开始: 调用tds_auth_pay接口",
       time: getCurrentTime(),
       order_id,
-      pay_number
+      pay_number,
+      request_unique_idempotency_token
     });
     let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
       order_id,
       pay_number,
+      request_unique_idempotency_token,
       mw_data: {
         accessToken: pay_info.check_tds_auth.access_token,
         method: "checkTDSAuth",
@@ -357,20 +429,23 @@ var checkTDSAuth = async (step2, step3, callback) => {
   } catch (err) {
     setHistoryLog({
       msg: "步骤4异常",
-      time: getCurrentTime()
+      time: getCurrentTime(),
+      errorCode: err == null ? void 0 : err.code
     });
     log({
       msg: err,
       data: paymentData
     });
+    if (isCancelled == null ? void 0 : isCancelled()) return 0;
+    if ((err == null ? void 0 : err.code) === 700500) {
+      throw err;
+    }
     (0, import_materials.PisellToast)({
       content: (err == null ? void 0 : err.message) || "",
-      duration: 1e3 * 200,
-      onClose() {
-        callback({ key: "hideModal" });
-        closeIframe();
-      }
+      duration: 1e3 * 2
     });
+    callback == null ? void 0 : callback({ key: "hideModal" });
+    closeIframe();
     return 0;
   }
 };
@@ -406,6 +481,7 @@ var createChallengeIframe = (challengeData, callback) => {
           if (timer) {
             clearTimeout(timer);
           }
+          window.removeEventListener("message", handleMessage);
           res(event.data.cres);
           closeIframe();
         }
@@ -424,6 +500,11 @@ var createChallengeIframe = (challengeData, callback) => {
       handleMessage,
       false
     );
+    activeCleanup = () => {
+      window.removeEventListener("message", handleMessage);
+      if (timer) clearTimeout(timer);
+      rej(0);
+    };
   });
 };
 var checkPARes = async (step2, step4, step5) => {
@@ -464,11 +545,13 @@ var closeIframe = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  cancelCurrentPayment,
   checkEnrollment,
   checkPARes,
   checkTDSAuth,
   createChallengeIframe,
   createThreeDSMethodIframe,
   paymentEnd,
+  preCheckEnrollment,
   startPayment
 });

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

@@ -65,7 +65,7 @@ var isOfflinePayment = (type) => {
   ].includes(type);
 };
 var PaymentMethods = (props, ref) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const MWCreditCardRef2 = (0, import_react.useRef)(null);
   const SuperPayAliPayH5Ref2 = (0, import_react.useRef)(null);
   const StripePayRef2 = (0, import_react.useRef)(null);
@@ -82,6 +82,11 @@ var PaymentMethods = (props, ref) => {
   const GlobePayQrcodeRef2 = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const dvaStore = (_e = (_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getStore) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.getState();
+  const shop = ((_g = (_f = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _f.core) == null ? void 0 : _g.shop) || {};
+  const shopName = (shop == null ? void 0 : shop.name) || "";
+  const shopPhone = (shop == null ? void 0 : shop.phone) || "";
+  const shopEmail = (shop == null ? void 0 : shop.contact_email) || "";
   const init = async ({ type, payGroup }) => {
     var _a2, _b2;
     const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
@@ -143,11 +148,11 @@ var PaymentMethods = (props, ref) => {
     }
     await onPayByType({ type, payGroup });
   };
-  console.log("paymentResult isAppEnv", (_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.isAppEnv) == null ? void 0 : _c.call(_b), interaction, context);
+  console.log("paymentResult isAppEnv", (_i = (_h = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _h.isAppEnv) == null ? void 0 : _i.call(_h), interaction, context);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d;
+    var _a2, _b2, _c2, _d2;
     console.log("paymentResult isAppEnv", (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2));
-    if ((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) {
+    if ((_d2 = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d2.call(_c2)) {
       interaction.utils.mountFunction("global", "paymentResult", (strResult) => {
         console.log("paymentResult", strResult);
         if (!(0, import_utils2.isJson)(strResult)) return;
@@ -163,7 +168,7 @@ var PaymentMethods = (props, ref) => {
     }
   }, []);
   const onPayByType = async ({ type, payGroup }) => {
-    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n;
     console.log(type, payGroup);
     if (type === "mw.apple") {
       await ((_a2 = ApplePayRef2.current) == null ? void 0 : _a2.init({ payGroup }));
@@ -178,27 +183,27 @@ var PaymentMethods = (props, ref) => {
       return;
     }
     if (type === "superpay.alipay.h5") {
-      await ((_d = SuperPayAliPayH5Ref2.current) == null ? void 0 : _d.init({ payGroup }));
+      await ((_d2 = SuperPayAliPayH5Ref2.current) == null ? void 0 : _d2.init({ payGroup }));
       return;
     }
     if (type === "superpay.wechat.h5") {
-      await ((_e = SuperPayWxPayH5Ref2.current) == null ? void 0 : _e.init({ payGroup }));
+      await ((_e2 = SuperPayWxPayH5Ref2.current) == null ? void 0 : _e2.init({ payGroup }));
       return;
     }
     if (type === "stripe") {
-      (_f = StripePayRef2.current) == null ? void 0 : _f.init({ payGroup });
+      (_f2 = StripePayRef2.current) == null ? void 0 : _f2.init({ payGroup });
       return;
     }
     if (type === "pisell.offline_payment") {
-      await ((_g = OfflinePaymentRef2.current) == null ? void 0 : _g.init({ payGroup }));
+      await ((_g2 = OfflinePaymentRef2.current) == null ? void 0 : _g2.init({ payGroup }));
       return;
     }
     if (type === "pisell.bank_deposit") {
-      await ((_h = BankDepositRef2.current) == null ? void 0 : _h.init({ payGroup }));
+      await ((_h2 = BankDepositRef2.current) == null ? void 0 : _h2.init({ payGroup }));
       return;
     }
     if (type === "pisell.other.cashmanual") {
-      await ((_i = CashManualRef2.current) == null ? void 0 : _i.init({ payGroup }));
+      await ((_i2 = CashManualRef2.current) == null ? void 0 : _i2.init({ payGroup }));
       return;
     }
     if (type === "globepay.alipay.h5") {
@@ -228,6 +233,6 @@ var PaymentMethods = (props, ref) => {
       onPay: init
     })
   );
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(import_MWCreditCard.default, { ref: MWCreditCardRef2 }), /* @__PURE__ */ import_react.default.createElement(import_SuperPayAliPayH5.default, { ref: SuperPayAliPayH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_StripePay.default, { ref: StripePayRef2 }), /* @__PURE__ */ import_react.default.createElement(import_OfflinePayment.default, { ref: OfflinePaymentRef2 }), /* @__PURE__ */ import_react.default.createElement(import_BankDeposit.default, { ref: BankDepositRef2 }), /* @__PURE__ */ import_react.default.createElement(import_SuperPayWxPayH5.default, { ref: SuperPayWxPayH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_CustomPayment.default, { ref: CustomPaymentRef2 }), /* @__PURE__ */ import_react.default.createElement(import_ApplePay.default, { ref: ApplePayRef2 }), /* @__PURE__ */ import_react.default.createElement(import_GooglePay.default, { ref: GooglePayRef2 }), /* @__PURE__ */ import_react.default.createElement(import_CashManual.default, { ref: CashManualRef2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayAliPayH5.default, { ref: GlobePayAliPayH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayWxH5.default, { ref: GlobePayWxH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayPaypalH5.default, { ref: GlobePayPaypalH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayQrcode.default, { ref: GlobePayQrcodeRef2 }));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(import_MWCreditCard.default, { ref: MWCreditCardRef2, shopName, shopPhone, shopEmail }), /* @__PURE__ */ import_react.default.createElement(import_SuperPayAliPayH5.default, { ref: SuperPayAliPayH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_StripePay.default, { ref: StripePayRef2 }), /* @__PURE__ */ import_react.default.createElement(import_OfflinePayment.default, { ref: OfflinePaymentRef2 }), /* @__PURE__ */ import_react.default.createElement(import_BankDeposit.default, { ref: BankDepositRef2 }), /* @__PURE__ */ import_react.default.createElement(import_SuperPayWxPayH5.default, { ref: SuperPayWxPayH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_CustomPayment.default, { ref: CustomPaymentRef2 }), /* @__PURE__ */ import_react.default.createElement(import_ApplePay.default, { ref: ApplePayRef2 }), /* @__PURE__ */ import_react.default.createElement(import_GooglePay.default, { ref: GooglePayRef2 }), /* @__PURE__ */ import_react.default.createElement(import_CashManual.default, { ref: CashManualRef2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayAliPayH5.default, { ref: GlobePayAliPayH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayWxH5.default, { ref: GlobePayWxH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayPaypalH5.default, { ref: GlobePayPaypalH5Ref2 }), /* @__PURE__ */ import_react.default.createElement(import_GlobePayQrcode.default, { ref: GlobePayQrcodeRef2 }));
 };
 var PaymentMethods_default = (0, import_react.forwardRef)(PaymentMethods);

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

@@ -69,6 +69,7 @@ var ToCPay = (props, ref) => {
   });
   const [showInformation, setShowInformation] = (0, import_react.useState)(false);
   const [showDetectIncognitoConfirm, setShowDetectIncognitoConfirm] = (0, import_react.useState)(false);
+  const [showPendingPayment, setShowPendingPayment] = (0, import_react.useState)(false);
   const utils = context.appHelper.utils || {};
   const dvaStore = (_d = (_c = (_b = context.appHelper.utils) == null ? void 0 : _b.getStore) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.getState();
   const customer_id = (_j = (_i = (_h = (_g = (_f = (_e = context.appHelper.utils) == null ? void 0 : _e.getStore()) == null ? void 0 : _f.getState) == null ? void 0 : _g.call(_f)) == null ? void 0 : _h.global) == null ? void 0 : _i.userInfo) == null ? void 0 : _j.id;
@@ -83,7 +84,7 @@ var ToCPay = (props, ref) => {
         ...initProps,
         status: "init",
         // 将支付回调储存在store, 方便其他模块调用
-        payCallback: props.callback,
+        payCallback,
         history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history,
         front_order_uuid: (0, import_utils.getUniqueId)("front_order_uuid_")
         // 支付组
@@ -120,7 +121,7 @@ var ToCPay = (props, ref) => {
     });
   };
   const init = async (initProps) => {
-    var _a2;
+    var _a2, _b2, _c2;
     const { renderType: renderType2 } = initProps;
     paymentLogger.addLog({
       key: "初始化开始",
@@ -131,6 +132,18 @@ var ToCPay = (props, ref) => {
       setOpen(true);
       setSubmitLoading(false);
       setLoading(true);
+      const { has_pending } = await (0, import_serve.checkPendingPayment)({
+        order_id: (_a2 = initProps.order) == null ? void 0 : _a2.order_id
+      });
+      if (has_pending) {
+        paymentLogger.addLog({
+          key: "检测到处理中的交易",
+          value: `订单${(_b2 = initProps.order) == null ? void 0 : _b2.order_id} 存在处理中的交易，中断支付流程`
+        });
+        setLoading(false);
+        setShowPendingPayment(true);
+        return;
+      }
       _initStore(initProps);
       (0, import_payGroup.removePayGroupFromStorage)(initProps.order.order_id);
       await _getPaymentsAndWalletPass(initProps.order);
@@ -143,13 +156,15 @@ var ToCPay = (props, ref) => {
       paymentLogger.addLog({
         key: "初始化错误",
         value: {
-          title: `订单${(_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.order_id} 初始化失败: ${(error == null ? void 0 : error.message) || "未知错误"}`,
+          title: `订单${(_c2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _c2.order_id} 初始化失败: ${(error == null ? void 0 : error.message) || "未知错误"}`,
           data: {
             order: initProps == null ? void 0 : initProps.order
           }
         }
       });
       paymentLogger.sendLogs("支付初始化失败", error);
+      setOpen(false);
+      setLoading(false);
       throw error;
     }
   };
@@ -555,6 +570,22 @@ var ToCPay = (props, ref) => {
         }
       }
     ),
+    /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellModal.Information,
+      {
+        open: showPendingPayment,
+        describe: import_utils.locales.getText("tocPay.text.pendingPaymentDesc"),
+        okText: import_utils.locales.getText("tocPay.text.pendingPaymentOk"),
+        cancelVisible: false,
+        closable: false,
+        maskClosable: false,
+        onOk: () => {
+          paymentLogger.sendLogs("此订单有一笔支付正在处理中");
+          setShowPendingPayment(false);
+          setOpen(false);
+        }
+      }
+    ),
     /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellModal.Information,
       {