@pisell/private-materials 6.7.5 → 6.7.6

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

@@ -374,18 +374,14 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d;
-  let total = new import_decimal.default(item._extend.main_product_selling_price || item._extend.price || 0);
-  if (!item._extend.main_product_selling_price) {
-    const discountAmount = getDiscountAmount(item.discount_list);
-    total = total.minus(discountAmount);
-  }
-  if (((_a = item._extend.other) == null ? void 0 : _a.option) && Array.isArray((_b = item._extend.other) == null ? void 0 : _b.option)) {
-    total = total.add((_c = item._extend.other) == null ? void 0 : _c.option.reduce((t, option) => {
+  var _a, _b, _c, _d, _e, _f;
+  let total = new import_decimal.default(((_a = item._extend) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_selling_price) ?? item._extend.price ?? 0);
+  if (((_c = item._extend.other) == null ? void 0 : _c.option) && Array.isArray((_d = item._extend.other) == null ? void 0 : _d.option)) {
+    total = total.add((_e = item._extend.other) == null ? void 0 : _e.option.reduce((t, option) => {
       return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
     }, new import_decimal.default(0)));
   }
-  for (let bundleItem of ((_d = item._extend.other) == null ? void 0 : _d.bundle) || []) {
+  for (let bundleItem of ((_f = item._extend.other) == null ? void 0 : _f.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const discountAmount = getDiscountAmount(bundleItem.discount_list);
       const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
@@ -572,8 +568,12 @@ var getSurcharge = (state, options) => {
       }
     }, 0);
     let fixedTotal = new import_decimal.default(0);
+    let productTotalSurcharge = new import_decimal.default(0);
     if (matchedItems.length > 0) {
       let configTotal = new import_decimal.default(0);
+      if (fixed && new import_decimal.default(fixed).gt(0)) {
+        configTotal = configTotal.plus(fixed);
+      }
       if (percentage && new import_decimal.default(percentage).gt(0) || fixed) {
         const percentageRate = new import_decimal.default(percentage);
         for (let [index, item] of matchedItems.entries()) {
@@ -582,6 +582,7 @@ var getSurcharge = (state, options) => {
           const itemQuantity = new import_decimal.default(item.isMain ? item.quantity || 1 : item.quantity * item.mainQuantity || 1);
           const addTimeTotal = new import_decimal.default(item.addTimeTotal || 0);
           const itemTotalSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
+          configTotal = configTotal.plus(itemTotalSurcharge);
           const itemSurcharge = itemPrice.times(percentageRate);
           const fixedSurcharge = new import_decimal.default(1).div(productCount).times(fixed).times(100).floor().div(100).toFixed(2);
           const quantity = item.isMain ? item.quantity : item.quantity * item.mainQuantity;
@@ -589,6 +590,7 @@ var getSurcharge = (state, options) => {
           if (isLast && fixedTotal.gt(0)) {
             const remaining = new import_decimal.default(fixed).minus(fixedTotal).toNumber();
             if (remaining > 0) {
+              productTotalSurcharge = productTotalSurcharge.plus(remaining);
               if (item.isMain) {
                 item.item._extend.surcharge_rounding_remainder = remaining;
               } else {
@@ -599,20 +601,32 @@ var getSurcharge = (state, options) => {
           if (open_product !== 0) {
             if (item.isMain) {
               const originSurchargeFee = new import_decimal.default(item.item._extend.surcharge_fee || 0);
-              item.item._extend.surcharge_fee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
+              const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+              productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
+              item.item._extend.surcharge_fee = surchargeFee;
               item.item._extend.relation_surcharge_ids = [...((_d = item.item._extend) == null ? void 0 : _d.relation_surcharge_ids) || [], id];
             } else {
               const originSurchargeFee = new import_decimal.default(item.item.surcharge_fee || 0);
-              item.item.surcharge_fee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
+              const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+              productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
+              item.item.surcharge_fee = surchargeFee;
               item.item.relation_surcharge_ids = [...((_e = item.item) == null ? void 0 : _e.relation_surcharge_ids) || [], id];
             }
           }
-          configTotal = configTotal.plus(itemTotalSurcharge);
+          if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {
+            const configTotalRounded = configTotal.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+            if (item.isMain) {
+              let newRoundingRemainder = new import_decimal.default(item.item._extend.surcharge_rounding_remainder || 0);
+              newRoundingRemainder = newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
+              item.item._extend.surcharge_rounding_remainder = newRoundingRemainder.toNumber();
+            } else {
+              let newRoundingRemainder = new import_decimal.default(item.item.surcharge_rounding_remainder || 0);
+              newRoundingRemainder = newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
+              item.item.surcharge_rounding_remainder = newRoundingRemainder.toNumber();
+            }
+          }
         }
       }
-      if (fixed && new import_decimal.default(fixed).gt(0)) {
-        configTotal = configTotal.plus(fixed);
-      }
       finalAmount = configTotal.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
     }
     const name = surchargeConfig.name || {};

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -129,8 +129,8 @@ var formatProductBundle = (bundle) => {
       "custom_price": (d == null ? void 0 : d.custom_price) || Math.abs(new import_decimal.default((d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d == null ? void 0 : d.price_type,
       "option": option,
-      "bundle_selling_price": d == null ? void 0 : d.price,
-      "bundle_sum_price": (d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.original_total),
+      "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
+      // "bundle_sum_price": d?.original_price || d?.original_total,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -241,7 +241,7 @@ var formatHolders = (state, item, values) => {
 var formatProductPrice = (item) => {
   var _a, _b, _c, _d;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
-  let price = Number((_b = item._extend) == null ? void 0 : _b.price);
+  let price = Number((item == null ? void 0 : item.price) ?? ((_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.price));
   if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
     const variant = item.variant.find(
       (d) => d.id === (other == null ? void 0 : other.product_variant_id)
@@ -317,19 +317,19 @@ var getSourceProductPrice = (item) => {
   return price;
 };
 var getMainProductSellingPrice = (item) => {
-  var _a, _b, _c, _d, _e;
-  if (!(0, import_utils5.isNumber)((_a = item._extend) == null ? void 0 : _a.main_product_selling_price)) {
+  var _a, _b, _c, _d, _e, _f;
+  if (!(0, import_utils5.isNumber)((_a = item._extend) == null ? void 0 : _a.main_product_selling_price) && !(0, import_utils5.isString)((_b = item._extend) == null ? void 0 : _b.main_product_selling_price)) {
     return void 0;
   }
   let optionPrice = new import_decimal.default(0);
-  if (((_b = item._extend.other) == null ? void 0 : _b.option) && Array.isArray((_c = item._extend.other) == null ? void 0 : _c.option)) {
-    optionPrice = (_d = item._extend.other) == null ? void 0 : _d.option.reduce((accumulator, currentValue) => {
+  if (((_c = item._extend.other) == null ? void 0 : _c.option) && Array.isArray((_d = item._extend.other) == null ? void 0 : _d.option)) {
+    optionPrice = (_e = item._extend.other) == null ? void 0 : _e.option.reduce((accumulator, currentValue) => {
       const currentPrice = new import_decimal.default(currentValue.price || 0);
       const currentNum = new import_decimal.default(currentValue.num || 0);
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
   }
-  return new import_decimal.default((_e = item._extend) == null ? void 0 : _e.main_product_selling_price).add(optionPrice).toNumber();
+  return new import_decimal.default((_f = item._extend) == null ? void 0 : _f.main_product_selling_price).add(optionPrice).toNumber();
 };
 var formatProducts = (item, quantity) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;

package/lib/components/booking/components/voucher/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const VoucherCard: (props: any) => JSX.Element | null;
 export default VoucherCard;

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

@@ -60,6 +60,8 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
+  const stateRef = (0, import_react.useRef)(state);
+  stateRef.current = state;
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
     dispatch({
@@ -161,8 +163,8 @@ var VoucherCard = (props) => {
       }
       if (isBooking4Shop) {
         const val = shopDiscount.calcDiscount([
-          ...state.service.value,
-          ...state.addons.value
+          ...stateRef.current.service.value,
+          ...stateRef.current.addons.value
         ]);
         console.log("input: ", state.service.value);
         console.log("output: ", val);

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

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

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

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

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

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

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

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

package/lib/components/booking/hooks/useQuotation.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
     dom: JSX.Element;

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

@@ -95,10 +95,11 @@ var setNewCartValue = (cartValue, newProducts) => {
       }
       const selectBundleInfo = item._extend.other.bundle.find((item2) => item2.id === bundle.id);
       const optionPrice = calculateTotalPrice((selectBundleInfo == null ? void 0 : selectBundleInfo.option) || []);
+      const isEditDiscount = item.booking_id && (bundle.discount_list || []).length;
       return {
         ...bundle,
         base_price: bundleItemMap[bundle.id].base_price,
-        price: new import_decimal.default(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
+        price: isEditDiscount ? bundle.price : new import_decimal.default(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
         // product_price: bundleItemMap[item.id].product_price,
       };
     });

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

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

package/lib/components/booking/info/clientVariant/vertical/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface VerticalClientProps {
+    globalState: any;
+    setGlobalState: any;
+}
+declare const VerticalClient: React.ForwardRefExoticComponent<VerticalClientProps & React.RefAttributes<unknown>>;
+export default VerticalClient;

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

@@ -1,3 +1,4 @@
+/// <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/lib/components/booking/info/header/index.d.ts

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

package/lib/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/lib/components/booking/info/service/Lists.d.ts

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

package/lib/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/lib/components/booking/info/service/addService/utils.d.ts

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

package/lib/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -0,0 +1,251 @@
+import dayjs from 'dayjs';
+export declare const formatActiveKey: (lists: any[], platform: string, isEdit: boolean) => any[];
+/**
+ * @title: 获取资源名称
+ * @description:
+ * @param {any} id
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 18:02
+ */
+export declare const getResourceItem: (id: any, state: any) => any;
+/**
+ * @title: 错误提示
+ * @description:
+ * @param {any} service
+ * @param {any} resourceItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 18:41
+ */
+export declare const getErrorMessage: (service: any, resourceItem: any, isDay?: boolean) => any;
+/**
+ * @title: 格式化主体列表
+ * @description:
+ * @param {any} lists
+ * @param {boolean} isOpenGroup
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 11:27
+ */
+export declare const formatHolderLists: (lists: any) => any;
+export declare const isBookingProduct: (extension_type: any, bol?: boolean) => boolean | undefined;
+/**
+ * @title: 是否是预约商品
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @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} other
+ * @param actions
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-03 15:00
+ */
+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;
+export declare const genRowKey: (key: string) => string;
+/**
+ * @title: 格式化商品数据
+ * @description:
+ * @param {any} lists
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 17:36
+ */
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
+    id: any;
+    _id: any;
+    name: any;
+    title: any;
+    price: any;
+    total: number;
+    origin_total: number;
+    num: any;
+    image: any;
+    isShowNote: boolean;
+    note: any;
+    like_status: any;
+    bundle: any;
+    options: any;
+    errorMessage: string;
+    product_option_string: any;
+    discount_reason: any;
+    resource_id: any;
+    relation_form_name: any;
+    holder_title: any;
+    start_date: any;
+    end_date: any;
+    holder_id: any;
+    isNormalProduct: boolean;
+    isCustomItem: any;
+    vouchersApplicable: any;
+    locale: any;
+    symbol: any;
+    relation_products: any;
+    items: any[];
+}[];
+/**
+ * @title: 禁用日期
+ * @description:
+ * @param {any} current
+ * @param {string} position
+ * @param {any} startDate
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-03 17:51
+ */
+export declare const disabledDate: (current: any, position: string, currentDate: any) => any;
+/**
+ * @title: 是否是跨日预约
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 09:49
+ */
+export declare const isDayBooking: (state: any) => boolean;
+export declare const isDaysBooking: (state: any) => boolean;
+export declare const isEventBooking: (state: any) => boolean;
+export declare const isAppointmentProduct: (item: any) => boolean;
+/**
+ * @title: 是否是terminal上的跨日预约
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 15:31
+ */
+export declare const isTerminalDayBooking: (state: any) => any;
+export declare const formatDayDate: (_extend: any) => any;
+/**
+ * @title: 根据营业日时间格式化时间
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 12:07
+ */
+export declare const formatDayTime: ({ startDate, endDate }: any) => {
+    startDateTime: dayjs.Dayjs;
+    endDateTime: dayjs.Dayjs;
+};
+export declare const formatDateTime: (start_date: any, end_date: any) => {
+    value: dayjs.Dayjs;
+    end_date: dayjs.Dayjs;
+};
+/**
+ * @title: 初始化日期
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-06 17:24
+ */
+export declare const initDate: () => {
+    value: dayjs.Dayjs;
+    end_date: dayjs.Dayjs;
+};
+/**
+ * @title: 是否有预约商品
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-12 15:47
+ */
+export declare const isHasDayAppointmentProduct: (state: any) => boolean;
+/**
+ * @title: 过滤出如果是预约商品，则只获取跨日的预约商品
+ * @description:
+ * @param {any} lists
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-13 16:44
+ */
+export declare const getDayProducts: (holderId: number, lists: any, isTerminal?: boolean) => any;
+/**
+ * @title: 格式化表单数据
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:19
+ */
+export declare const getPets: (state: any) => any;
+/**
+ * @title: 得出预约商品
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:26
+ */
+export declare const getAppointmentService: (state: any) => any;
+/**
+ * @title: 判断是否打开删除宠物弹窗
+ * @description:
+ * @param {any} state
+ * @param {any} newVal
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-16 16:12
+ */
+export declare const isOpenDeletePet: (state: any, newVal: any) => {
+    ids: any;
+    lists: any;
+};
+/**
+ * @title: 当前选中的表单id
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-17 14:40
+ */
+export declare const holderId: (state: any) => number;
+/**
+ * @title: 更新套餐的价格
+ * @description:
+ * @param {any} currentValue
+ * @param {any} newBundleData
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-31 15:16
+ */
+export declare function updateNormalBundlePrice(currentValue: any, newBundleData: any): any[];
+/**
+ * @title: 更新预约商品报价单
+ * @description:
+ * @param {any} state
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-25 16:41
+ */
+export declare const updateAppointmentServicePrice: (state: any, { start_date, end_date, product_id }: any) => Promise<{
+    multiDayPrices: any;
+    price: number;
+}>;
+/**
+ * @title: 更新普通商品报价单价格
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-24 11:32
+ */
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

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

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import { PisellDrawerProps } from '../../../components/drawer';
+import '../../../info/service/addService/index.less';
+interface AddServiceProps {
+    onEdit: any;
+    dispatch?: any;
+    state?: any;
+    drawerProps?: PisellDrawerProps;
+    renderMode?: 'current' | 'drawer';
+}
+declare const Info: (props: AddServiceProps) => JSX.Element;
+export default Info;

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

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

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

@@ -36,6 +36,7 @@ var import_react = __toESM(require("react"));
 var import_ahooks = require("ahooks");
 var import_skuDetailModal = __toESM(require("../../../../../pro/skuDetailModal"));
 var import_model = require("../../../info/model");
+var import_utils = require("../editService/utils");
 var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const modalRef = (0, import_react.useRef)(null);
@@ -62,7 +63,12 @@ var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
   const handleConfirm = (0, import_ahooks.useMemoizedFn)((data) => {
     var _a, _b;
     const newProducts = (_b = ((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value) || []) == null ? void 0 : _b.map((item) => {
+      var _a2, _b2;
       if (item._id == data._id) {
+        data = (0, import_utils.setProductPrice)(data, {
+          newTotal: (_a2 = data._extend) == null ? void 0 : _a2.total,
+          origin_total: (_b2 = data._extend) == null ? void 0 : _b2.origin_total
+        });
         return data;
       }
       return item;

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

@@ -53,6 +53,7 @@ var import_utils5 = require("../../../info/utils");
 var import_utils6 = require("../../../utils");
 var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils7 = require("../addService/utils");
+var import_utils8 = require("./utils");
 var import_noteModal = __toESM(require("../../../../../plus/noteModal"));
 var import_priceKeyboard = require("../../../../../pro/priceKeyboard");
 var submitLock = false;
@@ -187,7 +188,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -222,19 +223,27 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     let _id = _item == null ? void 0 : _item._id;
+    _item = (0, import_utils8.setProductPrice)(_item, {
+      newTotal: values.total,
+      origin_total: (_c2 = _item._extend) == null ? void 0 : _c2.origin_total
+    });
     if (!_list.some((d) => d._id === _id)) {
       const detail = (0, import_utils3.addService)(_list, _item, state);
       _list = detail.list;
     } else {
       if (isChangeTotal.current) {
         delete _item.discount_list;
+        _item = (0, import_utils8.setProductPrice)(_item, {
+          newTotal: values.total,
+          origin_total: (_d2 = _item._extend) == null ? void 0 : _d2.origin_total
+        });
       }
       _list = _list.map((d) => d._id === _id ? { ..._item, new: 0 } : d);
     }
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_c2 = state.service.cacheItem) == null ? void 0 : _c2.new)) {
+    if (!!((_e2 = state.service.cacheItem) == null ? void 0 : _e2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -243,7 +252,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_d2 = window.closeBookingEditModal) == null ? void 0 : _d2.call(window);
+    (_f2 = window.closeBookingEditModal) == null ? void 0 : _f2.call(window);
     dispatch({
       type: "setService",
       payload: {

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -11,3 +11,18 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;