@pisell/private-materials 6.3.113 → 6.3.114

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

@@ -47,14 +47,10 @@ var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var { Amount } = import_materials.PisellText;
 var WalletPass = (0, import_react.forwardRef)((props, ref) => {
-  var _a, _b, _c, _d, _e, _f;
-  const { onWalletPassChange, walletPass, walletSetting, orderDetail, total_amount } = props;
+  var _a, _b, _c, _d, _e;
+  const { onWalletPassChange, walletPass, walletSetting } = props;
   const context = (0, import_useEngineContext.default)();
-  const { walletPassEvaluator } = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) || {};
-  const { detail } = orderDetail;
-  const isWalletCode = (_e = (_d = (_c = (_b = context == null ? void 0 : context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.businessUtils) == null ? void 0 : _d.getAppByModal) == null ? void 0 : _e.call(_d, "wallet");
-  const { cards: recommended, transformList, noApplicableVoucher } = walletPass;
-  const [selectedVoucherIds, setSelectedVoucherIds] = (0, import_react.useState)([]);
+  const isWalletCode = (_d = (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.businessUtils) == null ? void 0 : _c.getAppByModal) == null ? void 0 : _d.call(_c, "wallet");
   const [currentWalletPass, setCurrentWalletPass] = (0, import_react.useState)(walletPass);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -67,69 +63,80 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     details: []
   });
   const isAutoSelect = (0, import_react.useRef)(false);
+  const listRef = (0, import_react.useRef)(null);
   const searchValRef = (0, import_react.useRef)(null);
   const pinVerifyModalRef = (0, import_react.useRef)(null);
-  const allVouchersForCalculation = (0, import_react.useMemo)(() => {
-    return [...transformList || [], ...addList || []];
-  }, [transformList, addList]);
-  const selectedVouchers = (0, import_react.useMemo)(() => {
-    return selectedVoucherIds.map((id) => allVouchersForCalculation.find((v) => v.id === id)).filter(Boolean);
-  }, [selectedVoucherIds, allVouchersForCalculation]);
-  const { displayVouchers, displayOtherVouchers, selectedWithDetails, totalDeduction } = (0, import_react.useMemo)(() => {
-    if (!walletPassEvaluator || !allVouchersForCalculation.length || !(order == null ? void 0 : order.total_amount)) {
-      return {
-        displayVouchers: [...transformList || [], ...noApplicableVoucher || []],
-        displayOtherVouchers: addList || [],
-        selectedWithDetails: [],
-        totalDeduction: 0
-      };
-    }
-    if (selectedVouchers.length === 0) {
-      return {
-        displayVouchers: [...transformList || [], ...noApplicableVoucher || []],
-        displayOtherVouchers: addList || [],
-        selectedWithDetails: [],
-        totalDeduction: 0
-      };
-    }
-    const result = walletPassEvaluator.recalculateVouchers(
-      allVouchersForCalculation,
-      selectedVouchers,
-      order.total_amount,
-      detail || []
-    );
-    const currentCustomerVouchers = [];
-    const otherCustomerVouchers = [];
-    result.allWithUpdatedStatus.forEach((voucher) => {
-      if (voucher.customer_id === (order == null ? void 0 : order.customer_id)) {
-        currentCustomerVouchers.push(voucher);
+  const { cards: walletPassSelectCards, amount } = currentWalletPass || {};
+  const [currentCustomerWalletPass, otherCustomerWalletPass] = (0, import_react.useMemo)(() => {
+    const current = [];
+    const other = [];
+    (walletPassSelectCards || []).forEach((item) => {
+      if (item.customer_id === (order == null ? void 0 : order.customer_id)) {
+        current.push(item);
       } else {
-        otherCustomerVouchers.push(voucher);
+        other.push(item);
       }
     });
-    return {
-      displayVouchers: [...currentCustomerVouchers, ...noApplicableVoucher || []],
-      displayOtherVouchers: otherCustomerVouchers,
-      selectedWithDetails: result.selectedWithDetails,
-      totalDeduction: result.selectedWithDetails.reduce((sum, v) => sum + (v.actualDeduction || 0), 0)
-    };
-  }, [selectedVouchers, allVouchersForCalculation, transformList, addList, noApplicableVoucher, order == null ? void 0 : order.total_amount, order == null ? void 0 : order.customer_id, detail, walletPassEvaluator]);
+    return [current, other];
+  }, [walletPassSelectCards, order == null ? void 0 : order.customer_id]);
   const prepare_payments = (0, import_react.useMemo)(() => {
     return (0, import_utils3.formatWalletPassList2PreparePayments)(
       (0, import_utils.uniqueByKey)(
-        (selectedWithDetails || []).concat(searchSelectData.details),
+        (walletPassSelectCards || []).concat(searchSelectData.details),
         "id"
       )
     );
-  }, [selectedWithDetails, searchSelectData]);
+  }, [walletPassSelectCards, searchSelectData]);
   const selectValue = (0, import_react.useMemo)(() => {
-    return selectedVoucherIds;
-  }, [selectedVoucherIds]);
-  (0, import_react.useEffect)(() => {
-    if (recommended && recommended.length > 0) {
-      setSelectedVoucherIds(recommended.map((v) => v.id));
+    return (walletPassSelectCards == null ? void 0 : walletPassSelectCards.map((item) => item.id)) || [];
+  }, [walletPassSelectCards]);
+  const otherCustomerWalletPassList = (0, import_react.useMemo)(() => {
+    return (0, import_utils2.formatMachineCodeServer2CardList)(addList, selectValue);
+  }, [addList, selectValue]);
+  const other_exact_codes = (0, import_react.useMemo)(() => {
+    const codes = [];
+    addList.forEach((item) => {
+      if (!selectValue.includes(item.id)) {
+        codes.push(item.code);
+      }
+    });
+    return codes;
+  }, [addList, selectValue]);
+  const refreshList = (0, import_ahooks.useMemoizedFn)(() => {
+    var _a2, _b2;
+    if ((order == null ? void 0 : order.order_id) && (order == null ? void 0 : order.customer_id)) {
+      (_b2 = listRef.current) == null ? void 0 : _b2.init(
+        {
+          order_id: order.order_id,
+          available: 2,
+          prepare_payments,
+          filter_prepare_wallet_pass: 1,
+          sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
+          other_exact_codes
+        },
+        // 已选择的卡片接口中不会返回，所以追加进入列表
+        (val) => {
+          const idMap = val.reduce((pre, cur) => {
+            return {
+              ...pre,
+              [cur.id]: cur
+            };
+          }, {});
+          setAddList((prevState) => {
+            return prevState.map((item) => {
+              if (idMap[item.id]) {
+                return idMap[item.id];
+              }
+              return item;
+            });
+          });
+          return [...currentCustomerWalletPass || [], ...val].filter(
+            (item) => !(order == null ? void 0 : order.customer_id) || item.customer_id === (order == null ? void 0 : order.customer_id)
+          );
+        }
+      );
     }
-  }, [recommended]);
+  });
   (0, import_react.useEffect)(() => {
     if ((order == null ? void 0 : order.order_id) && searchValRef.current) {
       searchList(searchValRef.current, true);
@@ -140,16 +147,16 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     setOrder(res);
     setOpen(true);
     setCurrentWalletPass(walletPass);
-    if (recommended && recommended.length > 0) {
-      setSelectedVoucherIds(recommended.map((v) => v.id));
-    }
+    setTimeout(() => {
+      refreshList();
+    });
   };
   const searchList = async ({ code, customer_pin_key }, isSelectChange) => {
     var _a2;
     if (!(order == null ? void 0 : order.order_id)) return;
     setLoading(true);
     try {
-      const baseResult = await (0, import_serve.searchMachineCodeList)({
+      const result = await (0, import_serve.searchMachineCodeList)({
         order_id: order.order_id,
         code,
         prepare_payments,
@@ -157,7 +164,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
         customer_pin_key
       });
-      if (!baseResult) {
+      if (!result) {
         if (!isSelectChange) {
           (0, import_materials.PisellToast)({
             content: import_utils.locales.getText("tocPay.text.walletSearchEmpty")
@@ -168,11 +175,6 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       if (isSelectChange && !searchValRef.current) {
         return;
       }
-      let result = walletPassEvaluator.searchVoucherFormat({
-        vouchers: baseResult,
-        orderTotalAmount: order.total_amount,
-        products: detail
-      });
       setSearchData(
         (0, import_utils2.formatMachineCodeServer2CardList)(
           [...searchSelectData.details, ...result],
@@ -235,23 +237,23 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     });
   };
   const handleSelectOk = () => {
-    const otherCustomerSearchVouchers = searchSelectData.details.filter(
-      (item) => item.customer_id !== (order == null ? void 0 : order.customer_id)
+    changeWalletPass(
+      (0, import_utils.uniqueByKey)(
+        [
+          ...walletPassSelectCards || [],
+          ...searchSelectData.details
+        ],
+        "id"
+      )
     );
     setAddList((prevState) => {
       return (0, import_utils.uniqueByKey)(
-        [...prevState, ...otherCustomerSearchVouchers],
+        [...prevState, ...searchSelectData.details],
         "id"
+      ).filter(
+        (item) => !(order == null ? void 0 : order.customer_id) || item.customer_id !== (order == null ? void 0 : order.customer_id)
       );
     });
-    const newSelectedIds = (0, import_utils.uniqueByKey)(
-      [
-        ...selectedWithDetails || [],
-        ...searchSelectData.details
-      ],
-      "id"
-    ).map((v) => v.id);
-    setSelectedVoucherIds(newSelectedIds);
     handleSearchModalClose();
   };
   const handleAddChange = (0, import_ahooks.useMemoizedFn)(
@@ -263,15 +265,26 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       });
     }
   );
+  const changeWalletPass = (cards) => {
+    setCurrentWalletPass == null ? void 0 : setCurrentWalletPass({
+      cards,
+      amount: (0, import_utils3.calcWalletPassListAmount)(cards)
+    });
+    setTimeout(() => {
+      refreshList();
+    });
+  };
   const handleSelectChange = (val, details, type) => {
-    setSelectedVoucherIds(val);
+    let cards = details.map((item) => item.originData);
+    if (type === "other") {
+      cards = currentCustomerWalletPass.concat(cards);
+    } else if (type === "current") {
+      cards = otherCustomerWalletPass.concat(cards);
+    }
+    changeWalletPass(cards);
   };
   const handleRedeem = () => {
-    onWalletPassChange == null ? void 0 : onWalletPassChange({
-      ...currentWalletPass,
-      cards: selectedWithDetails,
-      amount: totalDeduction
-    });
+    onWalletPassChange == null ? void 0 : onWalletPassChange(currentWalletPass);
     setOpen(false);
   };
   const handleWalletClose = () => {
@@ -296,16 +309,16 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       onCancel: () => handleWalletClose(),
       cancelVisible: false,
       destroyOnClose: true,
-      okText: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.redeem"), " ", /* @__PURE__ */ import_react.default.createElement(Amount, { value: totalDeduction })),
+      okText: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.redeem"), " ", /* @__PURE__ */ import_react.default.createElement(Amount, { value: amount })),
       onOk: handleRedeem
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { marginTop: 24 } }, /* @__PURE__ */ import_react.default.createElement(import_MultiModeSearch.default, { onChange: handleSearch }), /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-pass-modal-multi-selection-available" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-pass-modal-multi-selection-available-title" }, /* @__PURE__ */ import_react.default.createElement(import_icons.InfoCircleOutlined, { className: "wallet-pass-modal-multi-selection-available-title-icon" }), import_utils.locales.getText("tocPay.text.multipleSelectionAvailable")), /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-pass-modal-multi-selection-available-desc" }, import_utils.locales.getText(
       "tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment"
-    )(walletSetting.name))), displayOtherVouchers.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    )(walletSetting.name))), otherCustomerWalletPassList.length > 0 && /* @__PURE__ */ import_react.default.createElement(
       import_List.default,
       {
         walletSetting,
-        data: (0, import_utils2.formatMachineCodeServer2CardList)(displayOtherVouchers, selectValue),
+        data: otherCustomerWalletPassList,
         title: import_utils.locales.getText("tocPay.text.couponCodesAdded"),
         onChange: handleOtherChange,
         value: selectValue,
@@ -318,11 +331,9 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         walletSetting,
         title: walletSetting.name,
         onChange: handleCurrentChange,
-        data: (0, import_utils2.formatMachineCodeServer2CardList)(displayVouchers, selectValue),
+        ref: listRef,
         value: selectValue,
-        onLoadingChange: setLoading,
-        loading,
-        customer_id: order == null ? void 0 : order.customer_id
+        onLoadingChange: setLoading
       }
     ))
   ), /* @__PURE__ */ import_react.default.createElement(
@@ -337,7 +348,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       okText: import_utils.locales.getText("tocPay.text.select"),
       onOk: handleSelectOk,
       okButtonProps: {
-        disabled: ((_f = searchSelectData.ids) == null ? void 0 : _f.length) === 0
+        disabled: ((_e = searchSelectData.ids) == null ? void 0 : _e.length) === 0
       }
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { marginTop: 24 } }, /* @__PURE__ */ import_react.default.createElement(

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

@@ -56,12 +56,6 @@ export declare type WalletPassDataType = {
     metadata?: {
         validity_type: string;
     };
-    /** 前端计算 可用最大金额 */
-    _available_max_amount?: number;
-    /** 前端计算 统一可用状态 */
-    _unified_available_status?: 0 | 1;
-    /** 前端计算 禁用原因 */
-    reason?: string;
 };
 declare type Shop = {
     id: number;

package/lib/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -53,8 +53,8 @@ var formatMachineCodeServer2CardList = (data, selectId = []) => {
       showDetail: false,
       showQrCode: false,
       code: item.code,
-      disabled: (0, import_utils.isNumber)(item._unified_available_status) ? !item._unified_available_status : !item.unified_available_status,
-      disabledReason: (0, import_utils.isNumber)(item._unified_available_status) ? item.reason : (_b = item.unified_messages) == null ? void 0 : _b.title,
+      disabled: !item.unified_available_status,
+      disabledReason: (_b = item.unified_messages) == null ? void 0 : _b.title,
       cover: (_c = item.product) == null ? void 0 : _c.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

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, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c;
   const MWCreditCardRef2 = (0, import_react.useRef)(null);
   const SuperPayAliPayH5Ref2 = (0, import_react.useRef)(null);
   const StripePayRef2 = (0, import_react.useRef)(null);
@@ -82,11 +82,6 @@ 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;
@@ -148,11 +143,11 @@ var PaymentMethods = (props, ref) => {
     }
     await onPayByType({ type, payGroup });
   };
-  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);
+  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);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2, _c2, _d;
     console.log("paymentResult isAppEnv", (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2));
