@pisell/private-materials 3.4.2 → 3.4.3

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

@@ -108,26 +108,32 @@ export var startPayment = /*#__PURE__*/function () {
           return _context.abrupt("return");
         case 24:
           _context.next = 26;
-          return checkTDSAuth(step2, step3);
+          return checkTDSAuth(step2, step3, callback);
         case 26:
           step4 = _context.sent;
+          if (!(step4 === 0)) {
+            _context.next = 29;
+            break;
+          }
+          return _context.abrupt("return");
+        case 29:
           paymentData.step4 = step4;
 
           // 返回数据执行步骤5, 没有则略过 5&6
           if (!step4) {
-            _context.next = 35;
+            _context.next = 37;
             break;
           }
-          _context.next = 31;
+          _context.next = 33;
           return createChallengeIframe(step4, callback);
-        case 31:
+        case 33:
           step5 = _context.sent;
           paymentData.step5 = step5;
 
           // 步骤6, 换取token
-          _context.next = 35;
+          _context.next = 37;
           return checkPARes(step2, step4, step5);
-        case 35:
+        case 37:
           callback({
             key: 'hideModal'
           });
@@ -136,8 +142,8 @@ export var startPayment = /*#__PURE__*/function () {
             status: 'success'
           }, paymentInfo), callback);
           return _context.abrupt("return", true);
