@pisell/private-materials 3.3.25 → 3.3.27

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.js

@@ -0,0 +1,75 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.tsx
+var ScheduleTimeItem_exports = {};
+__export(ScheduleTimeItem_exports, {
+  default: () => ScheduleTimeItem_default
+});
+module.exports = __toCommonJS(ScheduleTimeItem_exports);
+var import_react = __toESM(require("react"));
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_dayjs = __toESM(require("dayjs"));
+var import_index = require("./index.less");
+var ScheduleTimeItem = ({ timeList }) => {
+  const [times, setTimes] = (0, import_react.useState)([]);
+  const [isExpand, setIsExpand] = (0, import_react.useState)(false);
+  (0, import_react.useEffect)(() => {
+    if ((timeList == null ? void 0 : timeList.length) > 4) {
+      setTimes(timeList == null ? void 0 : timeList.slice(0, 4));
+    } else {
+      setTimes(timeList);
+    }
+  }, [timeList]);
+  const handleExpand = () => {
+    const nextExpandStatus = !isExpand;
+    if (nextExpandStatus) {
+      setTimes(timeList);
+    } else {
+      setTimes(timeList == null ? void 0 : timeList.slice(0, 4));
+    }
+    setIsExpand(nextExpandStatus);
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "schedule-time-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "schedule-time-item-content-wrapper" }, (times == null ? void 0 : times.length) > 0 ? times == null ? void 0 : times.map((item) => /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: (0, import_utils.isMobile)() ? "schedule-time-item-content-mobile" : "schedule-time-item-content",
+      key: (item.start_at || "") + (item.end_at || "")
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "schedule-time-item-content-time" }, (item == null ? void 0 : item.start_date) || ""),
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "schedule-time-item-content-time" }, (0, import_dayjs.default)((item == null ? void 0 : item.start_at) || "").format("HH:mm"), " - ", (0, import_dayjs.default)((item == null ? void 0 : item.end_at) || "").format("HH:mm"))
+  )) : /* @__PURE__ */ import_react.default.createElement(import_materials.PisellEmpty, null)), (timeList == null ? void 0 : timeList.length) > 4 && /* @__PURE__ */ import_react.default.createElement("div", { className: "schedule-time-item-expand-btn", onClick: handleExpand }, isExpand ? import_utils.locales.getText("pisell2.event.schedule.item.collapse") : import_utils.locales.getText("pisell2.event.schedule.item.expand"), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.Iconfont,
+    {
+      type: isExpand ? "pisell2-chevron-up-double" : "pisell2-chevron-down-double",
+      className: "schedule-time-item-expand-btn-icon"
+    }
+  )));
+};
+var ScheduleTimeItem_default = ScheduleTimeItem;

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.less

@@ -0,0 +1,63 @@
+.schedule-time-item {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+
+  .schedule-time-item-content-wrapper {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16px;
+  }
+
+  .schedule-time-item-content-mobile {
+    width: 100%;
+    padding: 14px 16px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    border-radius: 8px;
+    border: 1px solid #f5f5f5;
+    background: #fff;
+    gap: 8px;
+  }
+
+  .schedule-time-item-content {
+    width: calc(50% - 8px);
+    padding: 14px 16px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-radius: 8px;
+    border: 1px solid #f5f5f5;
+    background: #fff;
+
+    .schedule-time-item-content-time {
+      color: #141414;
+      text-align: center;
+      font-size: 14px;
+      font-weight: 600;
+    }
+  }
+
+  .schedule-time-item-expand-btn {
+    display: flex;
+    flex: 1 0 0;
+    height: 48px;
+    padding: 14px 16px;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
+    border-radius: 8px;
+    border: 1px solid #f5f5f5;
+    background: #fff;
+    cursor: pointer;
+
+    .schedule-time-item-expand-btn-icon {
+      margin-top: 2px;
+      font-size: 20px;
+    }
+  }
+}

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimes/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import './index.less';
+import { CalendarDataItem } from '../../../../type';
+interface ScheduleTimesProps {
+    month: string;
+    schedulesData: CalendarDataItem[];
+}
+declare const ScheduleTimes: React.FC<ScheduleTimesProps>;
+export default ScheduleTimes;

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimes/index.js

