@pisell/private-materials 6.6.24 → 6.6.26

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.module.less';
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

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

@@ -15,11 +15,16 @@ export interface WalletPassProps {
     walletPass: {
         cards: WalletPassDataType[];
         amount: number;
+        recommended?: WalletPassDataType[];
+        transformList?: WalletPassDataType[];
+        noApplicableVoucher?: WalletPassDataType[];
     };
     walletSetting: {
         name: string;
         popup_status: 0 | 1;
     };
+    orderDetail: any;
+    total_amount: number;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;

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

@@ -47,10 +47,14 @@ 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;
-  const { onWalletPassChange, walletPass, walletSetting } = props;
+  var _a, _b, _c, _d, _e, _f;
+  const { onWalletPassChange, walletPass, walletSetting, orderDetail, total_amount } = props;
   const context = (0, import_useEngineContext.default)();
-  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 { 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 [currentWalletPass, setCurrentWalletPass] = (0, import_react.useState)(walletPass);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -63,80 +67,69 @@ 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 { 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);
+  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);
       } else {
-        other.push(item);
+        otherCustomerVouchers.push(voucher);
       }
     });
-    return [current, other];
-  }, [walletPassSelectCards, order == null ? void 0 : order.customer_id]);
+    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]);
   const prepare_payments = (0, import_react.useMemo)(() => {
     return (0, import_utils3.formatWalletPassList2PreparePayments)(
       (0, import_utils.uniqueByKey)(
-        (walletPassSelectCards || []).concat(searchSelectData.details),
+        (selectedWithDetails || []).concat(searchSelectData.details),
         "id"
       )
     );
-  }, [walletPassSelectCards, searchSelectData]);
+  }, [selectedWithDetails, searchSelectData]);
   const selectValue = (0, import_react.useMemo)(() => {
-    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)
-          );
-        }
-      );
+    return selectedVoucherIds;
+  }, [selectedVoucherIds]);
+  (0, import_react.useEffect)(() => {
+    if (recommended && recommended.length > 0) {
+      setSelectedVoucherIds(recommended.map((v) => v.id));
     }
-  });
+  }, [recommended]);
   (0, import_react.useEffect)(() => {
     if ((order == null ? void 0 : order.order_id) && searchValRef.current) {
       searchList(searchValRef.current, true);
@@ -147,16 +140,16 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     setOrder(res);
     setOpen(true);
     setCurrentWalletPass(walletPass);
-    setTimeout(() => {
-      refreshList();
-    });
+    if (recommended && recommended.length > 0) {
+      setSelectedVoucherIds(recommended.map((v) => v.id));
+    }
   };
   const searchList = async ({ code, customer_pin_key }, isSelectChange) => {
     var _a2;
     if (!(order == null ? void 0 : order.order_id)) return;
     setLoading(true);
     try {
-      const result = await (0, import_serve.searchMachineCodeList)({
+      const baseResult = await (0, import_serve.searchMachineCodeList)({
         order_id: order.order_id,
         code,
         prepare_payments,
@@ -164,7 +157,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 (!result) {
+      if (!baseResult) {
         if (!isSelectChange) {
           (0, import_materials.PisellToast)({
             content: import_utils.locales.getText("tocPay.text.walletSearchEmpty")
@@ -175,6 +168,11 @@ 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],
@@ -237,23 +235,23 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     });
   };
   const handleSelectOk = () => {
-    changeWalletPass(
-      (0, import_utils.uniqueByKey)(
-        [
-          ...walletPassSelectCards || [],
-          ...searchSelectData.details
-        ],
-        "id"
-      )
+    const otherCustomerSearchVouchers = searchSelectData.details.filter(
+      (item) => item.customer_id !== (order == null ? void 0 : order.customer_id)
     );
     setAddList((prevState) => {
       return (0, import_utils.uniqueByKey)(
-        [...prevState, ...searchSelectData.details],
+        [...prevState, ...otherCustomerSearchVouchers],
         "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)(
@@ -265,26 +263,15 @@ 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) => {
-    let cards = details.map((item) => item.originData);
-    if (type === "other") {
-      cards = currentCustomerWalletPass.concat(cards);
-    } else if (type === "current") {
-      cards = otherCustomerWalletPass.concat(cards);
-    }
-    changeWalletPass(cards);
+    setSelectedVoucherIds(val);
   };
   const handleRedeem = () => {
-    onWalletPassChange == null ? void 0 : onWalletPassChange(currentWalletPass);
+    onWalletPassChange == null ? void 0 : onWalletPassChange({
+      ...currentWalletPass,
+      cards: selectedWithDetails,
+      amount: totalDeduction
+    });
     setOpen(false);
   };
   const handleWalletClose = () => {
@@ -309,16 +296,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: amount })),
+      okText: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.redeem"), " ", /* @__PURE__ */ import_react.default.createElement(Amount, { value: totalDeduction })),
       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))), otherCustomerWalletPassList.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    )(walletSetting.name))), displayOtherVouchers.length > 0 && /* @__PURE__ */ import_react.default.createElement(
       import_List.default,
       {
         walletSetting,
-        data: otherCustomerWalletPassList,
+        data: (0, import_utils2.formatMachineCodeServer2CardList)(displayOtherVouchers, selectValue),
         title: import_utils.locales.getText("tocPay.text.couponCodesAdded"),
         onChange: handleOtherChange,
         value: selectValue,
@@ -331,9 +318,9 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         walletSetting,
         title: walletSetting.name,
         onChange: handleCurrentChange,
-        ref: listRef,
+        data: (0, import_utils2.formatMachineCodeServer2CardList)(displayVouchers, selectValue),
         value: selectValue,
-        onLoadingChange: setLoading
+        loading
       }
     ))
   ), /* @__PURE__ */ import_react.default.createElement(
@@ -348,7 +335,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       okText: import_utils.locales.getText("tocPay.text.select"),
       onOk: handleSelectOk,
       okButtonProps: {
-        disabled: ((_e = searchSelectData.ids) == null ? void 0 : _e.length) === 0
+        disabled: ((_f = searchSelectData.ids) == null ? void 0 : _f.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,6 +56,12 @@ 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: !item.unified_available_status,
-      disabledReason: (_b = item.unified_messages) == null ? void 0 : _b.title,
+      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,
       cover: (_c = item.product) == null ? void 0 : _c.cover,
       qrCode: item.code,
       validDate: voucherTime(item),

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

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

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

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

@@ -49,6 +49,7 @@ 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");
@@ -154,7 +155,7 @@ var ToCPay = (props, ref) => {
     }
   };
   const _getPaymentsAndWalletPass = async (order) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
     paymentLogger.addLog({
       key: "获取支付列表开始",
       value: {
@@ -162,11 +163,22 @@ var ToCPay = (props, ref) => {
       }
     });
     try {
-      const data = await (0, import_serve.getPaymentsAndWalletPass)({
-        order_id: order.order_id,
-        total_amount: order.amount,
-        sale_channel: order.sale_channel || "online-store"
-      });
+      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 {
         remain_amount = 0,
         wallet_pass_recommend_list,
@@ -174,6 +186,25 @@ 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: ""
@@ -186,27 +217,37 @@ var ToCPay = (props, ref) => {
           };
         }
       );
+      const waitAmount2 = new import_decimal.Decimal((order == null ? void 0 : order.amount) || 0).minus(new import_decimal.Decimal(recommendedAmount)).toNumber();
       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 ? {
-            ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
+            ...(_b2 = state.payGroup) == null ? void 0 : _b2.walletPass,
             ...walletPass,
-            amount: wallet_pass_amount,
-            cards: withCustomerIdList
+            // 推荐钱包
+            cards: recommended,
+            // 推荐金额
+            amount: recommendedAmount,
+            // 不可用钱包
+            noApplicableVoucher,
+            // 转换列表
+            transformList
+            // amount: wallet_pass_amount,
+            // cards: wallet_pass_recommend_list,
           } : null,
           total_amount: order == null ? void 0 : order.amount,
-          wait_amount: remain_amount
+          wait_amount: Math.max(0, waitAmount2)
         }
       });
-      await ((_b2 = paymentListRef.current) == null ? void 0 : _b2.init(payment_list, remain_amount || 0));
+      await ((_c2 = paymentListRef.current) == null ? void 0 : _c2.init(payment_list, remain_amount || 0));
       setTimeout(() => {
         setLoading(false);
       }, 100);