-        case 40:
-          _context.prev = 40;
+        case 42:
+          _context.prev = 42;
           _context.t1 = _context["catch"](2);
           console.log('error', _context.t1);
           callback({
@@ -145,21 +151,21 @@ export var startPayment = /*#__PURE__*/function () {
           });
           closeIframe();
           if (!(_context.t1 === 0)) {
-            _context.next = 47;
+            _context.next = 49;
             break;
           }
           return _context.abrupt("return");
-        case 47:
+        case 49:
           paymentData.error = _context.t1;
           paymentEnd(_objectSpread({
             status: 'fail'
           }, paymentInfo), callback);
           return _context.abrupt("return", false);
-        case 50:
+        case 52:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 40]]);
+    }, _callee, null, [[2, 42]]);
   }));
   return function startPayment(_x, _x2) {
     return _ref2.apply(this, arguments);
@@ -334,6 +340,7 @@ export var checkTDSAuth = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
+          _context4.prev = 0;
           pay_number = step2.pay_number, order_id = step2.order_id, pay_info = step2.pay_info, amount = step2.amount, notifyURL = step2.notifyURL;
           threeDSServerTransID = step3.threeDSServerTransID, threeDSCompInd = step3.threeDSCompInd;
           currentData = new Date();
@@ -341,7 +348,7 @@ export var checkTDSAuth = /*#__PURE__*/function () {
           if (REACT_APP_API_ENV === 'pre' && pay_info.check_tds_auth.card_name === 'aa bb') {
             isPre = true;
           }
-          _context4.next = 7;
+          _context4.next = 8;
           return request.getRequest().post('/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay', {
             order_id: order_id,
             pay_number: pay_number,
@@ -379,21 +386,40 @@ export var checkTDSAuth = /*#__PURE__*/function () {
               notifyURL: notifyURL
             }
           });
-        case 7:
+        case 8:
           _yield$request$getReq2 = _context4.sent;
           data = _yield$request$getReq2.data;
           if (data) {
-            _context4.next = 11;
+            _context4.next = 12;
             break;
           }
           return _context4.abrupt("return", null);
-        case 11:
-          return _context4.abrupt("return", data);
         case 12:
+          return _context4.abrupt("return", data);
+        case 15:
+          _context4.prev = 15;
+          _context4.t0 = _context4["catch"](0);
+          // 记录卡失败的原因
+          log({
+            msg: _context4.t0,
+            data: paymentData
+          });
+          PisellToast({
+            content: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || '',
+            duration: 1000 * 200,
+            onClose: function onClose() {
+              callback({
+                key: 'hideModal'
+              });
+              closeIframe();
+            }
+          });
+          return _context4.abrupt("return", 0);
+        case 20:
         case "end":
           return _context4.stop();
       }
-    }, _callee4);
+    }, _callee4, null, [[0, 15]]);
   }));
   return function checkTDSAuth(_x8, _x9, _x10) {
     return _ref5.apply(this, arguments);

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

@@ -95,7 +95,10 @@ var startPayment = async ({ orderId, cardInfo, payData }, callback) => {
     if (step3 === "N") {
       return;
     }
-    const step4 = await checkTDSAuth(step2, step3);
+    const step4 = await checkTDSAuth(step2, step3, callback);
+    if (step4 === 0) {
+      return;
+    }
     paymentData.step4 = step4;
     if (step4) {
       const step5 = await createChallengeIframe(step4, callback);
@@ -216,54 +219,70 @@ var createThreeDSMethodIframe = async (threeDSMethodData, callback) => {
   });
 };
 var checkTDSAuth = async (step2, step3, callback) => {
-  const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
-  const { threeDSServerTransID, threeDSCompInd } = step3;
-  var currentData = /* @__PURE__ */ new Date();
-  let isPre = false;
-  if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
-    isPre = true;
-  }
-  let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
-    order_id,
-    pay_number,
-    mw_data: {
-      accessToken: pay_info.check_tds_auth.access_token,
-      method: "checkTDSAuth",
-      cardID: pay_info.check_tds_auth.card_id,
-      // paymentCardNumber: cardInfo.paymentCardNumber,
-      paymentCardExpiry: pay_info.check_tds_auth.card_expiry,
-      paymentCardName: pay_info.check_tds_auth.card_name,
-      // paymentCardCSC: cardInfo.paymentCardCSC,
-      customerName: pay_info.check_tds_auth.card_name,
-      transactionAmount: amount,
-      transactionCurrency: paymentInfo.transactionInfo.transactionCurrency,
-      transactionProduct: pay_info.check_tds_auth.product_name,
-      browserAcceptHeader: "*/*",
-      browserColorDepth: screen.colorDepth,
-      browserJavaEnabled: navigator.javaEnabled(),
-      browserJavascriptEnabled: true,
-      browserLanguage: navigator.language,
-      browserScreenHeight: screen.height,
-      browserScreenWidth: screen.width,
-      browserTZ: currentData.getTimezoneOffset(),
-      browserUserAgent: navigator.userAgent,
-      purchaseDate: "20220420165834",
-      billAddrCity: paymentInfo.billingAddress.billAddrCity,
-      billAddrCountry: paymentInfo.billingAddress.billAddrCountry,
-      billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
-      billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
-      billAddrState: paymentInfo.billingAddress.billAddrState,
-      threeDSCompInd: isPre ? "" : threeDSCompInd,
-      threeDSServerTransID: isPre ? "" : threeDSServerTransID,
-      threeDSRequestorAuthenticationInd: "01",
-      threeDSRequestorURL: window.location.href,
-      notifyURL
+  try {
+    const { pay_number, order_id, pay_info, amount, notifyURL } = step2;
+    const { threeDSServerTransID, threeDSCompInd } = step3;
+    var currentData = /* @__PURE__ */ new Date();
+    let isPre = false;
+    if (REACT_APP_API_ENV === "pre" && pay_info.check_tds_auth.card_name === "aa bb") {
+      isPre = true;
     }
-  });
-  if (!data) {
-    return null;
+    let { data } = await import_utils.request.getRequest().post("/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay", {
+      order_id,
+      pay_number,
+      mw_data: {
+        accessToken: pay_info.check_tds_auth.access_token,
+        method: "checkTDSAuth",
+        cardID: pay_info.check_tds_auth.card_id,
+        // paymentCardNumber: cardInfo.paymentCardNumber,
+        paymentCardExpiry: pay_info.check_tds_auth.card_expiry,
+        paymentCardName: pay_info.check_tds_auth.card_name,
+        // paymentCardCSC: cardInfo.paymentCardCSC,
+        customerName: pay_info.check_tds_auth.card_name,
+        transactionAmount: amount,
+        transactionCurrency: paymentInfo.transactionInfo.transactionCurrency,
+        transactionProduct: pay_info.check_tds_auth.product_name,
+        browserAcceptHeader: "*/*",
+        browserColorDepth: screen.colorDepth,
+        browserJavaEnabled: navigator.javaEnabled(),
+        browserJavascriptEnabled: true,
+        browserLanguage: navigator.language,
+        browserScreenHeight: screen.height,
+        browserScreenWidth: screen.width,
+        browserTZ: currentData.getTimezoneOffset(),
+        browserUserAgent: navigator.userAgent,
+        purchaseDate: "20220420165834",
+        billAddrCity: paymentInfo.billingAddress.billAddrCity,
+        billAddrCountry: paymentInfo.billingAddress.billAddrCountry,
+        billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
+        billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
+        billAddrState: paymentInfo.billingAddress.billAddrState,
+        threeDSCompInd: isPre ? "" : threeDSCompInd,
+        threeDSServerTransID: isPre ? "" : threeDSServerTransID,
+        threeDSRequestorAuthenticationInd: "01",
+        threeDSRequestorURL: window.location.href,
+        notifyURL
+      }
+    });
+    if (!data) {
+      return null;
+    }
+    return data;
+  } catch (err) {
+    log({
+      msg: err,
+      data: paymentData
+    });
+    (0, import_materials.PisellToast)({
+      content: (err == null ? void 0 : err.message) || "",
+      duration: 1e3 * 200,
+      onClose() {
+        callback({ key: "hideModal" });
+        closeIframe();
+      }
+    });
+    return 0;
   }
-  return data;
 };
 var createChallengeIframe = (challengeData, callback) => {
   const displayBox = document.getElementById("threeds-container");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,9 +59,9 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "3.0.0",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "3.3.37",
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.0",
     "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {

package/es/components/Sales/Customer/index.d.ts

@@ -1,25 +0,0 @@
-import React from 'react';
-interface CustomerData {
-}
-interface CustomerContextType {
-    appContext: any;
-    appUtils: any;
-    isLogin: () => boolean;
-    openLoginModal: (params: any) => void;
-    getUserInfo: () => any;
-}
-interface CustomerProviderProps {
-    children: React.ReactNode;
-}
-export declare const CustomerContext: React.Context<CustomerContextType | undefined>;
-export declare const CustomerProvider: React.FC<CustomerProviderProps>;
-/**
- * 使用步骤管理的Hook
- * @throws {Error} 如果在StepProvider外部使用会抛出错误
- * @returns {StepContextType} 步骤管理上下文
- */
-export declare const useCustomer: () => CustomerContextType;
-declare const _default: {
-    defaultState: CustomerData;
-};
-export default _default;

package/es/components/appointmentBooking/components/Form/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.less';
-declare const Form: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export default Form;

package/es/components/appointmentBooking/components/Form/utils.d.ts

@@ -1,8 +0,0 @@
-/**
- * @title: 更新表单数据
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-05-26 16:58
- */
-export declare const updateRelationForms: (carts: any[], currentCart: any, values: any, currentStepKey?: string) => any;

package/es/components/booking/info/service/Lists.d.ts

@@ -1,2 +0,0 @@
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
-export default Lists;

package/es/components/booking/info2/service/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
-export default _default;

package/es/components/booking/info2/utils.d.ts

@@ -1,4 +0,0 @@
-export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number[]) => {
-    list: any[];
-    listMap: any;
-};

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

