@pisell/private-materials 3.3.46 → 3.3.48

package/lib/components/appointmentBooking/components/Services/index.js

@@ -122,7 +122,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         } else {
           const resources = ((_b = (_a = data == null ? void 0 : data.origin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [];
           const activeStatus = resources.find((item2) => item2.status === 1);
-          if (!activeStatus) {
+          if (!activeStatus && !appointmentBooking.isTargetNormalProduct(data == null ? void 0 : data.origin)) {
             return (0, import_utils2.Toast)(
               import_utils.locales.getText("pisell2.appointment.no.available.service")
             );

package/lib/components/appointmentBooking/components/TimeSlicing/index.js

@@ -69,10 +69,11 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   };
   (0, import_react.useEffect)(() => {
     var _a, _b, _c;
-    if ((times == null ? void 0 : times.length) > 0 && (carts == null ? void 0 : carts.length) > 0) {
-      const startTime = ((_a = carts == null ? void 0 : carts[0]) == null ? void 0 : _a.start_time) || ((_b = times == null ? void 0 : times[0]) == null ? void 0 : _b.start_time);
+    let appoimentBookingProductCart = carts.filter((item) => !appointmentBooking.isTargetCartIdNormalProduct(item == null ? void 0 : item._id));
+    if ((times == null ? void 0 : times.length) > 0 && (appoimentBookingProductCart == null ? void 0 : appoimentBookingProductCart.length) > 0) {
+      const startTime = ((_a = appoimentBookingProductCart == null ? void 0 : appoimentBookingProductCart[0]) == null ? void 0 : _a.start_time) || ((_b = times == null ? void 0 : times[0]) == null ? void 0 : _b.start_time);
       setSelectedResource(startTime);
-      if ((_c = carts == null ? void 0 : carts[0]) == null ? void 0 : _c.start_time) return;
+      if ((_c = appoimentBookingProductCart == null ? void 0 : appoimentBookingProductCart[0]) == null ? void 0 : _c.start_time) return;
       getAutoSelect(times == null ? void 0 : times[0]);
     }
   }, [times, carts]);

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -95,6 +95,7 @@ var VoucherCard = (props) => {
       var _a3, _b2;
       return {
         _id: item._id,
+        quantity: item.num,
         bundle: item._bundleOrigin,
         options: item._optionsOrigin,
         product: {
@@ -120,6 +121,7 @@ var VoucherCard = (props) => {
       }
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
+    pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(
       ShopDiscountHooks.onDiscountListChange,

package/lib/components/appointmentBooking/context.js

@@ -105,15 +105,19 @@ var AppointmentBookingProvider = ({
       if (!(carts == null ? void 0 : carts.length) || !(resources == null ? void 0 : resources.length)) {
         return setCurrentSelectedResources(null);
       }
-      const currentSelectedResources2 = carts.map((item) => {
-        return {
+      const currentSelectedResources2 = [];
+      carts.forEach((item) => {
+        if (appointmentBooking.isTargetCartIdNormalProduct(item == null ? void 0 : item._id)) {
+          return;
+        }
+        currentSelectedResources2.push({
           _id: item == null ? void 0 : item._id,
           currentSelectedResource: (0, import_utils.getCartCurrentResourceData)(
             item,
             currentStepParams == null ? void 0 : currentStepParams.key,
             resources
           )
-        };
+        });
       });
       setCurrentSelectedResources(currentSelectedResources2);
       appointmentBooking.setOtherData(

package/lib/components/appointmentBooking/hooks.js

@@ -119,20 +119,78 @@ var useAppointmentBookingStep = () => {
     });
   };
   const nextStep = () => {
-    var _a2, _b2, _c2, _d, _e;
+    var _a2, _b2, _c2, _d, _e, _f, _g;
     let stepList2 = appointmentBooking.getStepList() || [];
     const currentKey = currentStepParams == null ? void 0 : currentStepParams.key;
-    let nextStep2 = stepList2[(currentStepParams == null ? void 0 : currentStepParams.index) + 1];
     const currentSelectedResources = appointmentBooking.getOtherData(
       "current_selected_resources"
     );
-    if ((nextStep2 == null ? void 0 : nextStep2.key) === "select-resource") {
+    if (!isRetailTemplate && currentKey === "select-service") {
+      const { bookingProcess } = ((_a2 = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a2.productModuleParams) || {};
+      const isDateSelectedFirst = bookingProcess === "date_first";
+      const hasResourceStep = stepList2 == null ? void 0 : stepList2.find(
+        (item) => (item == null ? void 0 : item.key) === "select-resource"
+      );
+      const hasSelectGuestStep = (_b2 = stepList2 == null ? void 0 : stepList2.find(
+        (item) => (item == null ? void 0 : item.key) === "select-guest"
+      )) == null ? void 0 : _b2.key;
+      const isAllNormalProduct = appointmentBooking == null ? void 0 : appointmentBooking.isCartAllNormalProducts();
+      if (isAllNormalProduct) {
+        removeStep("select-resource");
+        removeStep("select-time");
+        removeStep("fill-form");
+        if (!isDateSelectedFirst) {
+          removeStep("select-date");
+        }
+      } else if (!hasResourceStep) {
+        let targetKey = hasSelectGuestStep ? hasSelectGuestStep : "select-service";
+        const isHasDurationProduct = appointmentBooking == null ? void 0 : appointmentBooking.isCartHasDurationProduct();
+        if (isHasDurationProduct) {
+          if (!isDateSelectedFirst) {
+            appointmentBooking.addStep(
+              {
+                key: "select-date",
+                description: import_utils.locales.getText("pisell2.appointment.select.date")
+              },
+              targetKey
+            );
+            targetKey = "select-date";
+          }
+          appointmentBooking.addStep(
+            {
+              key: "select-resource",
+              description: import_utils.locales.getText("pisell2.appointment.select.resource")
+            },
+            targetKey
+          );
+          targetKey = "select-resource";
+          appointmentBooking.addStep(
+            {
+              key: "select-time",
+              description: import_utils.locales.getText("pisell2.appointment.select.time")
+            },
+            targetKey
+          );
+        } else {
+          appointmentBooking.addStep(
+            {
+              key: "select-resource",
+              description: import_utils.locales.getText("pisell2.appointment.select.resource")
+            },
+            targetKey
+          );
+        }
+      }
+      stepList2 = (appointmentBooking == null ? void 0 : appointmentBooking.getStepList()) || [];
+    }
+    let nextStep2 = stepList2[(currentStepParams == null ? void 0 : currentStepParams.index) + 1];
+    if (!isRetailTemplate && (nextStep2 == null ? void 0 : nextStep2.key) === "select-resource") {
       const result = appointmentBooking.checkResourceListForDate();
       if (!result) {
         return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.date"));
       }
     }
-    if (currentKey == null ? void 0 : currentKey.startsWith("select-resource")) {
+    if (!isRetailTemplate && (currentKey == null ? void 0 : currentKey.startsWith("select-resource"))) {
       const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)(currentSelectedResources, appointmentBooking, utils);
       if (hasError) {
         setCurrentSelectedResources(updatedCartList);
@@ -155,9 +213,9 @@ var useAppointmentBookingStep = () => {
         }
       });
       stepList2 = appointmentBooking.getStepList();
-      const selectedResource = (_a2 = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _a2.currentSelectedResource;
+      const selectedResource = (_c2 = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _c2.currentSelectedResource;
       if (selectedResource) {
-        const originRenderLists = ((_b2 = selectedResource == null ? void 0 : selectedResource.resourceItem) == null ? void 0 : _b2.originRenderLists) || [];
+        const originRenderLists = ((_d = selectedResource == null ? void 0 : selectedResource.resourceItem) == null ? void 0 : _d.originRenderLists) || [];
         const currentResourceIndex = originRenderLists == null ? void 0 : originRenderLists.findIndex((item) => {
           var _a3;
           return item.id === ((_a3 = selectedResource == null ? void 0 : selectedResource.renderItem) == null ? void 0 : _a3.form_id);
@@ -165,7 +223,7 @@ var useAppointmentBookingStep = () => {
         const nextResource = originRenderLists == null ? void 0 : originRenderLists[currentResourceIndex + 1];
         const resourceKey = `select-resource_@${nextResource == null ? void 0 : nextResource.form_id}-${nextResource == null ? void 0 : nextResource.code}`;
         if (nextResource) {
-          const beforeKey = (_c2 = stepList2[stepList2.length - 2]) == null ? void 0 : _c2.key;
+          const beforeKey = (_e = stepList2[stepList2.length - 2]) == null ? void 0 : _e.key;
           appointmentBooking.addStep({ key: resourceKey, description: "" }, beforeKey);
         } else {
           appointmentBooking.removeStep(resourceKey);
@@ -174,15 +232,16 @@ var useAppointmentBookingStep = () => {
     }
     stepList2 = appointmentBooking.getStepList();
     nextStep2 = stepList2[(currentStepParams == null ? void 0 : currentStepParams.index) + 1];
-    if (((_d = nextStep2 == null ? void 0 : nextStep2.key) == null ? void 0 : _d.startsWith("select-resource_")) || (nextStep2 == null ? void 0 : nextStep2.key) === "confirm-information") {
-      const selectedResource = ((_e = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _e.currentSelectedResource) || {};
+    if (((_f = nextStep2 == null ? void 0 : nextStep2.key) == null ? void 0 : _f.startsWith("select-resource_")) || (nextStep2 == null ? void 0 : nextStep2.key) === "confirm-information") {
+      const selectedResource = ((_g = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _g.currentSelectedResource) || {};
       const renderItem = (selectedResource == null ? void 0 : selectedResource.renderItem) || {};
       const checkHolder = () => {
         setLoading(false);
-        if (isRetailTemplate) {
+        if (isRetailTemplate || (appointmentBooking == null ? void 0 : appointmentBooking.isCartAllNormalProducts())) {
           return appointmentBooking.next();
         }
-        const { hasError } = (0, import_utils2.checkAndGoNext)(isFormSubject, checkAccount, carts);
+        const appoimentCarts = carts.filter((n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id)));
+        const { hasError } = (0, import_utils2.checkAndGoNext)(isFormSubject, checkAccount, appoimentCarts);
         setIsErrorHolder(hasError);
         if (hasError) {
           return;

package/lib/components/appointmentBooking/utils.js

@@ -370,6 +370,7 @@ var getResourceTitle = (appointmentBooking, code, utils, originResource) => {
 var checkAndMarkCartRenderError = (carts, appointmentBooking, utils) => {
   try {
     let hasError = false;
+    carts = carts.filter((n) => !appointmentBooking.isTargetCartIdNormalProduct(n._id));
     const updatedCartList = carts == null ? void 0 : carts.map((cart) => {
       const currentResource = cart == null ? void 0 : cart.currentSelectedResource;
       if (!(currentResource == null ? void 0 : currentResource.renderItem)) {
@@ -394,6 +395,7 @@ var checkAndMarkCartRenderError = (carts, appointmentBooking, utils) => {
       updatedCartList
     };
   } catch (error) {
+    console.error(error);
     return {};
   }
 };

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

@@ -51,12 +51,13 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g;
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
-      price: item._extend.price,
+      price: (0, import_utils.formatProductPrice)(item),
       product_id: item.id,
+      discount_list: (item == null ? void 0 : item.discount_list) || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
@@ -64,7 +65,9 @@ var formatProducts = (values) => {
       discountway: "num",
       discount_type: "discount",
       bundle_edit: (_a = item._extend) == null ? void 0 : _a.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle)
+      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+      "product_option_item": (0, import_utils.formatProductOption)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
+      "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0
     };
   });
   return arr;
@@ -93,7 +96,7 @@ var restoreProductOtherData = (data) => {
         })
       };
     }),
-    product_variant_id: 0,
+    product_variant_id: detail.product_variant_id || 0,
     quantity: Number(detail.product_quantity)
   };
 };
@@ -210,23 +213,23 @@ var Addons = (0, import_model.Provider)((props) => {
   const handleAddProduct = (item, type) => {
     let _list = [...state.addons.value];
     const isSession = (0, import_utils2.isSessionProduct)(item);
-    const isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
+    const isEject = (0, import_utils2.getIsEject)(item, type);
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
         id: item.id,
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: true
         },
         is_eject: isEject ? 1 : 0,
         isOS: isSession
       },
       callback: (e, extension_type, detail) => {
-        console.log("e", e);
         const _detail = detail || item;
         let product = {
           ..._detail,
@@ -235,15 +238,15 @@ var Addons = (0, import_model.Provider)((props) => {
           _extend: {
             price: _detail.price,
             other: e,
-            quantity: 1
+            quantity: (e == null ? void 0 : e.quantity) || 1
           },
-          quantity: 1
+          quantity: (e == null ? void 0 : e.quantity) || 1
         };
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
-        let _item = _list.find((d) => d._extend.other.key === e.key);
+        let _item = _list.find((d) => d._extend.other.rowKey === e.rowKey);
         if (_item) {
-          _item._extend.quantity = _item.quantity + 1;
+          _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
           _list.push(product);
         }
@@ -264,7 +267,7 @@ var Addons = (0, import_model.Provider)((props) => {
     let quantity = e.target.value;
     let _list = [...state.addons.value];
     if (quantity == 0) {
-      _list = _list.filter((d) => d.id !== item.id);
+      _list = _list.filter((d) => d._id !== item._id);
     } else {
       let _item = {
         ...item,
@@ -273,12 +276,10 @@ var Addons = (0, import_model.Provider)((props) => {
           quantity: Number(e.target.value)
         }
       };
-      let _total = (0, import_utils2.getProductTotalPrice)(_item);
-      _item._extend.total = _total;
       if (((_a2 = _item._extend) == null ? void 0 : _a2.bundle_edit) !== void 0) {
         _item._extend.bundle_edit = 1;
       }
-      _list = _list.map((d) => d.id === item.id ? _item : d);
+      _list = _list.map((d) => d._id === item._id ? _item : d);
     }
     dispatch({
       type: "setAddons",
@@ -374,10 +375,11 @@ var Addons = (0, import_model.Provider)((props) => {
         id: item.id,
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: true
         },
         value: item._extend.other,
         isOS: isSession
@@ -386,10 +388,14 @@ var Addons = (0, import_model.Provider)((props) => {
         var _a2;
         const _detail = detail || item;
         let product = {
+          ...item,
           ..._detail,
+          // 编辑商品时清除折扣信息
+          discount_list: [],
           _extend: {
             ...item._extend,
-            other: e
+            other: e,
+            quantity: (e == null ? void 0 : e.quantity) || 1
           }
         };
         if (((_a2 = product._extend) == null ? void 0 : _a2.bundle_edit) !== void 0) {

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

@@ -44,7 +44,7 @@ var getProductAmount = (state, isEdit) => {
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       for (let item of state == null ? void 0 : state.service.value) {
-        if (isDay) {
+        if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item)) {
           const quantity = item._extend.quantity || 1;
           price += Number(item._extend.total) * Number(quantity);
           const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? item._extend.duration : 0;

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

@@ -27,5 +27,14 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+/**
+ * @title: 格式化商品单价
+ * @description:
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-23 12:05
+ */
+export declare const formatProductPrice: (item: any) => number;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -33,6 +33,7 @@ __export(utils_exports, {
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
+  formatProductPrice: () => formatProductPrice,
   formatValues: () => formatValues
 });
 module.exports = __toCommonJS(utils_exports);
@@ -70,7 +71,7 @@ var formatProductOption = (option) => {
   return option.map((d) => {
     return {
       "num": d.num,
-      "option_group_item_id": d.product_option_item_id,
+      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
       "option_group_id": d.option_group_id
       // "add_price": Number(d?.add_price),
     };
@@ -280,6 +281,9 @@ var formatBookings = (data, values) => {
       return (_a = d._extend) == null ? void 0 : _a.holder_id;
     });
   }
+  if (!isDay && !isEvent) {
+    list = list.filter((item) => !(0, import_utils4.isNormalProductByDurationSchedule)(item));
+  }
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
@@ -343,6 +347,16 @@ var formatRelationProducts = (data) => {
   });
   return relationProducts || [];
 };
+var formatNormalProducts = (data) => {
+  var _a;
+  let list = ((_a = data.service) == null ? void 0 : _a.value) || [];
+  list = list.filter((item) => (0, import_utils4.isNormalProductByDurationSchedule)(item));
+  let relationProducts = [];
+  relationProducts = list.map((item) => {
+    return formatProducts(item);
+  });
+  return relationProducts || [];
+};
 var formatHolder = (state, values) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const form_id = ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
@@ -361,7 +375,7 @@ var formatHolder = (state, values) => {
   return obj;
 };
 var formatValues = (state) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   let values = {
     type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
@@ -391,11 +405,10 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isDay) {
-    values.relation_products = formatRelationProducts(state);
-  }
-  if (isEvent) {
+  if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(state);
+  } else {
+    values.relation_products = formatNormalProducts(state);
   }
   values.bookings = formatBookings(state, values);
   if (((_c = (_b = values == null ? void 0 : values.bookings) == null ? void 0 : _b[0]) == null ? void 0 : _c.select_date) && !(state == null ? void 0 : state.bookingId)) {
@@ -406,12 +419,15 @@ var formatValues = (state) => {
   if (isDay) {
     values.metadata.is_multiday_appointment = 1;
   }
+  if (!((_f = values == null ? void 0 : values.bookings) == null ? void 0 : _f.length)) {
+    values.type = "virtual";
+  }
   return values;
 };
 var checkHolderIsError = (state) => {
   var _a, _b;
   const holderError = state.service.value.some((item) => {
-    return !item._extend.holder_id;
+    return !item._extend.holder_id && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
   });
   const clientId = (_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id;
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {
@@ -427,5 +443,6 @@ var checkHolderIsError = (state) => {
   checkSubResourcesCapacity,
   formatProductBundle,
   formatProductOption,
+  formatProductPrice,
   formatValues
 });

package/lib/components/booking/info/service/addService/index.js

@@ -228,7 +228,7 @@ var Info = (props) => {
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type) => {
       const isSession = (0, import_utils2.isSessionProduct)(item);
-      let isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
+      let isEject = (0, import_utils2.getIsEject)(item, type);
       if (isDay) {
         isEject = type === "detail" || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0;
       }

package/lib/components/booking/info/service2/utils.d.ts

@@ -55,6 +55,9 @@ export declare const handleChangeHolder: (products: any[], currentItem: any, oth
 export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
 export declare const formItems: (items: any[]) => any[];
 export declare const getIsSubjectRequire: (state: any) => boolean;
+export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
+export declare const isAllNormalProduct: (items: any[]) => boolean;
+export declare const isAllNormalProductByState: (state: any) => boolean;
 /**
  * @title: 格式化商品数据
  * @description:
@@ -241,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/components/booking/info/service2/utils.js

@@ -46,6 +46,8 @@ __export(utils_exports, {
   handleChangeHolder: () => handleChangeHolder,
   holderId: () => holderId,
   initDate: () => initDate,
+  isAllNormalProduct: () => isAllNormalProduct,
+  isAllNormalProductByState: () => isAllNormalProductByState,
   isAppointmentProduct: () => isAppointmentProduct,
   isBookingProduct: () => isBookingProduct,
   isDayBooking: () => isDayBooking,
@@ -53,6 +55,7 @@ __export(utils_exports, {
   isDaysBooking: () => isDaysBooking,
   isEventBooking: () => isEventBooking,
   isHasDayAppointmentProduct: () => isHasDayAppointmentProduct,
+  isNormalProductByDurationSchedule: () => isNormalProductByDurationSchedule,
   isOpenDeletePet: () => isOpenDeletePet,
   isTerminalDayBooking: () => isTerminalDayBooking,
   updateAppointmentServicePrice: () => updateAppointmentServicePrice,
@@ -440,6 +443,16 @@ var getIsSubjectRequire = (state) => {
   var _a, _b, _c, _d, _e, _f, _g;
   return ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.type) === "form" && ((_g = (_f = (_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.subject_require) === "require";
 };
+var isNormalProductByDurationSchedule = (item) => {
+  var _a, _b;
+  return !(item == null ? void 0 : item.duration) && !((_a = item == null ? void 0 : item.schedules) == null ? void 0 : _a.length) && !((_b = item["schedule.ids"]) == null ? void 0 : _b.length);
+};
+var isAllNormalProduct = (items) => {
+  return items.every((item) => isNormalProductByDurationSchedule(item));
+};
+var isAllNormalProductByState = (state) => {
+  return isAllNormalProduct(state.service.value);
+};
 var getGeneralParams = (item, state, isParallelResource) => {
   var _a, _b, _c, _d, _e, _f, _g;
   const { pet, service } = state;
@@ -489,12 +502,14 @@ var getGeneralParams = (item, state, isParallelResource) => {
       }
     ];
   }
+  const isNormalProduct = isNormalProductByDurationSchedule(item);
   return {
     format: ["HH:mm", "HH:mm"],
     show_time: true,
     duration_type: "minutes",
     // 当前可选择holder列表
     holders: formatHolders(holders),
+    isShowChangeHolder: !isNormalProduct,
     isShowAction: (0, import_utils4.isShowAddTime)(state, item),
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     isMultipleResource: true,
@@ -502,8 +517,8 @@ var getGeneralParams = (item, state, isParallelResource) => {
     isErrorHolder: getIsSubjectRequire(state),
     addHolderButtonText: ((_c = (_b = formData == null ? void 0 : formData[0]) == null ? void 0 : _b.form) == null ? void 0 : _c.title) || "",
     holder_id: (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.holder_id,
-    start_date: (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate,
-    end_date: ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.endDate) || ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.end_date),
+    start_date: !isNormalProduct ? (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate : "",
+    end_date: !isNormalProduct ? ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.endDate) || ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.end_date) : "",
     ...parallelResourceOtherParams
   };
 };
@@ -528,6 +543,7 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    console.log(isNormalProduct, "isNormalProduct");
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,
@@ -961,6 +977,8 @@ var updateServicePrice = (state) => {
   handleChangeHolder,
   holderId,
   initDate,
+  isAllNormalProduct,
+  isAllNormalProductByState,
   isAppointmentProduct,
   isBookingProduct,
   isDayBooking,
@@ -968,6 +986,7 @@ var updateServicePrice = (state) => {
   isDaysBooking,
   isEventBooking,
   isHasDayAppointmentProduct,
+  isNormalProductByDurationSchedule,
   isOpenDeletePet,
   isTerminalDayBooking,
   updateAppointmentServicePrice,

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

@@ -104,7 +104,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285, 6124, 8727, 5538];
+  const booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

package/lib/components/booking/info2/service/addService/index.js

@@ -47,6 +47,7 @@ var import_utils2 = require("./utils");
 var import_utils3 = require("../../../utils");
 var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
+var import_utils5 = require("../../../info/service2/utils");
 var shopList = [
   2886,
   4422,
@@ -188,7 +189,7 @@ var Info = (props) => {
   const handleSelectProduct = (item, type) => {
     var _a2, _b2;
     const isSession = (0, import_utils3.isSessionProduct)(item);
-    const isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
+    const isEject = (0, import_utils3.getIsEject)(item, type);
     let lock = false;
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -196,10 +197,11 @@ var Info = (props) => {
         id: item.id,
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: (0, import_utils5.isNormalProductByDurationSchedule)(item)
         },
         is_eject: isEject ? 1 : 0,
         isOS: isSession,
@@ -224,13 +226,14 @@ var Info = (props) => {
           _key: e.key,
           _extend: {
             start_date: state.date.value,
-            quantity: 1,
+            quantity: (e == null ? void 0 : e.quantity) || 1,
             price: _detail.price,
             product_name: item.title,
             other
           },
           new: 1
         };
+        console.log(cacheItem, "cacheItem", e);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;