@pisell/private-materials 6.0.25 → 6.1.1

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

@@ -72,11 +72,15 @@ var Info = (_, ref) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [selectOpen, setSelectOpen] = (0, import_react.useState)();
   const { holderLists } = (0, import_useSelectPet.default)(state);
+  const isChangeTotal = (0, import_react.useRef)(false);
   const { editBookingData, editBooking } = (0, import_serviceManager.useService)({ state, dispatch });
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
   const isDayBookingMode = (0, import_react.useMemo)(() => {
     return (0, import_utils5.isDayBooking)(state);
   }, [state == null ? void 0 : state.renderType]);
+  const isDaysBookingMode = (0, import_react.useMemo)(() => {
+    return (0, import_utils5.isDaysBooking)(state);
+  }, [state == null ? void 0 : state.renderType]);
   const isEventBookingMode = (0, import_react.useMemo)(() => {
     return (0, import_utils5.isEventBooking)(state);
   }, [state == null ? void 0 : state.renderType]);
@@ -255,21 +259,32 @@ var Info = (_, ref) => {
         errorList
       }
     });
+    if (isChangeTotal.current) {
+      delete data.discount_list;
+    }
     await editBooking({ booking: data });
   });
-  const setEditData = (0, import_ahooks.useMemoizedFn)((_cacheItem, open) => {
-    setCurrentTab("batch_edit");
-    let cacheItem = _cacheItem || state.service.cacheItem;
-    let values = cacheItem._extend;
-    values = {
-      ...values,
-      discount_reason: (values == null ? void 0 : values.discount_reason) || ""
-    };
-    form.setFieldsValue(values);
-    if (!isEventBookingMode) {
-      getResources(cacheItem, open);
+  const setEditData = (0, import_ahooks.useMemoizedFn)(
+    (_cacheItem, open, openProductDetail) => {
+      setCurrentTab("batch_edit");
+      isChangeTotal.current = false;
+      let cacheItem = _cacheItem || state.service.cacheItem;
+      let values = cacheItem._extend;
+      values = {
+        ...values,
+        discount_reason: (values == null ? void 0 : values.discount_reason) || ""
+      };
+      form.setFieldsValue(values);
+      if (openProductDetail) {
+        setTimeout(() => {
+          handleEdit({});
+        }, 100);
+      }
+      if (!isEventBookingMode) {
+        getResources(cacheItem, open);
+      }
     }
-  });
+  );
   const isReason = (0, import_react.useMemo)(() => {
     var _a2;
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
@@ -392,7 +407,7 @@ var Info = (_, ref) => {
     isEventBookingMode
   ]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
     let dayValue = {};
@@ -406,6 +421,15 @@ var Info = (_, ref) => {
       dayValue.product_variant = ((_e2 = (_d2 = item._extend) == null ? void 0 : _d2.other) == null ? void 0 : _e2.product_variant_id) || 0;
       dayValue.product_option = option || [];
     }
+    const isSession = (0, import_utils3.isSessionProduct)(item);
+    const sessionValue = {};
+    if (isSession) {
+      sessionValue.startEndTime = {
+        startDate: (_f2 = item == null ? void 0 : item._extend) == null ? void 0 : _f2.start_date,
+        endDate: (_g2 = item == null ? void 0 : item._extend) == null ? void 0 : _g2.end_date,
+        duration: (_h2 = item == null ? void 0 : item._extend) == null ? void 0 : _h2.duration
+      };
+    }
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -413,20 +437,25 @@ var Info = (_, ref) => {
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
           option: isDayBookingMode ? true : false,
-          session: false,
+          session: isSession,
           variant: isDayBookingMode ? true : false,
           package: true
         },
         value: {
-          ...((_f2 = item._extend) == null ? void 0 : _f2.other) || {},
-          ...dayValue
+          ...((_i2 = item._extend) == null ? void 0 : _i2.other) || {},
+          ...dayValue,
+          ...sessionValue
         },
-        customer_id: isDayBookingMode ? ((_h2 = (_g2 = state.client) == null ? void 0 : _g2.value) == null ? void 0 : _h2.id) || 1 : void 0
+        isOS: isSession,
+        customer_id: (_k2 = (_j2 = state.client) == null ? void 0 : _j2.value) == null ? void 0 : _k2.id
       },
-      callback: (e2) => {
+      callback: async (e2, extension_type, detail) => {
         var _a3, _b3, _c3, _d3;
+        const _detail = detail || item;
+        const other = JSON.parse(JSON.stringify(e2));
+        other.session = e2.session;
         let cacheItem = {
-          ...item,
+          ..._detail,
           product_id: item.id,
           _id: item == null ? void 0 : item._id,
           _key: e2.key,
@@ -435,7 +464,7 @@ var Info = (_, ref) => {
             // 将当前表单的值覆盖进去
             ...values,
             // 覆盖选择的规格和套餐
-            other: JSON.parse(JSON.stringify(e2))
+            other
           },
           new: 0
         };
@@ -443,6 +472,7 @@ var Info = (_, ref) => {
         if ((_b3 = (_a3 = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a3.other) == null ? void 0 : _b3.product_variant_id) {
           cacheItem._extend.price = Number((_d3 = (_c3 = cacheItem._extend) == null ? void 0 : _c3.other) == null ? void 0 : _d3.price);
         }
+        const sessionDetail = (0, import_utils7.editSessionProduct)(cacheItem, e2.session);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
         dispatch({
@@ -451,12 +481,22 @@ var Info = (_, ref) => {
             cacheItem
           }
         });
-        setTimeout(() => {
-          updateMultiDay({
-            start_date: values.start_date,
-            end_date: values.end_date
+        if (isDaysBookingMode) {
+          setTimeout(() => {
+            updateMultiDay({
+              start_date: values.start_date,
+              end_date: values.end_date
+            });
+          }, 100);
+        } else {
+          form.setFieldsValue({
+            total: _total,
+            ...(0, import_utils3.isSessionProduct)(cacheItem) && sessionDetail ? {
+              start_time: sessionDetail.start_time,
+              duration: sessionDetail.duration
+            } : {}
           });
-        }, 100);
+        }
       }
     });
   });
@@ -578,6 +618,9 @@ var Info = (_, ref) => {
   const isEditGroup = (0, import_react.useMemo)(() => {
     return items.length;
   }, [items]);
+  const handleTotalChange = (number) => {
+    isChangeTotal.current = true;
+  };
   return (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2;
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
@@ -661,6 +704,7 @@ var Info = (_, ref) => {
                 style: { width: "100%" },
                 min: 0,
                 precision: 2,
+                onChange: handleTotalChange,
                 prefix: state.amountSymbol,
                 disabled: state.channelDisabledEdit,
                 originValue: ((_j2 = (_i2 = state.service.cacheItem) == null ? void 0 : _i2._extend) == null ? void 0 : _j2.origin_total) || 0,
@@ -715,12 +759,12 @@ var Info = (_, ref) => {
               rules: [{ required: true }]
             },
             /* @__PURE__ */ import_react.default.createElement(import_duration.default, { ...durationProps, timeObj })
-          )), isDayBookingMode && (holderLists == null ? void 0 : holderLists.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
+          )), isDayBookingMode && (holderLists == null ? void 0 : holderLists.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: isDayBookingMode ? 12 : 24 }, /* @__PURE__ */ import_react.default.createElement(
             import_antd.Form.Item,
             {
               label: import_utils.locales.getText("pisell2.text.holder"),
               name: "holder_id",
-              rules: [{ required: true }]
+              rules: [{ required: isDayBookingMode }]
             },
             /* @__PURE__ */ import_react.default.createElement(import_holder.default, { size: "large" })
           )) : null, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(

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

@@ -40,6 +40,7 @@ var import_index = require("./index.less");
 var import_serviceList = __toESM(require("./serviceList"));
 var import_addTimeModal = __toESM(require("./addTimeModal"));
 var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
+var import_useQuotation = __toESM(require("../../hooks/useQuotation"));
 var Service = () => {
   var _a, _b;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
@@ -65,13 +66,14 @@ var Service = () => {
     }
     return true;
   }, [state, appointment_card.quick_time]);
-  const handleEdit = (cacheItem) => {
+  const handleEdit = (cacheItem, type) => {
     setTimeout(() => {
       var _a2, _b2;
-      (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem);
+      (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
     }, 100);
   };
   const clearCart = (0, import_useClearCart.default)(state, dispatch);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, clearCart, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, { onEdit: handleEdit }), /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null));
+  const { dom } = (0, import_useQuotation.default)(state, dispatch);
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, clearCart, /* @__PURE__ */ import_react.default.createElement(import_serviceList.default, { onEdit: handleEdit }), !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit }) : null), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null), dom);
 };
 var service_default = import_react.default.memo(Service);

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