@@ -1,113 +0,0 @@
-export declare type MachineCodeListParams = {
-    order_id: number | string;
-    available: number;
-    prepare_payments: {
-        voucher_id: number;
-        amount: number;
-        tag: string;
-    }[];
-    filter_prepare_wallet_pass: 1 | 0;
-    sale_channel: string;
-    other_exact_codes?: string[];
-};
-export declare type WalletPassDataType = {
-    id: number;
-    shop_id: number;
-    customer_id: number;
-    code: string;
-    encoded: string;
-    status: string;
-    cover: string;
-    tag: string;
-    relation_type: string;
-    product_id: number;
-    limit_status: string;
-    sales_status: number;
-    par_value: string;
-    used_par_value: string;
-    start_date: string;
-    expire_date: string;
-    end_time: string;
-    start_time: string;
-    created_at: string;
-    product_name: string;
-    expire_time: string;
-    available_max_par_value: string;
-    available_max_amount: string;
-    recommended_usage_amount: string;
-    custom_expire_status: number;
-    wallet_pass_usage_unit: WalletPassUsageUnit;
-    custom_order_deduct_exhausted: number;
-    available_product_status: number;
-    available_product_ids: any[];
-    available_product_type: string;
-    available_num: number;
-    available_product_title: string;
-    unified_available_status: number;
-    unified_messages: UnifiedMessages;
-    external_card: any[];
-    product: Product;
-    shop: Shop;
-    wallet_pass_usage?: any;
-    balance_par_value: string;
-};
-declare type Shop = {
-    id: number;
-    name: string;
-    default_url: string;
-};
-declare type Product = {
-    id: number;
-    title: string;
-    cover: string;
-    is_charge_tax: number;
-};
-declare type UnifiedMessages = {
-    title: string;
-    desc: string;
-    alert: string;
-};
-declare type WalletPassUsageUnit = {
-    price: number;
-    points: number;
-};
-/**
- * 查询支付识别码列表
- */
-export declare const getMachineCodeList: (params: MachineCodeListParams) => Promise<WalletPassDataType[]>;
-/**
- * 获取推荐的支付识别码
- */
-export declare const getRecommendMachineCodeList: (order_id: number) => Promise<WalletPassDataType[]>;
-/**
- * 搜索支付识别码
- */
-export declare const searchMachineCodeList: (params: {
-    order_id: number | string;
-    code: string;
-    sale_channel: string;
-    prepare_payments: {
-        voucher_id: number;
-        amount: number;
-        tag: string;
-    }[];
-    filter_prepare_wallet_pass: 1 | 0;
-}) => Promise<WalletPassDataType[]>;
-/**
- * walletpass支付
- */
-export declare const walletPassPay: (params: {
-    order_id: number | string;
-    payment_group_id: number;
-    payments: {
-        amount: string;
-        wallet_pass_use_value: string;
-        voucher_id: number;
-        tag: string;
-        wallet_pass_usage_unit: {
-            price: number;
-            points: number;
-        };
-    }[];
-}) => Promise<WalletPassDataType[]>;
-export {};

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