@@ -0,0 +1,64 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eventBooking/components/scheduleCalendar/components/ScheduleTimes/index.tsx
+var ScheduleTimes_exports = {};
+__export(ScheduleTimes_exports, {
+  default: () => ScheduleTimes_default
+});
+module.exports = __toCommonJS(ScheduleTimes_exports);
+var import_react = __toESM(require("react"));
+var import_dayjs = __toESM(require("dayjs"));
+var import_materials = require("@pisell/materials");
+var import_index = require("./index.less");
+var import_ScheduleTimeItem = __toESM(require("../ScheduleTimeItem"));
+var ScheduleTimes = ({
+  month,
+  schedulesData
+}) => {
+  const [timeList, setTimeList] = (0, import_react.useState)([]);
+  (0, import_react.useEffect)(() => {
+    const timeList2 = [];
+    for (const item of schedulesData) {
+      const date = (0, import_dayjs.default)(item.date);
+      if (date.isAfter(month, "month")) {
+        break;
+      }
+      if (date.isSame(month, "month")) {
+        timeList2.push(...(item == null ? void 0 : item.times) || []);
+      }
+    }
+    if ((timeList2 == null ? void 0 : timeList2.length) > 0) {
+      setTimeList(timeList2);
+    } else {
+      setTimeList([]);
+    }
+  }, [month, schedulesData]);
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "schedule-times-container" }, (timeList == null ? void 0 : timeList.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(import_ScheduleTimeItem.default, { key: month, timeList }) : /* @__PURE__ */ import_react.default.createElement(import_materials.PisellEmpty, null));
+};
+var ScheduleTimes_default = ScheduleTimes;

package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimes/index.less

@@ -0,0 +1,7 @@
+.schedule-times-container {
+  width: 100%;
+  padding-top: 14px;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+}

package/lib/components/eventBooking/components/scheduleCalendar/index.d.ts

@@ -8,6 +8,7 @@ export interface EventResourceUsabilityProps {
     className?: string;
     style?: React.CSSProperties;
     onChange?: (e: number) => void;
+    type?: 'calendarView' | 'textList';
 }
 declare const EventScheduleCalendar: React.FC<EventResourceUsabilityProps>;
 export default EventScheduleCalendar;

package/lib/components/eventBooking/components/scheduleCalendar/index.js

@@ -45,16 +45,17 @@ var EventScheduleCalendar = ({
   showScheduleTime = true,
   className,
   style,
-  onChange
+  onChange,
+  type = "calendarView"
 }) => {
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
+  const [selectedYear, setSelectedYear] = (0, import_react.useState)((0, import_dayjs.default)().year());
   const [currentMonth, setCurrentMonth] = (0, import_react.useState)(
     (/* @__PURE__ */ new Date()).toISOString().slice(0, 7)
   );
   const [selectedDate, setSelectedDate] = (0, import_react.useState)("");
   const [selectedTimes, setSelectedTimes] = (0, import_react.useState)([]);
-  const context = (0, import_useEngineContext.default)();
-  const utils = context.appHelper.utils || {};
-  const [selectedYear, setSelectedYear] = (0, import_react.useState)((0, import_dayjs.default)().year());
   (0, import_react.useEffect)(() => {
     if (data == null ? void 0 : data.length) {
       const today = /* @__PURE__ */ new Date();
@@ -63,9 +64,13 @@ var EventScheduleCalendar = ({
         const itemDate = new Date(item.date);
         return itemDate >= today;
       });
-      if (firstAvailableDate) {
-        setSelectedDate(firstAvailableDate.date);
-        setSelectedTimes(firstAvailableDate.times || []);
+      if (firstAvailableDate && (firstAvailableDate == null ? void 0 : firstAvailableDate.date)) {
+        const availableDate = firstAvailableDate.date;
+        const availableTimes = (firstAvailableDate == null ? void 0 : firstAvailableDate.times) || [];
+        setSelectedYear((0, import_dayjs.default)(availableDate).year());
+        setCurrentMonth(new Date(availableDate).toISOString().slice(0, 7));
+        setSelectedDate(availableDate);
+        setSelectedTimes(availableTimes || []);
       }
     }
   }, [data]);
@@ -109,17 +114,18 @@ var EventScheduleCalendar = ({
         schedulesData: data || [],
         selectDate: selectedDate,
         onSelect: handleSelectDate,
-        onChange: (e, type) => {
+        onChange: (e, type2) => {
           setCurrentMonth(e);
           const currentYear = (0, import_dayjs.default)().year();
           const selectedYear2 = (0, import_dayjs.default)(e).year();
           setSelectedYear(selectedYear2);
-        }
+        },
+        type
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("category-list") }, selectedTimes.map((d, i) => {
+    type !== "textList" ? /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("category-list") }, selectedTimes.map((d, i) => {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: "category-item", key: i }, showScheduleName ? /* @__PURE__ */ import_react.default.createElement("div", { className: "category-title" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "category-icon" }, /* @__PURE__ */ import_react.default.createElement("span", null)), /* @__PURE__ */ import_react.default.createElement("span", null, d.name)) : null, showScheduleTime ? /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("time") }, formatDateStr(d.start_at), " - ", formatDateStr(d.end_at)) : null);
-    }))
+    })) : null
   );
 };
 var scheduleCalendar_default = EventScheduleCalendar;

