@pisell/private-materials 6.0.25 → 6.2.1

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

@@ -0,0 +1,121 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { useContext, useMemo } from 'react';
+import ShoppingCart from "../../../shoppingCart";
+import { CartContext } from "../../../shoppingCart/Provider";
+import { Context } from "../model";
+import { formatProducts, isEventBooking, updateServices } from "../service2/utils";
+import useHolderConfig from "../hooks/useHolderConfig";
+import { useMemoizedFn } from 'ahooks';
+import { getProductExtend } from "../../info2/service/addService/utils";
+import useAddHolder from "../hooks/useAddHolder";
+var Lists = function Lists(_ref) {
+  var _state$service;
+  var onEdit = _ref.onEdit,
+    onChange = _ref.onChange,
+    onAction = _ref.onAction,
+    isParallelResource = _ref.isParallelResource;
+  var _useContext = useContext(Context),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  var _useHolderConfig = useHolderConfig(state),
+    isShowChangeHolder = _useHolderConfig.isShowChangeHolder;
+  var _useAddHolder = useAddHolder(state, dispatch),
+    handleAddHolder = _useAddHolder.handleAddHolder;
+
+  /**
+   * @title: 更新商品数据
+   * @description:
+   * @param {any} newState
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-11-29 16:35
+   */
+  var handleChange = useMemoizedFn(function (currentItem, type, other) {
+    if (state.disabledEdit || state.disableEventBookingEdit) {
+      return;
+    }
+    var products = updateServices(state, currentItem, type, other, {
+      handleAddHolder: handleAddHolder
+    });
+
+    // 查看
+    if (type === 'view' || type === 'edit_product') {
+      var product = currentItem._origin;
+      var cacheItem = _objectSpread(_objectSpread({}, product), {}, {
+        new: 0
+      });
+      if (isParallelResource) {
+        cacheItem = getProductExtend({
+          cacheItem: cacheItem,
+          state: state
+        });
+      }
+      onChange({
+        editModal: true,
+        cacheItem: cacheItem
+      });
+      return onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread(_objectSpread({}, product), {}, {
+        new: 0
+      }), type);
+    }
+    var params = {
+      editModal: false,
+      value: products,
+      edit: true,
+      cacheItem: null
+    };
+    onChange(params);
+  });
+
+  /**
+   * @title: 商品信息
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-09 16:07
+   */
+  var productParams = useMemo(function () {
+    return {
+      hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
+      isShowNote: isEventBooking(state),
+      isShowPackageNote: false,
+      accounts: [],
+      isEdit: !!(state !== null && state !== void 0 && state.bookingId),
+      disabledEdit: state === null || state === void 0 ? void 0 : state.disabledEdit,
+      maxLength: isEventBooking(state) ? 1 : 999,
+      isShowChangeHolder: isShowChangeHolder,
+      isShowChangeResource: true,
+      isShowAddHolderButton: true,
+      isShowEditProduct: !state.isBookingCreatePage
+    };
+  }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
+  return /*#__PURE__*/React.createElement(CartContext.Provider, {
+    value: {
+      state: state
+    }
+  }, /*#__PURE__*/React.createElement(ShoppingCart, {
+    isParallelResource: isParallelResource,
+    onAction: onAction,
+    onChange: handleChange,
+    isOpenGroup: false,
+    isHideClearCart: true,
+    onAddProduct: function onAddProduct() {
+      return onChange({
+        addModal: true
+      });
+    }
+    // onActiveKey={handleActiveKey}
+    // collapseParams={CollapseParams}
+    ,
+    productParams: _objectSpread(_objectSpread({}, productParams), {}, {
+      products: formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource)
+    })
+  }));
+};
+export default Lists;

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

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

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

@@ -28,11 +28,11 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import TabProduct from "../../../components/TabProduct";
 import AddButton from "../../../components/addButton";
 import Drawer from "../../../components/drawer";
-import { formatProductListByCategory, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, isSessionProduct, request } from "../../../utils";
 import DateRange from "../../dateRange";
 import { Context } from "../../model";
-import { appointmentTypes, inputDateCol } from "../../service2/status";
-import { getDayProducts, holderId, isDayBooking, isDaysBooking, isEventBooking } from "../../service2/utils";
+import { inputDateCol } from "../../service2/status";
+import { getDayProducts, holderId, isDayBooking, isDaysBooking, isEventBooking, isNormalProductByDurationSchedule } from "../../service2/utils";
 import { getIsBundleOrCombination } from "../../utils";
 import { getProductDetail } from "../serve";
 import { useService } from "../serviceManager";
