@pisell/private-materials 6.8.6 → 6.8.8

package/lib/components/booking/components/footer/index.js

@@ -51,6 +51,7 @@ var import_index = require("./index.less");
 var import_serve2 = require("./serve");
 var import_utils3 = require("./utils");
 var import_noteModal = __toESM(require("../../../../plus/noteModal"));
+var import_confirmHolderModal = require("../../utils/confirmHolderModal");
 var import__ = require("../../../../index");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
@@ -61,6 +62,7 @@ var import_useCustomer = require("../../../ticketBooking/hooks/pisellos/useCusto
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
+var import_utils5 = require("../../utils");
 var Footer = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
   const { state, buttons, dispatch, source } = props;
@@ -600,7 +602,7 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
     const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
     if (isToastMode) {
       (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
@@ -609,6 +611,14 @@ var Footer = (props) => {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
     }
+    debugger;
+    const hasUnspecifiedHolderProduct = (_d2 = state.service.value) == null ? void 0 : _d2.some((item) => {
+      var _a3, _b3, _c3;
+      return (!((_a3 = item._extend) == null ? void 0 : _a3.holder_id) || ((_c3 = (_b3 = item._extend) == null ? void 0 : _b3.holder_id) == null ? void 0 : _c3.length) === 0) && !(0, import_utils2.isNormalProductByDurationSchedule)(item);
+    });
+    if (!(0, import_utils5.isWalkIn)((_f2 = (_e2 = state.client) == null ? void 0 : _e2.value) == null ? void 0 : _f2.id) && (0, import_utils2.getIsSubjectRequire)(state) && hasUnspecifiedHolderProduct) {
+      await (0, import_confirmHolderModal.showConfirmHolderModal)(state, dispatch);
+    }
     if (isBooking4Shop && (0, import_utils2.getIsSubjectRequire)(state) && (0, import_utils3.checkHolderIsError)(state)) {
       return;
     }
@@ -619,7 +629,7 @@ var Footer = (props) => {
     const createApi = state.renderType === "eventBooking" ? import_serve2.createEventBooking : createBooking;
     let saveOtherValue = {};
     if (type === "save") {
-      saveOtherValue = await ((_d2 = state == null ? void 0 : state.onSave) == null ? void 0 : _d2.call(state, state.client)) || {};
+      saveOtherValue = await ((_g2 = state == null ? void 0 : state.onSave) == null ? void 0 : _g2.call(state, state.client)) || {};
     }
     try {
       let callbackData = null;
@@ -665,7 +675,7 @@ var Footer = (props) => {
           { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
           {
             key: "店铺id",
-            value: (_h2 = (_g2 = (_f2 = (_e2 = store == null ? void 0 : store.getState) == null ? void 0 : _e2.call(store)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h2.id
+            value: (_k2 = (_j2 = (_i2 = (_h2 = store == null ? void 0 : store.getState) == null ? void 0 : _h2.call(store)) == null ? void 0 : _i2.global) == null ? void 0 : _j2.globalConfig) == null ? void 0 : _k2.id
           },
           {
             key: "shopApi",
@@ -1251,6 +1261,8 @@ var Footer = (props) => {
     }
   };
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    var _a2, _b2, _c2;
+    const beforeValue = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value;
     dispatch({
       type: "setClient",
       payload: {
@@ -1258,6 +1270,15 @@ var Footer = (props) => {
         edit: true
       }
     });
+    if ((beforeValue == null ? void 0 : beforeValue.id) === (value == null ? void 0 : value.id)) return;
+    if ((_c2 = (_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.length) {
+      dispatch({
+        type: "setService",
+        payload: {
+          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
+        }
+      });
+    }
   });
   const { selectCustomer } = (0, import_useCustomer.useCustomer)({
     changeCustomerToGlobalState
@@ -1452,6 +1473,6 @@ var Footer = (props) => {
         }
       }
     }
-  ));
+  ), /* @__PURE__ */ import_react.default.createElement(import_confirmHolderModal.ConfirmHolderModal, null));
 };
 var footer_default = Footer;

package/lib/components/booking/components/footer/utils.d.ts

@@ -56,5 +56,12 @@ export declare const formatOriginalPrice: (item: any) => number;
 export declare const formatSellingPrice: (item: any) => number;
 export declare const getSourceProductPrice: (item: any) => number;
 export declare const getMainProductSellingPrice: (item: any) => number | undefined;
+/**
+ * @title: 是否包含跨日预约商品
+ * @description:
+ * @param {any} data
+ * @return {*}
+ */
+export declare const getHasMultiDayProduct: (data: any) => any;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

package/lib/components/booking/components/footer/utils.js

@@ -39,6 +39,7 @@ __export(utils_exports, {
   formatSellingPrice: () => formatSellingPrice,
   formatValues: () => formatValues,
   getBundleDiscountList: () => getBundleDiscountList,
+  getHasMultiDayProduct: () => getHasMultiDayProduct,
   getMainProductSellingPrice: () => getMainProductSellingPrice,
   getSourceProductPrice: () => getSourceProductPrice
 });
@@ -291,22 +292,22 @@ var formatMetaData = (item, isMultiDayPrices) => {
   return metadata;
 };
 var formatProductMetadata = (item) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
   let metadata = {};
-  if ((_a = item._extend) == null ? void 0 : _a.surcharge_fee) {
-    metadata.main_product_attached_bundle_surcharge_fee = (_b = item._extend) == null ? void 0 : _b.surcharge_fee;
+  if (((_a = item._extend) == null ? void 0 : _a.surcharge_fee) || ((_b = item.metadata) == null ? void 0 : _b.main_product_attached_bundle_surcharge_fee)) {
+    metadata.main_product_attached_bundle_surcharge_fee = ((_c = item._extend) == null ? void 0 : _c.surcharge_fee) || ((_d = item.metadata) == null ? void 0 : _d.main_product_attached_bundle_surcharge_fee);
   }
-  if ((_c = item._extend) == null ? void 0 : _c.main_product_attached_bundle_tax_fee) {
-    metadata.main_product_attached_bundle_tax_fee = (_d = item._extend) == null ? void 0 : _d.main_product_attached_bundle_tax_fee;
+  if (((_e = item._extend) == null ? void 0 : _e.main_product_attached_bundle_tax_fee) || ((_f = item.metadata) == null ? void 0 : _f.main_product_attached_bundle_tax_fee)) {
+    metadata.main_product_attached_bundle_tax_fee = ((_g = item._extend) == null ? void 0 : _g.main_product_attached_bundle_tax_fee) || ((_h = item.metadata) == null ? void 0 : _h.main_product_attached_bundle_tax_fee);
   }
-  if ((_e = item._extend) == null ? void 0 : _e.surcharge_rounding_remainder) {
-    metadata.surcharge_rounding_remainder = (_f = item._extend) == null ? void 0 : _f.surcharge_rounding_remainder;
+  if (((_i = item._extend) == null ? void 0 : _i.surcharge_rounding_remainder) || ((_j = item.metadata) == null ? void 0 : _j.surcharge_rounding_remainder)) {
+    metadata.surcharge_rounding_remainder = ((_k = item._extend) == null ? void 0 : _k.surcharge_rounding_remainder) || ((_l = item.metadata) == null ? void 0 : _l.surcharge_rounding_remainder);
   }
-  if ((_g = item._extend) == null ? void 0 : _g.relation_surcharge_ids) {
-    metadata.relation_surcharge_ids = (_h = item._extend) == null ? void 0 : _h.relation_surcharge_ids;
+  if (((_m = item._extend) == null ? void 0 : _m.relation_surcharge_ids) || ((_n = item.metadata) == null ? void 0 : _n.relation_surcharge_ids)) {
+    metadata.relation_surcharge_ids = ((_o = item._extend) == null ? void 0 : _o.relation_surcharge_ids) || ((_p = item.metadata) == null ? void 0 : _p.relation_surcharge_ids);
   }
-  if ((_i = item._extend) == null ? void 0 : _i.unique_identification_number) {
-    metadata.unique_identification_number = (_j = item._extend) == null ? void 0 : _j.unique_identification_number;
+  if (((_q = item._extend) == null ? void 0 : _q.unique_identification_number) || ((_r = item.metadata) == null ? void 0 : _r.unique_identification_number)) {
+    metadata.unique_identification_number = ((_s = item._extend) == null ? void 0 : _s.unique_identification_number) || ((_t = item.metadata) == null ? void 0 : _t.unique_identification_number);
   }
   return metadata;
 };
@@ -367,6 +368,7 @@ var formatProducts = (item, quantity) => {
   if (item.isCustomItem) {
     item.product_id = 0;
   }
+  debugger;
   return {
     "name": item.name,
     "num": quantity || item._extend.quantity,
@@ -429,6 +431,14 @@ var getHolderByIndex = (holder, index) => {
     form_record: [(_a = holder == null ? void 0 : holder.form_record) == null ? void 0 : _a[index]].filter(Boolean)
   };
 };
+var getHasMultiDayProduct = (data) => {
+  const list = data.service.value;
+  const isHas = list.some((item) => {
+    var _a;
+    return (_a = item._extend) == null ? void 0 : _a.groupId;
+  });
+  return isHas;
+};
 var formatBookings = (data, values) => {
   const isDay = (0, import_utils4.isDaysBooking)(data);
   const isEvent = (0, import_utils4.isEventBooking)(data);
@@ -450,7 +460,7 @@ var formatBookings = (data, values) => {
   let bookings = [];
   let obj = {};
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -459,6 +469,7 @@ var formatBookings = (data, values) => {
       });
       return;
     }
+    const isMultiDay = (_a = item._extend) == null ? void 0 : _a.groupId;
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
     let end_time = item._extend.endDate.format("HH:mm");
@@ -468,8 +479,8 @@ var formatBookings = (data, values) => {
     }
     dayParams.holder = formatHolders(data, item, values);
     if (isDay) {
-      const startDate = ((_a = item._extend) == null ? void 0 : _a.startDate) || ((_b = item._extend) == null ? void 0 : _b.start_date);
-      const endDate = ((_c = item._extend) == null ? void 0 : _c.endDate) || ((_d = item._extend) == null ? void 0 : _d.end_date);
+      const startDate = ((_b = item._extend) == null ? void 0 : _b.startDate) || ((_c = item._extend) == null ? void 0 : _c.start_date);
+      const endDate = ((_d = item._extend) == null ? void 0 : _d.endDate) || ((_e = item._extend) == null ? void 0 : _e.end_date);
       const { startDateTime, endDateTime } = (0, import_utils4.formatDayTime)({
         startDate,
         endDate
@@ -485,16 +496,15 @@ var formatBookings = (data, values) => {
         "minutes"
       );
     }
-    if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
+    if (!((_f = item._extend) == null ? void 0 : _f.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
-    const isSetGroupId = obj[(_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.groupId];
-    if (!((_g = item._extend) == null ? void 0 : _g.unique_identification_number)) {
+    const isSetGroupId = obj[(_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.groupId];
+    if (!((_h = item._extend) == null ? void 0 : _h.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
-    debugger;
     const booking = {
       schedule_event_id: item == null ? void 0 : item.booking_id,
       product: formatProducts(item),
@@ -511,7 +521,7 @@ var formatBookings = (data, values) => {
       start_time,
       end_date,
       start_date,
-      duration: isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
+      duration: isDay || isMultiDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
       number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
       resources: formatResource(item),
       note: item._extend.note,
@@ -522,7 +532,7 @@ var formatBookings = (data, values) => {
     if (!isSetGroupId) {
       obj[item._extend.groupId] = true;
     }
-    if (isDay) {
+    if (isDay || isMultiDay) {
       bookings.push(booking);
       return;
     }
@@ -531,7 +541,7 @@ var formatBookings = (data, values) => {
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
       if (i > 0) {
         newItem._extend.surcharge_rounding_remainder = void 0;
-        if (((_j = (_i = (_h = newItem._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.bundle) == null ? void 0 : _j.length) > 0) {
+        if (((_k = (_j = (_i = newItem._extend) == null ? void 0 : _i.other) == null ? void 0 : _j.bundle) == null ? void 0 : _k.length) > 0) {
           newItem._extend.other.bundle.forEach((bundleItem) => {
             bundleItem.surcharge_rounding_remainder = void 0;
           });
@@ -618,6 +628,7 @@ var formatValues = (state) => {
     metadata: {}
   };
   const isDay = (0, import_utils4.isDaysBooking)(state);
+  const isHasMultiDay = getHasMultiDayProduct(state);
   const isEvent = (0, import_utils4.isEventBooking)(state);
   if (!state.bookingId || isDay) {
     values.shop_note = formatNote(state);
@@ -635,10 +646,10 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isDay || isEvent) {
+  if (isEvent) {
     values.relation_products = formatRelationProducts(
       state,
-      isDay ? "day" : "event"
+      "event"
     );
   } else {
     values.relation_products = formatNormalProducts(state);
@@ -652,7 +663,7 @@ var formatValues = (state) => {
     startTime = `${startTime || "00:00"}:00`;
     values.schedule_date = `${values.bookings[0].select_date} ${startTime}`;
   }
-  if (isDay) {
+  if (isDay || isHasMultiDay) {
     values.metadata.is_multiday_appointment = 1;
   }
   if (!((_g = values == null ? void 0 : values.bookings) == null ? void 0 : _g.length)) {
@@ -665,16 +676,16 @@ var checkHolderIsError = (state) => {
   var _a, _b;
   let errorRowKey = "";
   const holderError = state.service.value.some((item) => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2, _c, _d, _e, _f, _g;
     if ((0, import_utils4.isNormalProductByDurationSchedule)(item)) {
       return false;
     }
-    if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      errorRowKey = (0, import_utils4.genRowKey)((_b2 = (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.rowKey);
+    if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_a2 = item._extend.holder_id) == null ? void 0 : _a2.length) === 0)) {
+      errorRowKey = (0, import_utils4.genRowKey)((_c = (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.other) == null ? void 0 : _c.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_d = (_c = item._extend) == null ? void 0 : _c.holder_id) == null ? void 0 : _d.length) !== item._extend.quantity) {
-      errorRowKey = (0, import_utils4.genRowKey)((_f = (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey);
+    if (item._extend.quantity > 1 && ((_e = (_d = item._extend) == null ? void 0 : _d.holder_id) == null ? void 0 : _e.length) !== item._extend.quantity) {
+      errorRowKey = (0, import_utils4.genRowKey)((_g = (_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.rowKey);
       return true;
     }
     return false;
@@ -708,6 +719,7 @@ var checkHolderIsError = (state) => {
   formatSellingPrice,
   formatValues,
   getBundleDiscountList,
+  getHasMultiDayProduct,
   getMainProductSellingPrice,
   getSourceProductPrice
 });

package/lib/components/booking/components/voucher/index.js

@@ -48,7 +48,7 @@ var import_utils3 = require("../../info/clientVariant/utils");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var services = {};
 var VoucherCard = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const context = (0, import_useEngineContext.default)();
   const { state, dispatch, source, isInModal = false } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(isInModal ? true : false);
@@ -60,10 +60,13 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
+  const holderChangedRef = (0, import_react.useRef)(false);
   const stateRef = (0, import_react.useRef)(state);
   stateRef.current = state;
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    var _a2, _b2, _c2;
+    const beforeValue = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value;
     dispatch({
       type: "setClient",
       payload: {
@@ -71,6 +74,15 @@ var VoucherCard = (props) => {
         edit: true
       }
     });
+    if ((beforeValue == null ? void 0 : beforeValue.id) === (value == null ? void 0 : value.id)) return;
+    if ((_c2 = (_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.length) {
+      dispatch({
+        type: "setService",
+        payload: {
+          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
+        }
+      });
+    }
   });
   const { selectCustomer } = (0, import_pisellos.useCustomer)({
     changeCustomerToGlobalState
@@ -97,7 +109,7 @@ var VoucherCard = (props) => {
   const serviceMemo = (0, import_react.useMemo)(() => {
     var _a2;
     const val = (_a2 = state.service.value || []) == null ? void 0 : _a2.map((value) => {
-      var _a3, _b2;
+      var _a3, _b2, _c2;
       return {
         booking_id: value.booking_id,
         id: value.id,
@@ -106,7 +118,8 @@ var VoucherCard = (props) => {
         discount_list: value.discount_list,
         origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total,
         quantity: value._extend.quantity,
-        startDate: value._extend.startDate
+        startDate: value._extend.startDate,
+        holder_id: (_c2 = value == null ? void 0 : value._extend) == null ? void 0 : _c2.holder_id
       };
     });
     return val;
@@ -146,6 +159,29 @@ var VoucherCard = (props) => {
     });
     return val;
   }, [state.addons.value]);
+  const holdersMemo = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (isBooking4Shop) {
+      let list = [];
+      if ((_a2 = state.pet) == null ? void 0 : _a2.value) {
+        let entries = Object.entries(state.pet.value);
+        if (entries.length === 1) {
+          list = entries[0][1];
+        }
+      }
+      shopDiscount.setHolders(list);
+      holderChangedRef.current = true;
+      return list || [];
+    }
+  }, [(_c = state.pet) == null ? void 0 : _c.value, isBooking4Shop]);
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2, _d2;
+    console.log("update booking subject", state.bookingConfig);
+    (_d2 = shopDiscount == null ? void 0 : shopDiscount.setBookingSubject) == null ? void 0 : _d2.call(
+      shopDiscount,
+      (_c2 = (_b2 = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject
+    );
+  }, [state.bookingConfig]);
   const disabled = (0, import_react.useMemo)(() => {
     var _a2;
     if (["paid", "partially_paid"].includes(
@@ -158,7 +194,7 @@ var VoucherCard = (props) => {
   const { run } = (0, import_ahooks.useDebounceFn)(
     () => {
       var _a2, _b2;
-      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
+      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value && !holderChangedRef.current || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
         return;
       }
       if (isBooking4Shop) {
@@ -169,13 +205,19 @@ var VoucherCard = (props) => {
         console.log("input: ", state.service.value);
         console.log("output: ", val);
         productListToValue(val.productList);
+        holderChangedRef.current = false;
       }
     },
     { wait: 1e3 }
   );
   (0, import_react.useEffect)(() => {
     run();
-  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  }, [
+    JSON.stringify(serviceMemo),
+    JSON.stringify(addonsMemo),
+    JSON.stringify(holdersMemo),
+    isBooking4Shop
+  ]);
   (0, import_react.useEffect)(() => {
     if (shopDiscount) {
       const wrappedHandler = executeIfActive(fn);
@@ -328,7 +370,7 @@ var VoucherCard = (props) => {
       {
         style: { width: "100%" },
         isInModal: isInModal || false,
-        dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
+        dataSource: ((_e = (_d = state.service) == null ? void 0 : _d.value) == null ? void 0 : _e.length) ? availableData : [],
         mixedSort,
         onChange: (val) => {
           const detail = shopDiscount.setDiscountSelected({

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/components/booking/hooks/useQuotation.js

@@ -40,6 +40,7 @@ var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_serve = require("../info/service/serve");
 var import_decimal = __toESM(require("decimal.js"));
+var import_dayjs = __toESM(require("dayjs"));
 var formatBundleItemMap = (product) => {
   return product.bundle_group.reduce((pre, cur) => {
     const curObj = {};
@@ -70,15 +71,19 @@ var setNewCartValue = (cartValue, newProducts) => {
   let isBundleChange = false;
   let isNotFoundBundle = false;
   const notFoundProducts = [];
+  const multiDayPricesCache = /* @__PURE__ */ new Map();
   const value = cartValue.map((item) => {
-    var _a, _b, _c, _d;
-    const newProduct = newProducts.find((newItem2) => newItem2.id === item.product_id);
+    var _a, _b, _c, _d, _e, _f;
+    const itemScheduleDate = ((_a = item._extend) == null ? void 0 : _a.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : "";
+    const newProduct = newProducts.find(
+      (newItem2) => newItem2.id === item.product_id && newItem2.schedule_date === itemScheduleDate
+    );
     if (!newProduct) {
       return item;
     }
     let isChangePrice = newProduct.price != item.price;
     const bundleItemMap = formatBundleItemMap(newProduct);
-    const newBundle = (((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).map((bundle) => {
+    const newBundle = (((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle) || []).map((bundle) => {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
         if (!notFoundProducts.some((p) => p._id === bundle._id)) {
@@ -103,6 +108,24 @@ var setNewCartValue = (cartValue, newProducts) => {
         // product_price: bundleItemMap[item.id].product_price,
       };
     });
+    if ((_d = item._extend) == null ? void 0 : _d.groupId) {
+      if (!multiDayPricesCache.has(item._extend.groupId)) {
+        const productPrices = newProducts.filter((p) => p.id === item.product_id);
+        const multiDayPrices = {};
+        productPrices.forEach((priceItem) => {
+          multiDayPrices[priceItem.schedule_date] = {
+            total: Number(priceItem.price),
+            origin_total: Number(priceItem.price),
+            num: 1,
+            quotation_id: priceItem.quotation_id || 0,
+            start_date: priceItem.schedule_date,
+            end_date: (0, import_dayjs.default)(priceItem.schedule_date).add(1, "day").format("YYYY-MM-DD")
+          };
+        });
+        multiDayPricesCache.set(item._extend.groupId, multiDayPrices);
+      }
+      item._extend.multiDayPrices = multiDayPricesCache.get(item._extend.groupId);
+    }
     if (!isChangePrice) {
       return item;
     } else {
@@ -120,7 +143,7 @@ var setNewCartValue = (cartValue, newProducts) => {
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: {
           ...item._extend.other,
-          option: (_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option,
+          option: (_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option,
           bundle: newBundle
         }
       }
@@ -146,22 +169,31 @@ var useQuotation = (state, dispatch) => {
   cartValueRef.current = state.service.value;
   const getCartQuotation = async (params) => {
     if (!cartValueRef.current.length) return;
-    const ids = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => item.product_id);
-    if (!ids.length) return;
-    const data = await (0, import_serve.getProductPrice)({
-      ids,
-      schedule_date: params == null ? void 0 : params.schedule_date,
-      customer_id: params == null ? void 0 : params.customer_id
+    if (!(params == null ? void 0 : params.customer_id)) {
+      return;
+    }
+    const queryData = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => {
+      var _a2;
+      return {
+        product_id: item.product_id,
+        schedule_date: ((_a2 = item._extend) == null ? void 0 : _a2.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : params == null ? void 0 : params.schedule_date
+        // 如果没有商品日期，使用传入的默认日期
+      };
+    });
+    if (!queryData.length) return;
+    const data = await (0, import_serve.getNormalAndMultiDayProductPrice)({
+      customer_id: params == null ? void 0 : params.customer_id,
+      data: queryData
     });
-    return data;
+    return data.data;
   };
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
   const updateCartQuotation = async (params) => {
     const data = await getCartQuotation(params);
-    if (!(data == null ? void 0 : data.data)) return;
-    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data.data);
+    if (!data || !data.length) return;
+    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data);
     if (isNotFoundBundle) {
       setProducts(notFoundProducts);
       setOpen(true);

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/hooks/useHolderConfig.d.ts

@@ -5,5 +5,6 @@ declare const useHolderConfig: (state: any) => {
     isCustomerSubject: boolean;
     isWalkInBol: boolean;
     isShowChangeHolder: boolean;
+    holderType: any;
 };
 export default useHolderConfig;

package/lib/components/booking/info/hooks/useHolderConfig.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(useHolderConfig_exports);
 var import_react = require("react");
 var import_utils = require("../../utils");
 var useHolderConfig = (state) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const appointment_subject = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
@@ -37,10 +37,14 @@ var useHolderConfig = (state) => {
   const isFormSubject = (0, import_react.useMemo)(() => {
     return appointment_subject.type === "form";
   }, [appointment_subject.type]);
+  const holderType = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.holder) == null ? void 0 : _b2.form) == null ? void 0 : _c2.formType) || "minors";
+  }, [(_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.holder]);
   const isWalkInBol = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return (0, import_utils.isWalkIn)((_b2 = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id);
-  }, [(_f = (_e = state == null ? void 0 : state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id]);
+  }, [(_g = (_f = state == null ? void 0 : state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id]);
   const isCustomerSubject = (0, import_react.useMemo)(() => {
     return appointment_subject.type === "customer";
   }, [appointment_subject.type]);
@@ -53,7 +57,8 @@ var useHolderConfig = (state) => {
     isFormSubject,
     isCustomerSubject,
     isWalkInBol,
-    isShowChangeHolder
+    isShowChangeHolder,
+    holderType
   };
 };
 var useHolderConfig_default = useHolderConfig;

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => React.JSX.Element;
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => React.JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/Lists.js

@@ -41,7 +41,7 @@ var import_useHolderConfig = __toESM(require("../hooks/useHolderConfig"));
 var import_ahooks = require("ahooks");
 var import_utils2 = require("../../info2/service/addService/utils");
 var import_useAddHolder = __toESM(require("../hooks/useAddHolder"));
-var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
+var Lists = ({ onEdit, onChange, onAction, isParallelResource, isShowDelete = true, isShowAmountFooter = true }) => {
   var _a;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const { isShowChangeHolder } = (0, import_useHolderConfig.default)(state);
@@ -85,6 +85,8 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
       isShowNote: state.isBookingTicket2 ? true : (0, import_utils.isEventBooking)(state),
+      isShowDelete,
+      isShowAmountFooter,
       isShowPackageNote: false,
       accounts: [],
       isEdit: !!(state == null ? void 0 : state.bookingId),
@@ -109,7 +111,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     const p = (0, import_utils.formatProducts)(
       ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) || [],
       state,
-      false,
+      true,
       true,
       isParallelResource
     );