@pisell/private-materials 6.6.5 → 6.6.7

package/es/components/booking/deposit/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/es/components/booking/forms/footer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

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

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

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

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

package/es/components/booking/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

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

@@ -93,9 +93,12 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         return item.id === bundle.id;
       });
       var optionPrice = calculateTotalPrice((selectBundleInfo === null || selectBundleInfo === void 0 ? void 0 : selectBundleInfo.option) || []);
+
+      // 编辑预约时使用折扣卡
+      var isEditDiscount = item.booking_id && (bundle.discount_list || []).length;
       return _objectSpread(_objectSpread({}, bundle), {}, {
         base_price: bundleItemMap[bundle.id].base_price,
-        price: new Decimal(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
+        price: isEditDiscount ? bundle.price : new Decimal(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
         // product_price: bundleItemMap[item.id].product_price,
       });
     });

package/es/components/booking/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/es/components/booking/info/date/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => JSX.Element;
 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.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

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

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

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

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

@@ -442,6 +442,7 @@ var formatBundle = function formatBundle(bundle) {
       num: item === null || item === void 0 ? void 0 : item.num,
       price: item === null || item === void 0 ? void 0 : item.price,
       total: item === null || item === void 0 ? void 0 : item.price,
+      origin_total: item.original_total,
       price_type: item === null || item === void 0 ? void 0 : item.price_type,
       bundle_sum_price: item === null || item === void 0 ? void 0 : item.bundle_sum_price,
       bundle_sum_type: item === null || item === void 0 ? void 0 : item.bundle_sum_type,

package/es/components/booking/info2/cartClientCard/index.js

@@ -35,7 +35,7 @@ import { useIsActive } from "../../../ticketBooking/context/IsActiveContext";
 // 导出类型
 
 var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _context$appHelper, _state$client;
+  var _context$appHelper, _state$client2;
   var _ref$clientCardProps = _ref.clientCardProps,
     clientCardProps = _ref$clientCardProps === void 0 ? {} : _ref$clientCardProps,
     beforeSwitchModalOpen = _ref.beforeSwitchModalOpen,
@@ -73,7 +73,8 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
-    var _state$service;
+    var _state$client, _state$service;
+    var beforeValue = state === null || state === void 0 || (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value;
     dispatch({
       type: 'setClient',
       payload: {
@@ -81,6 +82,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
         edit: true
       }
     });
+    if ((beforeValue === null || beforeValue === void 0 ? void 0 : beforeValue.id) === (value === null || value === void 0 ? void 0 : value.id)) return;
     if (state !== null && state !== void 0 && (_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) {
       // 还需要清空商品内的 holder 信息
       dispatch({
@@ -109,7 +111,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (_ref, ref) {
     initLoad = _useCustomer.initLoad,
     hasMore = _useCustomer.hasMore,
     loadMore = _useCustomer.loadMore;
-  var selectedCustomer = (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value;
+  var selectedCustomer = (_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.value;
 
   // 点击搜索按钮 重置列表
   var handleSearchClient = /*#__PURE__*/function () {

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

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

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

@@ -30,7 +30,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
 import { getMultiDay, getProductExtend, isMultiDayProduct } from "./utils";
-import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, getMainPrice, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
@@ -305,7 +305,6 @@ var Info = function Info(props) {
                   _extend: {
                     start_date: state.date.value,
                     quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-                    price: _detail.price,
                     product_name: item.title,
                     other: other
                   },
@@ -315,6 +314,7 @@ var Info = function Info(props) {
                 if (isMultiDay) {
                   cacheItem._extend.end_date = state.date.value.add(1, 'day');
                 }
+                cacheItem._extend.price = getMainPrice(cacheItem, _detail.price);
                 _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
                 cacheItem._extend.total = _total;
                 // 用于储存原价
@@ -365,7 +365,7 @@ var Info = function Info(props) {
                   cacheItem.autoClose = false;
                 }
                 if (!cacheItem.autoClose) {
-                  _context4.next = 26;
+                  _context4.next = 27;
                   break;
                 }
                 cacheItem.autoClose = false;
@@ -393,17 +393,17 @@ var Info = function Info(props) {
                     changeService: false
                   }
                 });
-                _context4.next = 32;
+                _context4.next = 33;
                 break;
-              case 26:
+              case 27:
                 (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
                 if (!isMultiDay) {
-                  _context4.next = 30;
+                  _context4.next = 31;
                   break;
                 }
-                _context4.next = 30;
+                _context4.next = 31;
                 return getMultiDayCacheItem(true);
-              case 30:
+              case 31:
                 dispatch({
                   type: 'setService',
                   payload: {
@@ -414,7 +414,7 @@ var Info = function Info(props) {
                   }
                 });
                 onEdit === null || onEdit === void 0 || onEdit(cacheItem);
-              case 32:
+              case 33:
               case "end":
                 return _context4.stop();
             }

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/service/editNormalService/index.js

@@ -2,6 +2,7 @@ import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'reac
 import { useMemoizedFn } from 'ahooks';
 import SkuDetailModal from "../../../../../pro/skuDetailModal";
 import { Context } from "../../../info/model";
+import { setProductPrice } from "../editService/utils";
 var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -33,6 +34,11 @@ var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
     var _ref2, _state$service2;
     var newProducts = (_ref2 = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (item) {
       if (item._id == data._id) {
+        var _data$_extend, _data$_extend2;
+        data = setProductPrice(data, {
+          newTotal: (_data$_extend = data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.total,
+          origin_total: (_data$_extend2 = data._extend) === null || _data$_extend2 === void 0 ? void 0 : _data$_extend2.origin_total
+        });
         return data;
       }
       return item;

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

@@ -41,15 +41,18 @@ import { editSessionProduct } from "../../../info/utils";
 import { deleteCacheParams, getDays, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
+import { setProductPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
 import BookingList from "../../../info/service/editService/BookingList";
 import dayjs from "dayjs";
 import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/service2/Group/utils";
+import Decimal from 'decimal.js';
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI17, _state$client2;
+  var _context$appHelper, _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI17, _state$client2;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -80,6 +83,9 @@ var Info = function Info(_, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     currentTab = _useState6[0],
     setCurrentTab = _useState6[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    getData = _context$appHelper$ut.getData;
   useEffect(function () {
     window.openBookingEditModal = function () {
       setOpen(true);
@@ -258,7 +264,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item$_extend5, _state$service$cacheI3, _window$closeBookingE2, _window2;
+    var _resourcesRef$current, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4, _item2, _item3, _item$_extend5, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -274,7 +280,9 @@ var Info = function Info(_, ref) {
       submitLock = false;
     }, 1500);
     var _list = _toConsumableArray(state.service.value);
-    var _item = _objectSpread(_objectSpread({}, state.service.cacheItem), {}, {
+    var _item = _objectSpread(_objectSpread({
+      is_price_include_tax: getData('is_price_include_tax')
+    }, state.service.cacheItem), {}, {
       autoClose: false
     });
     var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {
@@ -298,6 +306,30 @@ var Info = function Info(_, ref) {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
+    if (isChangeTotal.current) {
+      var _extend$other, _extend$other2;
+      // 计算折扣比例
+      var discountRatio = new Decimal(values.total).div(_item._extend.origin_total);
+
+      // 处理子商品
+      var _bundles = (_extend === null || _extend === void 0 || (_extend$other = _extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.bundle) || [];
+      var childProductsTotal = new Decimal(0);
+      if (_bundles.length > 0) {
+        _bundles.forEach(function (bundle) {
+          // 计算子商品折扣后的单价（保留两位小数）
+          var discountedPrice = new Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+
+          // 累计子商品折扣后总价
+          childProductsTotal = childProductsTotal.add(discountedPrice.mul(bundle.quantity));
+        });
+      }
+
+      // 计算主商品折扣后的单价
+      var mainProductTotal = new Decimal(values.total).sub(childProductsTotal);
+      var mainProductQuantity = ((_extend$other2 = _extend.other) === null || _extend$other2 === void 0 ? void 0 : _extend$other2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== undefined) {
       _extend.bundle_edit = 1;
     }
@@ -339,8 +371,12 @@ var Info = function Info(_, ref) {
         _item._extend.quantity = 1;
       }
     }
-    var _id = _item === null || _item === void 0 ? void 0 : _item._id;
-    var groupId = _item === null || _item === void 0 || (_item$_extend5 = _item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.groupId;
+    var _id = (_item2 = _item) === null || _item2 === void 0 ? void 0 : _item2._id;
+    var groupId = (_item3 = _item) === null || _item3 === void 0 || (_item3 = _item3._extend) === null || _item3 === void 0 ? void 0 : _item3.groupId;
+    _item = setProductPrice(_item, {
+      newTotal: values.total,
+      origin_total: (_item$_extend5 = _item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.origin_total
+    });
     if (groupId) {
       _list = _list.filter(function (d) {
         var _d$_extend;
@@ -420,7 +456,7 @@ var Info = function Info(_, ref) {
     var startTime = performance.now();
     console.log(startTime, 'startTime');
     form.resetFields();
-    form.setFieldsValue(values);
+    // form.setFieldsValue(values);
     // form.setFieldValue('resource', values.resource)
 
     // values.resource[1117][0].times = [];
@@ -431,19 +467,24 @@ var Info = function Info(_, ref) {
     //   }
     // };
 
-    // form.setFieldsValue({
-    //   capacity: values.capacity,
-    //   duration: values.duration,
-    //   endDate: values.endDate,
-    //   origin_total: values.origin_total,
-    //   price: values.price,
-    //   product_name: values.product_name,
-    //   quantity: values.quantity,
-    //   resource: values.resource,
-    //   startDate: values.startDate,
-    //   start_time: values.start_time,
-    //   total: values.total,
-    // });
+    form.setFieldsValue({
+      capacity: values.capacity,
+      discount_reason: values.discount_reason,
+      duration: values.duration,
+      endDate: values.endDate,
+      end_date: values.end_date,
+      origin_total: values.origin_total,
+      price: values.price,
+      product_name: values.product_name,
+      quantity: values.quantity,
+      resource: values.resource,
+      startDate: values.startDate,
+      start_time: values.start_time,
+      start_date: values.start_date,
+      total: values.total,
+      holder_id: values.holder_id,
+      note: values.note
+    });
     var endTime = performance.now();
     console.log(endTime - window.pp1, '打开商品5');
     console.log('执行时间', endTime - startTime, values);

package/es/components/booking/info2/service/editService/utils.js

@@ -14,7 +14,9 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 判断是否需要进入编辑服务页
  */
 
+import { isArr } from "@pisell/utils";
 import { isBoolean } from "@pisell/utils";
+import Decimal from "decimal.js";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -52,4 +54,68 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
   } else {
     localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread({}, data)));
   }
+};
+
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ * 
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ * 
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
+  var _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
+  var newTotal = _ref2.newTotal,
+    origin_total = _ref2.origin_total;
+  // 计算折扣比例
+  var discountRatio = new Decimal(newTotal).div(new Decimal(origin_total));
+
+  // 用于累加子商品总价c
+  var subTotal = new Decimal(0);
+
+  // 处理 bundle 子商品
+  if ((_cacheItem$_extend$ot = cacheItem._extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.bundle && isArr((_cacheItem$_extend$ot2 = cacheItem._extend.other) === null || _cacheItem$_extend$ot2 === void 0 ? void 0 : _cacheItem$_extend$ot2.bundle)) {
+    var _cacheItem$_extend$ot3;
+    (_cacheItem$_extend$ot3 = cacheItem._extend.other) === null || _cacheItem$_extend$ot3 === void 0 || (_cacheItem$_extend$ot3 = _cacheItem$_extend$ot3.bundle) === null || _cacheItem$_extend$ot3 === void 0 || _cacheItem$_extend$ot3.forEach(function (bundle) {
+      var _ref3, _bundle$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref3 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      bundle.price = newPrice;
+    });
+  }
+
+  // 处理 option 子商品
+  if ((_cacheItem$_extend$ot4 = cacheItem._extend.other) !== null && _cacheItem$_extend$ot4 !== void 0 && _cacheItem$_extend$ot4.option && isArr((_cacheItem$_extend$ot5 = cacheItem._extend.other) === null || _cacheItem$_extend$ot5 === void 0 ? void 0 : _cacheItem$_extend$ot5.option)) {
+    var _cacheItem$_extend$ot6;
+    (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
+      var _ref4, _option$num;
+      // 计算新价格，直接截取两位小数（不四舍五入）
+      var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+
+      // 获取数量，优先取 num，再取 quantity，默认为 1
+      var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
+
+      // 累加到子商品总价
+      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
+
+      // 设置新价格
+      option.price = newPrice;
+    });
+  }
+
+  // 主商品价格 = newTotal - 子商品总价（让主商品吸收精度误差，确保总价精确）
+  cacheItem._extend.price = new Decimal(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
 };

package/es/components/booking/info2/service/serviceList/index.d.ts

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

package/es/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/es/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/es/components/booking/materiels/holder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/es/components/booking/notes/model.d.ts

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

package/es/components/booking/payments/model.d.ts

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

package/es/components/booking/utils.d.ts

@@ -161,6 +161,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration
@@ -173,10 +174,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/booking/utils.js

@@ -778,11 +778,24 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   return _extend;
 };
 
+// 获取主商品价格 包含组合规格
+export var getMainPrice = function getMainPrice(item, price) {
+  var _item$_extend;
+  var newPrice = new Decimal(price || item._extend.price || 0);
+  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+
+  // 多规格
+  if (other !== null && other !== void 0 && other.product_variant_id) {
+    newPrice = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
+
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
-  var _item$_extend;
+  var _item$_extend2;
   var price = new Decimal(item._extend.price || 0);
-  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+  var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
 
   // 多规格
   if (other !== null && other !== void 0 && other.product_variant_id) {