@@ -126,9 +126,8 @@ var Info = function Info(props) {
    */
   var customerId = useMemo(function () {
     var _state$client;
-    if (!isDay) return undefined;
     return ((_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;
-  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id, isDay]);
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
 
   /**
    * @title: 如果商品只有一个, 则自动设置默认商品
@@ -248,27 +247,23 @@ var Info = function Info(props) {
             dayParams = {}; // 跨日预约
             if (isDay && !isEventBooking(state)) {
               dayParams.extension_type = ['normal', 'product_appointment'];
-              dayParams.customer_id = customerId;
+              // dayParams.customer_id = customerId;
             }
             _context2.next = 9;
-            return state.apis.getServices(_objectSpread(_objectSpread({
+            return state.apis.getServices(_objectSpread({
               skip: 1,
               num: 500,
-              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket'],
+              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
               with: ['category'],
               ids: state.renderType === 'eventBooking' ? (_state$eventOtherPara2 = state.eventOtherParams) === null || _state$eventOtherPara2 === void 0 ? void 0 : _state$eventOtherPara2.productIds : undefined,
               open_quotation: 1,
               with_schedule: 1,
               with_count: ['bundleGroup', 'optionGroup'],
               order_by_string: 'sort:desc',
-              status: 'published'
-            }, state.isBookingCreatePage ? {
-              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date
-            } : {
-              _config: {
-                useCache: true
-              }
-            }), dayParams));
+              status: 'published',
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
+              customer_id: customerId
+            }, dayParams));
           case 9:
             data = _context2.sent;
             setLoading(false);
@@ -313,8 +308,10 @@ var Info = function Info(props) {
     }
   };
   var handleSelectProduct = useMemoizedFn(function (item, type) {
+    var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0;
+    var isEject = getIsEject(item, type);
+    var isOnlySession = getIsOnlySession(item);
 
     // 跨日预约开启单规格 组合规格 套餐
     if (isDay) {
@@ -327,22 +324,24 @@ var Info = function Info(props) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: isDay ? true : false,
-          session: false,
+          session: isSession,
           variant: isDay ? true : false,
           package: true
         },
         is_eject: isEject ? 1 : 0,
-        customer_id: customerId
+        isOnlySession: isOnlySession,
+        customer_id: customerId,
+        isOS: isSession
       },
       callback: function () {
-        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
+        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail) {
           var data;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
                 return createBookingData({
-                  product: _objectSpread(_objectSpread({}, item), {}, {
+                  product: _objectSpread(_objectSpread({}, detail || item), {}, {
                     _params: e
                   })
                 });
@@ -358,7 +357,7 @@ var Info = function Info(props) {
             }
           }, _callee3);
         }));
-        function callback(_x3) {
+        function callback(_x3, _x4, _x5) {
           return _callback.apply(this, arguments);
         }
         return callback;
@@ -374,7 +373,7 @@ var Info = function Info(props) {
       // 公共购物车下过滤掉预约商品
       if (!holderId(state)) {
         _list = _list.filter(function (item) {
-          return !appointmentTypes.includes(item.extension_type);
+          return isNormalProductByDurationSchedule(item);
         });
       }
     }
@@ -406,16 +405,17 @@ var Info = function Info(props) {
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
+  var currentDate = useMemo(function () {
+    return state.date.value.format('YYYY-MM-DD');
+  }, [state.date.value]);
   useUpdateEffect(function () {
     if (state.service.addModal) {
-      getServices();
+      getServices({
+        schedule_date: currentDate
+      });
       setSearch('');
     }
-  }, [state.service.addModal]);
-  var currentDate = useMemo(function () {
-    return state.date.value.format('YYYY-MM-DD');
-  }, [state.date.value]);
-  console.log(currentDate, 'currentDate');
+  }, [state.service.addModal, currentDate]);
   useEffect(function () {
     if (renderMode === 'current') {
       getServices({
@@ -425,9 +425,11 @@ var Info = function Info(props) {
   }, [renderMode, currentDate]);
   useEffect(function () {
     if (state.renderType === 'eventBooking' && state.modalOpen) {
-      getServices();
+      getServices({
+        schedule_date: currentDate
+      });
     }
-  }, [state.renderType, state.modalOpen]);
+  }, [state.renderType, state.modalOpen, currentDate]);
   var addButton = useMemo(function () {
     // 跨日预约不显示添加服务按钮
     if (isDay) {

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(_objectSpread({}, item), _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");
     }
   });
 };