-    if ((_d2 = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d2.call(_c2)) {
+    if ((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) {
       interaction.utils.mountFunction("global", "paymentResult", (strResult) => {
         console.log("paymentResult", strResult);
         if (!(0, import_utils2.isJson)(strResult)) return;
@@ -168,7 +163,7 @@ var PaymentMethods = (props, ref) => {
     }
   }, []);
   const onPayByType = async ({ type, payGroup }) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j, _k, _l, _m, _n;
+    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     console.log(type, payGroup);
     if (type === "mw.apple") {
       await ((_a2 = ApplePayRef2.current) == null ? void 0 : _a2.init({ payGroup }));
@@ -183,27 +178,27 @@ var PaymentMethods = (props, ref) => {
       return;
     }
     if (type === "superpay.alipay.h5") {
-      await ((_d2 = SuperPayAliPayH5Ref2.current) == null ? void 0 : _d2.init({ payGroup }));
+      await ((_d = SuperPayAliPayH5Ref2.current) == null ? void 0 : _d.init({ payGroup }));
       return;
     }
     if (type === "superpay.wechat.h5") {
-      await ((_e2 = SuperPayWxPayH5Ref2.current) == null ? void 0 : _e2.init({ payGroup }));
+      await ((_e = SuperPayWxPayH5Ref2.current) == null ? void 0 : _e.init({ payGroup }));
       return;
     }
     if (type === "stripe") {
-      (_f2 = StripePayRef2.current) == null ? void 0 : _f2.init({ payGroup });
+      (_f = StripePayRef2.current) == null ? void 0 : _f.init({ payGroup });
       return;
     }
     if (type === "pisell.offline_payment") {
-      await ((_g2 = OfflinePaymentRef2.current) == null ? void 0 : _g2.init({ payGroup }));
+      await ((_g = OfflinePaymentRef2.current) == null ? void 0 : _g.init({ payGroup }));
       return;
     }
     if (type === "pisell.bank_deposit") {
-      await ((_h2 = BankDepositRef2.current) == null ? void 0 : _h2.init({ payGroup }));
+      await ((_h = BankDepositRef2.current) == null ? void 0 : _h.init({ payGroup }));
       return;
     }
     if (type === "pisell.other.cashmanual") {
-      await ((_i2 = CashManualRef2.current) == null ? void 0 : _i2.init({ payGroup }));
+      await ((_i = CashManualRef2.current) == null ? void 0 : _i.init({ payGroup }));
       return;
     }
     if (type === "globepay.alipay.h5") {
@@ -233,6 +228,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, 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 }));
+  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 }));
 };
 var PaymentMethods_default = (0, import_react.forwardRef)(PaymentMethods);

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