@@ -9,3 +9,12 @@ export declare const getProductDetail: (id: string, params: any) => Promise<any>
  * @Date: 2024-12-23 17:06
  */
 export declare const postMultiDay: (id: string, params: any) => Promise<any>;
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export declare const getProductPrice: (params: {
+    ids: number[];
+    customer_id: number;
+    schedule_date: string;
+}) => Promise<any>;

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

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   getProductDetail: () => getProductDetail,
+  getProductPrice: () => getProductPrice,
   postMultiDay: () => postMultiDay
 });
 module.exports = __toCommonJS(serve_exports);
@@ -28,8 +29,10 @@ var getProductDetail = async (id, params) => import_utils.request.getRequest().g
 var postMultiDay = async (id, params) => import_utils.request.getRequest().post(`/shop/product/multi-day/detail/${id}`, params, {
   useCache: true
 });
+var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getProductDetail,
+  getProductPrice,
   postMultiDay
 });

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

@@ -45,6 +45,7 @@ var ServiceList = ({ onEdit }) => {
   const errorTypes = {
     product: import_utils.locales.getText("pisell2.text.status.service-error-1"),
     time: import_utils.locales.getText("pisell2.text.status.service-error-2"),
+    limit: import_utils.locales.getText("pisell2.text.status.service-error-3"),
     maxLimit: import_utils.locales.getText("pisell2.text.status.service-error-3")
   };
   const handleEditService = (item) => {

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

@@ -75,6 +75,11 @@ var useService = ({
       cacheItem._extend.end_date = state.date.end_date;
       cacheItem._extend.sub_type = "days";
     }
+    if ((0, import_utils2.isSessionProduct)(cacheItem) && _params.session) {
+      cacheItem._extend.start_date = _params.session.start_at;
+      cacheItem._extend.start_time = _params.session.start_time;
+      cacheItem._extend.end_date = _params.session.end_at;
+    }
     let _total = (0, import_utils2.getProductTotalPrice)(cacheItem);
     cacheItem._extend.total = _total;
     cacheItem._extend.origin_total = _total;
@@ -195,7 +200,7 @@ var useService = ({
         changeService: false
       }
     });
-    onEdit(booking);
+    onEdit == null ? void 0 : onEdit(booking);
   };
   return {
     createBookingData,

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

@@ -67,14 +67,14 @@ var concatBookings = (items) => {
   };
 };
 var createBookingItemsByGroup = (item, isBatchEdit) => {
-  var _a;
+  var _a, _b;
   const groupId = item._extend.groupId || (0, import_utils.getUniqueId)("bookingGroup_");
   let bookings = [];
   for (let i = 0; i < item._extend.duration; i++) {
     const _extend = { ...item._extend };
     const startDate = _extend.start_date.add(i, "day");
     const endDate = _extend.start_date.add(i + 1, "day");
-    const price = ((_a = _extend.multiDayPrices[startDate.format("YYYY-MM-DD")]) == null ? void 0 : _a.total) || item._extend.price;
+    const price = ((_b = (_a = _extend.multiDayPrices) == null ? void 0 : _a[startDate.format("YYYY-MM-DD")]) == null ? void 0 : _b.total) || item._extend.price;
     const cacheItem = {
       ...item,
       // 编辑时组商品需要清空booking_id  否则会重复
@@ -112,7 +112,8 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
   return bookings;
 };
 var isGroupBooking = (_id) => {
-  return (_id == null ? void 0 : _id.indexOf("bookingGroup_")) === 0;
+  var _a;
+  return ((_a = _id == null ? void 0 : _id.indexOf) == null ? void 0 : _a.call(_id, "bookingGroup_")) === 0;
 };
 var getProductByGroupId = (groupId, items) => {
   return items.filter((item) => {

package/lib/components/booking/info/service2/hooks/useSelectPet.js

@@ -25,16 +25,23 @@ module.exports = __toCommonJS(useSelectPet_exports);
 var import_react = require("react");
 var import_utils = require("../utils");
 var useSelectPet = (state) => {
-  var _a;
+  var _a, _b;
+  const isDaysBookingBol = (0, import_react.useMemo)(() => {
+    return (0, import_utils.isDayBooking)(state);
+  }, [state == null ? void 0 : state.renderType]);
   const petLists = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e, _f;
-    const form_id = ((_d = (_c = (_b = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
+    var _a2, _b2, _c, _d, _e, _f;
+    const form_id = ((_d = (_c = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
     return ((_f = (_e = state == null ? void 0 : state.pet) == null ? void 0 : _e.value) == null ? void 0 : _f[form_id]) || [];
   }, [(_a = state == null ? void 0 : state.pet) == null ? void 0 : _a.value]);
   const holderLists = (0, import_react.useMemo)(() => {
-    const _lists = (0, import_utils.formatHolderLists)(petLists);
-    return _lists;
-  }, [petLists]);
+    var _a2;
+    if (isDaysBookingBol) {
+      const _lists = (0, import_utils.formatHolderLists)(petLists);
+      return _lists;
+    }
+    return ((_a2 = state == null ? void 0 : state.pet) == null ? void 0 : _a2.holders) || [];
+  }, [petLists, isDaysBookingBol, (_b = state == null ? void 0 : state.pet) == null ? void 0 : _b.holders]);
   const getHolderName = (id) => {
     if (!holderLists.length) return "";
     const resource = holderLists.find((d) => d.id === id);

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

@@ -38,6 +38,7 @@ var import_addService = __toESM(require("../service/addService"));
 var import_editService = __toESM(require("../service/editService"));
 var import_model = require("../model");
 var import_Lists = __toESM(require("./Lists"));
+var import_useQuotation = __toESM(require("../../hooks/useQuotation"));
 var Service2Context = (0, import_react.createContext)({});
 var Service2Cart = ({
   hideAdd,
@@ -54,19 +55,20 @@ var Service2Cart = ({
       payload: { ...payload }
     });
   };
-  const handleEdit = (cacheItem) => {
+  const handleEdit = (cacheItem, type) => {
     setTimeout(() => {
       var _a, _b;
-      (_b = (_a = detailRef.current) == null ? void 0 : _a.init) == null ? void 0 : _b.call(_a, cacheItem);
+      (_b = (_a = detailRef.current) == null ? void 0 : _a.init) == null ? void 0 : _b.call(_a, cacheItem, false, type === "edit_product");
     }, 100);
   };
+  const { dom } = (0, import_useQuotation.default)(state, dispatch);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_Lists.default,
     {
       onEdit: handleEdit,
       onChange: (e, type) => dispatchService(type || "setService", e)
     }
-  ), !hideAdd && /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), !hideEdit && /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }));
+  ), !hideAdd && /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit })), !hideEdit && /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), dom);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -39,19 +39,25 @@ export declare const isBookingProduct: (extension_type: any, bol?: boolean) => b
  * @Date: 2024-12-06 11:24
  */
 export declare const isDayBookingProduct: (item: any, state: any) => boolean | undefined;
+export declare const handleChangeHolder: (products: any[], currentItem: any, other: any) => any[];
 /**
  * @title: 更新商品数据
  * @description:
  * @param {any} state
+ * @param currentItem
  * @param {string} type
- * @param {any} _id // 商品id
  * @param {any} other
+ * @param actions
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-01-03 15:00
  */
-export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any) => any;
+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:
@@ -60,13 +66,14 @@ export declare const formItems: (items: any[]) => any[];
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean) => {
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
     id: any;
     _id: any;
     name: any;
     price: any;
-    total: any;
-    origin_total: any;
+    total: number;
+    origin_total: number;
     num: any;
     image: any;
     isShowNote: boolean;
@@ -86,8 +93,8 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     isNormalProduct: boolean;
     locale: any;
     symbol: any;
+    relation_products: any;
     items: any[];
-    _origin: any;
 }[];
 /**
  * @title: 禁用日期
@@ -237,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) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];