@pisell/private-materials 6.0.25 → 6.1.2

package/es/components/booking/info/service/editService/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import './index.less';
 export interface EditServiceRef {
-    init: (cacheItem?: any) => void;
+    init: (cacheItem?: any, open?: boolean, openEditProduct?: boolean) => void;
 }
 declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -23,7 +23,7 @@ import '@pisell/materials';
 import { formatAmount, locales } from '@pisell/utils';
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { Alert, Button, Col, DatePicker, Form, Input, InputNumber, Row, Select } from 'antd';
-import React, { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useState } from 'react';
+import React, { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
 import Drawer from "../../../components/drawer";
@@ -36,13 +36,13 @@ import "./index.less";
 import { Page, PisellAdjustPriceInputNumber } from '@pisell/materials';
 import dayjs from 'dayjs';
 import { getNoResource } from "../../../mock";
-import { getDays, getErrorList, getProductTotalPrice } from "../../../utils";
+import { getDays, getErrorList, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { createBookingItemsByGroup, filterItemByGroupId, getGroupTotalPrice, isGroupBooking } from "../../service2/Group/utils";
 import useSelectPet from "../../service2/hooks/useSelectPet";
-import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isEventBooking } from "../../service2/utils";
+import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isDaysBooking, isEventBooking } from "../../service2/utils";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj } from "../addService/utils";
 import Like from "../like";
-import { getMultiDayPrices } from "../../utils";
+import { editSessionProduct, getMultiDayPrices } from "../../utils";
 import { useService } from "../serviceManager";
 import EditTabs from "./EditTabs";
 var submitLock = false;
@@ -72,6 +72,7 @@ var Info = function Info(_, ref) {
     setSelectOpen = _useState4[1];
   var _useSelectPet = useSelectPet(state),
     holderLists = _useSelectPet.holderLists;
+  var isChangeTotal = useRef(false);
   var _useService = useService({
       state: state,
       dispatch: dispatch
@@ -85,6 +86,9 @@ var Info = function Info(_, ref) {
   var isDayBookingMode = useMemo(function () {
     return isDayBooking(state);
   }, [state === null || state === void 0 ? void 0 : state.renderType]);
+  var isDaysBookingMode = useMemo(function () {
+    return isDaysBooking(state);
+  }, [state === null || state === void 0 ? void 0 : state.renderType]);
   var isEventBookingMode = useMemo(function () {
     return isEventBooking(state);
   }, [state === null || state === void 0 ? void 0 : state.renderType]);
@@ -399,11 +403,15 @@ var Info = function Info(_, ref) {
             });
           case 6:
             data = _context2.sent;
-            _context2.next = 9;
+            // 手动改价时移除优惠券使用
+            if (isChangeTotal.current) {
+              delete data.discount_list;
+            }
+            _context2.next = 10;
             return editBooking({
               booking: data
             });
-          case 9:
+          case 10:
           case "end":
             return _context2.stop();
         }
@@ -413,9 +421,10 @@ var Info = function Info(_, ref) {
       return _ref2.apply(this, arguments);
     };
   }());
-  var setEditData = useMemoizedFn(function (_cacheItem, open) {
+  var setEditData = useMemoizedFn(function (_cacheItem, open, openProductDetail) {
     var _values;
     setCurrentTab('batch_edit');
+    isChangeTotal.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
 
@@ -424,6 +433,11 @@ var Info = function Info(_, ref) {
       discount_reason: ((_values = values) === null || _values === void 0 ? void 0 : _values.discount_reason) || ''
     });
     form.setFieldsValue(values);
+    if (openProductDetail) {
+      setTimeout(function () {
+        handleEdit({});
+      }, 100);
+    }
     if (!isEventBookingMode) {
       // 获取资源列表
       getResources(cacheItem, open);
@@ -643,7 +657,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:08
    */
   var handleEdit = useMemoizedFn(function (e) {
-    var _item$_extend3, _state$client;
+    var _item$_extend6, _state$client;
     // 当前商品
     var item = state.service.cacheItem;
 
@@ -661,6 +675,16 @@ var Info = function Info(_, ref) {
       dayValue.product_variant = ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.product_variant_id) || 0;
       dayValue.product_option = option || [];
     }
+    var isSession = isSessionProduct(item);
+    var sessionValue = {};
+    if (isSession) {
+      var _item$_extend3, _item$_extend4, _item$_extend5;
+      sessionValue.startEndTime = {
+        startDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date,
+        duration: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration
+      };
+    }
 
     // 打开商品详情弹窗
     state.action({
@@ -670,56 +694,82 @@ var Info = function 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: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), dayValue),
-        customer_id: isDayBookingMode ? ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 1 : undefined
+        value: _objectSpread(_objectSpread(_objectSpread({}, ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other) || {}), dayValue), sessionValue),
+        isOS: isSession,
+        customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id
       },
-      callback: function callback(e) {
-        var _cacheItem$_extend;
-        // 重新生成商品
-        var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
-          product_id: item.id,
-          _id: item === null || item === void 0 ? void 0 : item._id,
-          _key: e.key,
-          _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
-            // 覆盖选择的规格和套餐
-            other: JSON.parse(JSON.stringify(e))
-          }),
-          new: 0
-        });
-
-        // 获取商品总价
-        var _total = getProductTotalPrice(cacheItem);
-
-        // 如果有多规格，则更新商品的单价
-        if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.product_variant_id) {
-          var _cacheItem$_extend2;
-          cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.price);
-        }
+      callback: function () {
+        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e, extension_type, detail) {
+          var _cacheItem$_extend;
+          var _detail, other, cacheItem, _total, _cacheItem$_extend2, sessionDetail;
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
+              case 0:
+                _detail = detail || item;
+                other = JSON.parse(JSON.stringify(e));
+                other.session = e.session;
 
-        // 用于折扣 可修改
-        cacheItem._extend.total = _total;
+                // 重新生成商品
+                cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
+                  product_id: item.id,
+                  _id: item === null || item === void 0 ? void 0 : item._id,
+                  _key: e.key,
+                  _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
+                    // 覆盖选择的规格和套餐
+                    other: other
+                  }),
+                  new: 0
+                }); // 获取商品总价
+                _total = getProductTotalPrice(cacheItem); // 如果有多规格，则更新商品的单价
+                if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.product_variant_id) {
+                  cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.price);
+                }
+                sessionDetail = editSessionProduct(cacheItem, e.session); // 用于折扣 可修改
+                cacheItem._extend.total = _total;
 