@@ -166,9 +166,7 @@ var WalletPassBlock = (props, ref) => {
       ref: walletPassRef,
       walletSetting,
       onWalletPassChange,
-      walletPass: payGroup == null ? void 0 : payGroup.walletPass,
-      orderDetail: payGroup == null ? void 0 : payGroup.orderDetail,
-      total_amount: payGroup == null ? void 0 : payGroup.total_amount
+      walletPass: payGroup == null ? void 0 : payGroup.walletPass
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_WalletAvailable.default,

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

@@ -49,7 +49,6 @@ var import_usePaymentLogger = __toESM(require("../../../hooks/usePaymentLogger")
 var import_utils2 = require("../../../utils");
 var import_payGroup = require("./payGroup");
 var import_locales = __toESM(require("./locales"));
-var import_serve2 = require("./PaymentMethods/WalletPass/serve");
 var import_utils3 = require("./utils");
 var import_status = require("./status");
 var import_index = require("./index.less");
@@ -70,7 +69,6 @@ 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;
@@ -85,7 +83,7 @@ var ToCPay = (props, ref) => {
         ...initProps,
         status: "init",
         // 将支付回调储存在store, 方便其他模块调用
-        payCallback,
+        payCallback: props.callback,
         history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history,
         front_order_uuid: (0, import_utils.getUniqueId)("front_order_uuid_")
         // 支付组
@@ -122,7 +120,7 @@ var ToCPay = (props, ref) => {
     });
   };
   const init = async (initProps) => {
-    var _a2, _b2, _c2;
+    var _a2;
     const { renderType: renderType2 } = initProps;
     paymentLogger.addLog({
       key: "初始化开始",
@@ -133,18 +131,6 @@ 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);
@@ -157,20 +143,18 @@ var ToCPay = (props, ref) => {
       paymentLogger.addLog({
         key: "初始化错误",
         value: {
-          title: `订单${(_c2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _c2.order_id} 初始化失败: ${(error == null ? void 0 : error.message) || "未知错误"}`,
+          title: `订单${(_a2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _a2.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;
     }
   };
   const _getPaymentsAndWalletPass = async (order) => {
-    var _a2, _b2, _c2;
+    var _a2, _b2;
     paymentLogger.addLog({
       key: "获取支付列表开始",
       value: {
@@ -178,22 +162,11 @@ var ToCPay = (props, ref) => {
       }
     });
     try {
-      const [data, allList, orderBasicDetail] = await Promise.all([
-        (0, import_serve.getPaymentsAndWalletPass)({
-          order_id: order.order_id,
-          total_amount: order.amount,
-          sale_channel: order.sale_channel || "online-store"
-        }),
-        (0, import_serve2.getMachineCodeList)({
-          order_id: order.order_id,
-          available: 2,
-          prepare_payments: [],
-          filter_prepare_wallet_pass: 1,
-          sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
-          other_exact_codes: []
-        }),
-        (0, import_serve.getOrderBasicDetail)(order.order_id)
-      ]);
+      const data = await (0, import_serve.getPaymentsAndWalletPass)({
+        order_id: order.order_id,
+        total_amount: order.amount,
+        sale_channel: order.sale_channel || "online-store"
+      });
       const {
         remain_amount = 0,
         wallet_pass_recommend_list,
@@ -201,60 +174,39 @@ var ToCPay = (props, ref) => {
         payment_list,
         walletPass
       } = data || {};
-      const products = (orderBasicDetail.detail || []).map((item) => {
-        var _a3;
-        return {
-          ...item,
-          is_price_include_tax: orderBasicDetail.is_price_include_tax,
-          product_bundle: (_a3 = item.product_bundle || []) == null ? void 0 : _a3.map((bundle) => {
-            return {
-              ...bundle,
-              is_price_include_tax: orderBasicDetail.is_price_include_tax
-            };
-          })
-        };
-      });
-      const res = utils.walletPassEvaluator.getRecommendedVouchers({
-        orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
-        products,
-        vouchers: allList || []
-      });
-      const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
       paymentLogger.addLog({
         key: "支付数据获取",
         value: ""
       });
-      const waitAmount2 = new import_decimal.Decimal((order == null ? void 0 : order.amount) || 0).minus(new import_decimal.Decimal(recommendedAmount)).toNumber();
+      const withCustomerIdList = (wallet_pass_recommend_list || []).map(
+        (item) => {
+          return {
+            ...item,
+            customer_id: customer_id || item.customer_id
+          };
+        }
+      );
       dispatch({
         type: "setPayGroup",
         payload: {
           // ...state.payGroup,
           order_id: order == null ? void 0 : order.order_id,
           // total_amount: order?.amount,
-          orderDetail: orderBasicDetail,
           // 原订单信息
           _order: order,
           payment_group_id: order == null ? void 0 : order.payment_group_id,
           // 支付方式没有walletPass时walletPass设置null
           walletPass: walletPass ? {
-            ...(_b2 = state.payGroup) == null ? void 0 : _b2.walletPass,
+            ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
             ...walletPass,
-            // 推荐钱包
-            cards: recommended,
-            // 推荐金额
-            amount: recommendedAmount,
-            // 不可用钱包
-            noApplicableVoucher,
-            // 转换列表
-            transformList
-            // amount: wallet_pass_amount,
-            // cards: wallet_pass_recommend_list,
+            amount: wallet_pass_amount,
+            cards: withCustomerIdList
           } : null,
           total_amount: order == null ? void 0 : order.amount,
-          wait_amount: Math.max(0, waitAmount2)
+          wait_amount: remain_amount
         }
       });
-      await ((_c2 = paymentListRef.current) == null ? void 0 : _c2.init(payment_list, remain_amount || 0));
+      await ((_b2 = paymentListRef.current) == null ? void 0 : _b2.init(payment_list, remain_amount || 0));
       setTimeout(() => {
         setLoading(false);
       }, 100);
@@ -603,22 +555,6 @@ 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,
       {