@@ -1,57 +0,0 @@
-import { PayGroup } from "./model";
-import { WalletPassDataType } from "./PaymentMethods/WalletPass/serve";
-/**
- * 计算walletPass列表数据的总金额
- * @param list
- */
-export declare const calcWalletPassListAmount: (list: any[]) => any;
-/**
- * 将walletPass列表数据转换为prepare_payments需要的数据格式
- * @param list
- */
-export declare const formatWalletPassList2PreparePayments: (list?: any[]) => {
-    voucher_id: any;
-    amount: number;
-    tag: any;
-}[];
-/**
- *  walletPass支付params
- * @param payGroup
- */
-export declare const formatWalletPassParams: (payGroup: PayGroup) => {
-    order_id: string;
-    payment_group_id: number;
-    payments: {
-        amount: string;
-        wallet_pass_use_value: any;
-        voucher_id: any;
-        tag: any;
-        wallet_pass_usage_unit: any;
-    }[];
-};
-/**
- * @title: 获取是否walletPass和三方支付的组合支付
- * @description: 三方支付 (stripe  支付宝 微信  苹果 谷歌)
- * @return: *
- * @Author: shengjie.zuo
- * @Date: 2024-08-30 10:06:17
- */
-export declare const getIsWalletPassAndTripartitePayment: (payGroup: PayGroup) => boolean | 0 | undefined;
-export declare const isFranchiseeShop: (path?: any, history?: any) => any;
-/**
- * @title: 获取当前连锁加盟店铺shopid
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: chensheng.gu
- * @Date: 2024-08-07 10:04
- */
-export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
-export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
-export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
-export declare const clientPayment: (params: {
-    order_id: number;
-    type: "aliPay" | "wxPay";
-    values: any;
-    interaction?: any;
-}) => void;

package/es/components/shoppingCart/components/Cart/Product.d.ts

@@ -1,3 +0,0 @@
-import { ProductProps } from '../../type';
-declare const Product: (props: ProductProps) => JSX.Element;
-export default Product;