@pisell/private-materials 6.3.115 → 6.3.117

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

@@ -0,0 +1,155 @@
+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;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
+    metadata?: {
+        validity_type: 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;
+    customer_pin_key?: string;
+}) => 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[]>;
+/**
+ * 搜索wallet code
+ */
+export declare const searchWalletCode: (params: {
+    code: string;
+    with_customer: 1 | 0;
+}) => Promise<{
+    code: string;
+    id: number;
+    status: 'enable' | 'disable' | 'expired';
+    expired_at: string;
+    customer: Record<string, any>;
+    check_max_count: number;
+    failed_count: number;
+}>;
+/**
+ * 验证pin码
+ */
+export declare const verifyPinCode: (params: {
+    wallet_detail_id: number;
+    pin: string;
+}) => Promise<{
+    status: number;
+    customer_id: number;
+    msg: string;
+    customer_pin_key: string;
+}>;
+/**
+ * 获取pin码
+ */
+export declare const getPin: (params: {
+    wallet_detail_id: number;
+}) => Promise<{
+    pin: string;
+}>;
+export {};

package/lib/components/pay/toC/PaymentMethods/WalletPass/utils.d.ts

@@ -0,0 +1,9 @@
+import { WalletPassDataType } from './serve';
+export declare const formatMachineCodeServer2CardList: (data: WalletPassDataType[], selectId?: number[]) => any;
+export declare const getDataByIds: (arr: any[], ids: number[]) => any[];
+/**
+ * 判断是否是wallet code
+ * @param val
+ * @returns
+ */
+export declare const getIsWalletCode: (val: string) => boolean;

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

@@ -0,0 +1,21 @@
+import React from 'react';
+import { WalletPassDataType } from '../PaymentMethods/WalletPass/serve';
+import { PayGroup } from '../model';
+import './index.less';
+export interface WalletPassBlockProps extends React.HTMLAttributes<HTMLDivElement> {
+    payGroup?: PayGroup;
+    onWalletPassChange?: (walletPass: {
+        cards: WalletPassDataType[];
+        amount: number;
+    }) => void;
+    customer_id?: number;
+    walletSetting: {
+        name: string;
+        popup_status: 0 | 1;
+    };
+}
+export interface WalletPassBlockRef {
+    open: () => void;
+}
+declare const _default: React.ForwardRefExoticComponent<WalletPassBlockProps & React.RefAttributes<WalletPassBlockRef>>;
+export default _default;

package/lib/components/pay/toC/index.d.ts

@@ -0,0 +1,3 @@
+import './index.less';
+declare const _default: any;
+export default _default;

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,
       {