package/lib/components/eventBooking/components/scheduleCalendar/index.less

@@ -37,6 +37,8 @@
   }
 
   .month-item-box {
+    width: 100%;
+
     .pisell-lowcode-picker-body {
       padding: 0;
     }

package/lib/components/eventBooking/index.js

@@ -62,7 +62,7 @@ var Content = () => {
       form_data_status: "active"
     });
   }, [form_id]);
-  return getResourceList.data ? /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: `event-booking-wrap ${(0, import_utils.isMobile)() ? "event-booking-mobile-wrap" : ""}`
@@ -70,7 +70,7 @@ var Content = () => {
     /* @__PURE__ */ import_react.default.createElement(import_Header.default, null),
     /* @__PURE__ */ import_react.default.createElement(import_Content.default, null),
     (0, import_utils.isMobile)() && (currentStepData == null ? void 0 : currentStepData.key) !== "select-category" ? /* @__PURE__ */ import_react.default.createElement(import_Footer.default, null) : null
-  ) : null;
+  );
 };
 var EventBooking = () => {
   return /* @__PURE__ */ import_react.default.createElement(import_Sales.default, { config: { useSessionStorage: true } }, /* @__PURE__ */ import_react.default.createElement(Content, null));

package/lib/components/eventBooking/locales.d.ts

@@ -69,6 +69,8 @@ declare const _default: {
         'pisell2.event.event.full.ok': string;
         'pisell2.event.capacity.limit.reached.title': string;
         'pisell2.event.capacity.limit.reached.tip': string;
+        'pisell2.event.schedule.item.expand': string;
+        'pisell2.event.schedule.item.collapse': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -140,6 +142,8 @@ declare const _default: {
         'pisell2.event.event.full.ok': string;
         'pisell2.event.capacity.limit.reached.title': string;
         'pisell2.event.capacity.limit.reached.tip': string;
+        'pisell2.event.schedule.item.expand': string;
+        'pisell2.event.schedule.item.collapse': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -211,6 +215,8 @@ declare const _default: {
         'pisell2.event.event.full.ok': string;
         'pisell2.event.capacity.limit.reached.title': string;
         'pisell2.event.capacity.limit.reached.tip': string;
+        'pisell2.event.schedule.item.expand': string;
+        'pisell2.event.schedule.item.collapse': string;
     };
 };
 export default _default;

package/lib/components/eventBooking/locales.js

@@ -23,7 +23,7 @@ __export(locales_exports, {
 });
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
-  "en": {
+  en: {
     "pisell2.event.calendar.limit.unavailable": "Unavailable",
     "pisell2.event.calendar.limit.sold.out": "Sold out",
     "pisell2.event.calendar.limit.call.to.book": "Call to book",
@@ -92,7 +92,9 @@ var locales_default = {
     "pisell2.event.event.full.tip": "Sorry, this event has reached its maximum capacity. Please select another event.",
     "pisell2.event.event.full.ok": "Ok",
     "pisell2.event.capacity.limit.reached.title": "Capacity limit reached",
-    "pisell2.event.capacity.limit.reached.tip": "One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout."
+    "pisell2.event.capacity.limit.reached.tip": "One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.",
+    "pisell2.event.schedule.item.expand": "See more",
+    "pisell2.event.schedule.item.collapse": "See less"
   },
   "zh-CN": {
     "pisell2.event.calendar.limit.unavailable": "不可预约",
@@ -163,7 +165,9 @@ var locales_default = {
     "pisell2.event.event.full.tip": "抱歉，当前活动名额已满。请选择其他活动。",
     "pisell2.event.event.full.ok": "好的",
     "pisell2.event.capacity.limit.reached.title": "活动名额已满",
-    "pisell2.event.capacity.limit.reached.tip": "购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。"
+    "pisell2.event.capacity.limit.reached.tip": "购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。",
+    "pisell2.event.schedule.item.expand": "查看更多",
+    "pisell2.event.schedule.item.collapse": "收起"
   },
   "zh-HK": {
     "pisell2.event.calendar.limit.unavailable": "不可預約",
@@ -234,6 +238,8 @@ var locales_default = {
     "pisell2.event.event.full.tip": "抱歉，當前活動名額已滿。請選擇其他活動。",
     "pisell2.event.event.full.ok": "好的",
     "pisell2.event.capacity.limit.reached.title": "活動名額已滿",
-    "pisell2.event.capacity.limit.reached.tip": "購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。"
+    "pisell2.event.capacity.limit.reached.tip": "購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。",
+    "pisell2.event.schedule.item.expand": "查看更多",
+    "pisell2.event.schedule.item.collapse": "收起"
   }
 };

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

@@ -7,6 +7,9 @@ export interface WalletPassListProps {
     data?: PisellWalletPassCardProps[];
     onChange?: (val: number[], valDetail: PisellWalletPassCardProps[]) => void;
     value?: number[];
+    walletSetting: {
+        name: string;
+    };
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;

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

@@ -41,7 +41,7 @@ var import_utils2 = require("../utils");
 var import_index = require("./index.less");
 var WalletPassList = (0, import_react.forwardRef)(
   (props, ref) => {
-    const { title, onChange, data: propsData, value } = props;
+    const { title, onChange, data: propsData, value, walletSetting } = props;
     const [data, setData] = (0, import_react.useState)(
       propsData || []
     );
@@ -99,7 +99,7 @@ var WalletPassList = (0, import_react.forwardRef)(
               style: { color: "#667085" }
             }
           ),
-          description: import_utils.locales.getText("tocPay.text.walletPassEmpty")
+          description: import_utils.locales.getText("tocPay.text.walletPassEmpty")(walletSetting == null ? void 0 : walletSetting.name)
         }
       );
     }, []);

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { WalletPassDataType } from './serve';
 import { PayGroup } from '../../model';
+import './index.less';
 export interface WalletPassRef {
     init: (val?: PayGroup & {
         customer_id?: number;
@@ -15,6 +16,10 @@ export interface WalletPassProps {
         cards: WalletPassDataType[];
         amount: number;
     };
+    walletSetting: {
+        name: string;
+        popup_status: 0 | 1;
+    };
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;

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

@@ -36,18 +36,21 @@ var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_ahooks = require("ahooks");
+var import_icons = require("@ant-design/icons");
 var import_MultiModeSearch = __toESM(require("./MultiModeSearch"));
 var import_List = __toESM(require("./List"));
 var import_serve = require("./serve");
 var import_utils2 = require("./utils");
 var import_utils3 = require("../../utils");
+var import_index = require("./index.less");
 var { Amount } = import_materials.PisellText;
 var WalletPass = (0, import_react.forwardRef)((props, ref) => {
   var _a;
-  const { onWalletPassChange, walletPass } = props;
+  const { onWalletPassChange, walletPass, walletSetting } = props;
   const [currentWalletPass, setCurrentWalletPass] = (0, import_react.useState)(walletPass);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [searchOpen, setSearchOpen] = (0, import_react.useState)(false);
+  const [addList, setAddList] = (0, import_react.useState)([]);
   const [order, setOrder] = (0, import_react.useState)(null);
   const [searchData, setSearchData] = (0, import_react.useState)([]);
   const [searchSelectData, setSearchSelectData] = (0, import_react.useState)({
@@ -82,11 +85,17 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     return (walletPassSelectCards == null ? void 0 : walletPassSelectCards.map((item) => item.id)) || [];
   }, [walletPassSelectCards]);
   const otherCustomerWalletPassList = (0, import_react.useMemo)(() => {
-    return (0, import_utils2.formatMachineCodeServer2CardList)(
-      otherCustomerWalletPass,
-      selectValue
-    );
-  }, [otherCustomerWalletPass, selectValue]);
+    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, _b;
     if ((order == null ? void 0 : order.order_id) && (order == null ? void 0 : order.customer_id)) {
@@ -96,10 +105,29 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
           available: 2,
           prepare_payments,
           filter_prepare_wallet_pass: 1,
-          sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store"
+          sale_channel: ((_a2 = order._order) == null ? void 0 : _a2.sale_channel) || "online-store",
+          other_exact_codes
         },
         // 已选择的卡片接口中不会返回，所以追加进入列表
-        (val) => [...currentCustomerWalletPass || [], ...val]
+        (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)
+          );
+        }
       );
     }
   });
@@ -178,6 +206,14 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
         "id"
       )
     );