-        // 用于储存原价
-        cacheItem._extend.origin_total = _total;
+                // 用于储存原价
+                cacheItem._extend.origin_total = _total;
 
-        // 覆盖商品
-        dispatch({
-          type: 'setService',
-          payload: {
-            cacheItem: cacheItem
-          }
-        });
-        setTimeout(function () {
-          updateMultiDay({
-            start_date: values.start_date,
-            end_date: values.end_date
-          });
-        }, 100);
-      }
+                // 覆盖商品
+                dispatch({
+                  type: 'setService',
+                  payload: {
+                    cacheItem: cacheItem
+                  }
+                });
+                if (isDaysBookingMode) {
+                  setTimeout(function () {
+                    updateMultiDay({
+                      start_date: values.start_date,
+                      end_date: values.end_date
+                    });
+                  }, 100);
+                } else {
+                  // 商家反馈更新商品后没有展示最新价格，此处编辑商品后恢复折扣信息
+                  // https://go.feishu.cn/approval/s/iaxPKxFW/
+                  // 更新表单内的商品价格
+                  form.setFieldsValue(_objectSpread({
+                    total: _total
+                  }, isSessionProduct(cacheItem) && sessionDetail ? {
+                    start_time: sessionDetail.start_time,
+                    duration: sessionDetail.duration
+                  } : {}));
+                }
+              case 11:
+              case "end":
+                return _context4.stop();
+            }
+          }, _callee4);
+        }));
+        function callback(_x4, _x5, _x6) {
+          return _callback.apply(this, arguments);
+        }
+        return callback;
+      }()
     });
   });
 
@@ -782,13 +832,13 @@ var Info = function Info(_, ref) {
    * @Date: 2024-12-29 23:17
    */
   var updateMultiDay = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref6) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref6) {
       var start_date, end_date, duration, cacheItem, fieldsValues;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             start_date = _ref6.start_date, end_date = _ref6.end_date, duration = _ref6.duration;
-            _context4.next = 3;
+            _context5.next = 3;
             return getMultiDay({
               start_date: start_date,
               end_date: end_date,
@@ -796,7 +846,7 @@ var Info = function Info(_, ref) {
               cacheItem: getCurrentCacheItem()
             });
           case 3:
-            cacheItem = _context4.sent;
+            cacheItem = _context5.sent;
             // 兼容时长为空的情况
             if (duration !== undefined) {
               cacheItem._extend.duration = duration;
@@ -816,11 +866,11 @@ var Info = function Info(_, ref) {
             form.setFieldsValue(fieldsValues);
           case 10:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
-    return function updateMultiDay(_x4) {
+    return function updateMultiDay(_x7) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -908,6 +958,9 @@ var Info = function Info(_, ref) {
   var isEditGroup = useMemo(function () {
     return items.length;
   }, [items]);
+  var handleTotalChange = function handleTotalChange(number) {
+    isChangeTotal.current = true;
+  };
   return useMemo(function () {
     var _state$service$cacheI8, _state$service9, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11, _state$service$cacheI12, _state$bookingConfig3;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer
@@ -995,6 +1048,7 @@ var Info = function Info(_, ref) {
       },
       min: 0,
       precision: 2,
+      onChange: handleTotalChange,
       prefix: state.amountSymbol,
       disabled: state.channelDisabledEdit,
       originValue: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total) || 0,
@@ -1045,12 +1099,12 @@ var Info = function Info(_, ref) {
     }, /*#__PURE__*/React.createElement(Duration, _extends({}, durationProps, {
       timeObj: timeObj
     })))), isDayBookingMode && (holderLists === null || holderLists === void 0 ? void 0 : holderLists.length) > 0 ? /*#__PURE__*/React.createElement(Col, {
-      span: 12
+      span: isDayBookingMode ? 12 : 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: locales.getText('pisell2.text.holder'),
       name: "holder_id",
       rules: [{
-        required: true
+        required: isDayBookingMode
       }]
     }, /*#__PURE__*/React.createElement(Holder, {
       size: "large"

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

@@ -6,6 +6,7 @@ import "./index.less";
 import ServiceList from "./serviceList";
 import AddTimeModal from "./addTimeModal";
 import useClearCart from "../../hooks/useClearCart";
+import useQuotation from "../../hooks/useQuotation";
 var Service = function Service() {
   var _state$bookingConfig2;
   var _useContext = useContext(Context),
@@ -38,21 +39,23 @@ var Service = function Service() {
     }
     return true;
   }, [state, appointment_card.quick_time]);
-  var handleEdit = function handleEdit(cacheItem) {
+  var handleEdit = function handleEdit(cacheItem, type) {
     setTimeout(function () {
       var _detailRef$current, _detailRef$current$in;
-      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem);
+      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
     }, 100);
   };
   var clearCart = useClearCart(state, dispatch);
+  var _useQuotation = useQuotation(state, dispatch),
+    dom = _useQuotation.dom;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
   }, clearCart, /*#__PURE__*/React.createElement(ServiceList, {
     onEdit: handleEdit
-  }), /*#__PURE__*/React.createElement(AddService, {
+  }), !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(AddService, {
     onEdit: handleEdit
-  })), /*#__PURE__*/React.createElement(EditService, {
+  }) : null), /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
-  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
+  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
 };
 export default /*#__PURE__*/React.memo(Service);

package/es/components/booking/info/service/like/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/es/components/booking/info/service/like/index.js

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
     }
   });
 };

package/es/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/es/components/booking/info/service/serve.js

@@ -46,4 +46,25 @@ export var postMultiDay = /*#__PURE__*/function () {
   return function postMultiDay(_x3, _x4) {
     return _ref2.apply(this, arguments);
   };
+}();
+
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export var getProductPrice = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request.getRequest().post("/shop/product/query/price", params));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function getProductPrice(_x5) {
+    return _ref3.apply(this, arguments);
+  };
 }();

package/es/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/es/components/booking/info/service/serviceList/index.js

@@ -26,6 +26,7 @@ var ServiceList = function ServiceList(_ref) {
   var errorTypes = {
     product: locales.getText('pisell2.text.status.service-error-1'),
     time: locales.getText('pisell2.text.status.service-error-2'),
+    limit: locales.getText('pisell2.text.status.service-error-3'),
     maxLimit: locales.getText('pisell2.text.status.service-error-3')
   };
   var handleEditService = function handleEditService(item) {

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

@@ -9,7 +9,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { getUniqueId } from '@pisell/utils';
 import { useCallback, useMemo } from 'react';
-import { deleteCacheParams, getProductTotalPrice, getServiceTimes } from "../../../utils";
+import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
 import { concatBookings, createBookingItemsByGroup } from "../../service2/Group/utils";
 import { isBookingProduct, isDayBookingProduct, isDaysBooking, isEventBooking } from "../../service2/utils";
 import { getMultiDay, getProductExtend } from "../addService/utils";
@@ -68,6 +68,11 @@ export var useService = function useService(_ref) {
               cacheItem._extend.end_date = state.date.end_date;
               cacheItem._extend.sub_type = 'days';
             }
+            if (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;
+            }
             _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
             cacheItem._extend.total = _total;
             // 用于储存原价
@@ -90,24 +95,24 @@ export var useService = function useService(_ref) {
               state: state
             });
             if (!isDayBookingMode) {
-              _context.next = 20;
+              _context.next = 21;
               break;
             }
-            _context.next = 18;
+            _context.next = 19;
             return getMultiDay({
               start_date: cacheItem._extend.startDate,
               end_date: cacheItem._extend.endDate,
               state: state,
               cacheItem: cacheItem
             });
-          case 18:
+          case 19:
             cacheItem = _context.sent;
             if (isDayBookingProduct(cacheItem, state)) {
               // 更换商品需要删除当前组下面的所有子预约 --待实现 在这里删除会导致如果直接返回还需要恢复
               // const newList = filterItemByGroupId(cacheItem._id,state.service.value)
               cacheItem = concatBookings(createBookingItemsByGroup(cacheItem));
             }
-          case 20:
+          case 21:
             if (isEventBookingMode) {
               cacheItem.autoClose = false;
             } else {
@@ -119,7 +124,7 @@ export var useService = function useService(_ref) {
               }
             }
             return _context.abrupt("return", cacheItem);
-          case 22:
+          case 23:
           case "end":
             return _context.stop();
         }