+    setAddList((prevState) => {
+      return (0, import_utils.uniqueByKey)(
+        [...prevState, ...searchSelectData.details],
+        "id"
+      ).filter(
+        (item) => !(order == null ? void 0 : order.customer_id) || item.customer_id !== (order == null ? void 0 : order.customer_id)
+      );
+    });
     handleSearchModalClose();
   };
   const handleAddChange = (0, import_ahooks.useMemoizedFn)(
@@ -228,7 +264,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
-      title: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.walletPass")),
+      title: /* @__PURE__ */ import_react.default.createElement("div", null, walletSetting.name),
       open,
       onCancel: () => handleWalletClose(),
       cancelVisible: false,
@@ -236,9 +272,12 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
       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 }), otherCustomerWalletPass.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    /* @__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(
       import_List.default,
       {
+        walletSetting,
         data: otherCustomerWalletPassList,
         title: import_utils.locales.getText("tocPay.text.couponCodesAdded"),
         onChange: handleOtherChange,
@@ -247,7 +286,8 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     ), /* @__PURE__ */ import_react.default.createElement(
       import_List.default,
       {
-        title: import_utils.locales.getText("tocPay.text.walletPass"),
+        walletSetting,
+        title: walletSetting.name,
         onChange: handleCurrentChange,
         ref: listRef,
         value: selectValue
@@ -271,6 +311,7 @@ var WalletPass = (0, import_react.forwardRef)((props, ref) => {
     /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { marginTop: 24 } }, /* @__PURE__ */ import_react.default.createElement(
       import_List.default,
       {
+        walletSetting,
         data: searchData,
         value: searchSelectData.ids,
         onChange: handleAddChange

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

@@ -0,0 +1,30 @@
+.wallet-pass-modal-multi-selection-available {
+  border-radius: 10px;
+  background: #edf4ff;
+  display: flex;
+  padding: 12px 20px;
+  flex-direction: column;
+  align-items: flex-start;
+  margin-top: 20px;
+  .wallet-pass-modal-multi-selection-available-title {
+    color: var(--Color, #40484f);
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 22px; /* 183.333% */
+    display: flex;
+    align-items: center;
+    margin-bottom: 4px;
+
+    .wallet-pass-modal-multi-selection-available-title-icon {
+        color: #1E1E1E;
+        margin-right: 8px;
+        font-size: 16px;
+    }
+  }
+  .wallet-pass-modal-multi-selection-available-desc {
+    color: var(--Color, #40484f);
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 16px; /* 133.333% */
+  }
+}

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

@@ -8,6 +8,7 @@ export declare type MachineCodeListParams = {
     }[];
     filter_prepare_wallet_pass: 1 | 0;
     sale_channel: string;
+    other_exact_codes?: string[];
 };
 export declare type WalletPassDataType = {
     id: number;
@@ -33,6 +34,7 @@ export declare type WalletPassDataType = {
     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;

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

@@ -25,6 +25,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
+var import_utils2 = require("../../utils");
 var voucherTime = (data) => {
   const config = import_materials.globalConfig.getConfig();
   if (data == null ? void 0 : data.expire_date) {
@@ -43,7 +44,7 @@ var formatMachineCodeServer2CardList = (data, selectId = []) => {
       name: item.product_name,
       storeName: (_a = item.shop) == null ? void 0 : _a.name,
       balance: item.balance_par_value,
-      redeem: item.available_max_amount,
+      redeem: (0, import_utils2.getAvailableMaxAmount)(item),
       showRedeem: selectId.includes(item.id),
       showBalanceSymbol: item.tag !== "point_card",
       // balanceTitle: item.tag !== 'point_card' ? "" : "",

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

@@ -0,0 +1,16 @@
+import React from 'react';
+import { PayGroup } from '../../../model';
+import './index.less';
+export interface WalletAvailableProps {
+    onOk: () => void;
+    payGroup?: PayGroup;
+    walletSetting: {
+        name: string;
+        popup_status: 0 | 1;
+    };
+}
+export interface WalletAvailableRef {
+    open: () => void;
+}
+declare const _default: React.ForwardRefExoticComponent<WalletAvailableProps & React.RefAttributes<WalletAvailableRef>>;
+export default _default;