@@ -269,7 +274,7 @@ export var useService = function useService(_ref) {
         changeService: false
       }
     });
-    onEdit(booking);
+    onEdit === null || onEdit === void 0 || onEdit(booking);
   };
   return {
     createBookingData: createBookingData,

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

@@ -85,7 +85,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     var startDate = _extend.start_date.add(i, 'day');
     var endDate = _extend.start_date.add(i + 1, 'day');
     // 商品原始价格  
-    var price = ((_extend$multiDayPrice = _extend.multiDayPrices[startDate.format('YYYY-MM-DD')]) === null || _extend$multiDayPrice === void 0 ? void 0 : _extend$multiDayPrice.total) || item._extend.price;
+    var price = ((_extend$multiDayPrice = _extend.multiDayPrices) === null || _extend$multiDayPrice === void 0 || (_extend$multiDayPrice = _extend$multiDayPrice[startDate.format('YYYY-MM-DD')]) === null || _extend$multiDayPrice === void 0 ? void 0 : _extend$multiDayPrice.total) || item._extend.price;
     var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
       // 编辑时组商品需要清空booking_id  否则会重复
       booking_id: isBatchEdit ? 0 : item.booking_id,
@@ -124,7 +124,8 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
   return bookings;
 };
 export var isGroupBooking = function isGroupBooking(_id) {
-  return (_id === null || _id === void 0 ? void 0 : _id.indexOf('bookingGroup_')) === 0;
+  var _id$indexOf;
+  return (_id === null || _id === void 0 || (_id$indexOf = _id.indexOf) === null || _id$indexOf === void 0 ? void 0 : _id$indexOf.call(_id, 'bookingGroup_')) === 0;
 };
 export var getProductByGroupId = function getProductByGroupId(groupId, items) {
   return items.filter(function (item) {

package/es/components/booking/info/service2/Lists.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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

@@ -1,7 +1,11 @@
 import { useMemo } from 'react';
-import { formatHolderLists } from "../utils";
+import { formatHolderLists, isDayBooking } from "../utils";
 var useSelectPet = function useSelectPet(state) {
-  var _state$pet2;
+  var _state$pet2, _state$pet4;
+  var isDaysBookingBol = useMemo(function () {
+    return isDayBooking(state);
+  }, [state === null || state === void 0 ? void 0 : state.renderType]);
+
   /**
    * @title: pets数据
    * @description:
@@ -25,9 +29,13 @@ var useSelectPet = function useSelectPet(state) {
    * @Date: 2024-12-03 11:40
    */
   var holderLists = useMemo(function () {
-    var _lists = formatHolderLists(petLists);
-    return _lists;
-  }, [petLists]);
+    var _state$pet3;
+    if (isDaysBookingBol) {
+      var _lists = formatHolderLists(petLists);
+      return _lists;
+    }
+    return (state === null || state === void 0 || (_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.holders) || [];
+  }, [petLists, isDaysBookingBol, state === null || state === void 0 || (_state$pet4 = state.pet) === null || _state$pet4 === void 0 ? void 0 : _state$pet4.holders]);
 
   /**
    * @title: 获取pet名称

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

@@ -9,6 +9,7 @@ import AddService from "../service/addService";
 import EditService from "../service/editService";
 import { Context } from "../model";
 import Lists from "./Lists";
+import useQuotation from "../../hooks/useQuotation";
 export var Service2Context = /*#__PURE__*/createContext({});
 export var Service2Cart = function Service2Cart(_ref) {
   var hideAdd = _ref.hideAdd,
@@ -36,12 +37,14 @@ export var Service2Cart = function Service2Cart(_ref) {
       payload: _objectSpread({}, payload)
     });
   };
-  var handleEdit = function handleEdit(cacheItem) {
+  var handleEdit = function handleEdit(cacheItem, type) {
     setTimeout(function () {
       var _detailRef$current, _detailRef$current$in;
-      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem);
+      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
     }, 100);
   };
+  var _useQuotation = useQuotation(state, dispatch),
+    dom = _useQuotation.dom;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
   }, /*#__PURE__*/React.createElement(Lists, {
@@ -53,5 +56,5 @@ export var Service2Cart = function Service2Cart(_ref) {
     onEdit: handleEdit
   })), !hideEdit && /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
-  }));
+  }), dom);
 };

package/es/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[];