@pisell/private-materials 6.6.4 → 6.6.6

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

@@ -16,6 +16,11 @@ export declare const formatProductOption: (option: any) => any;
  * @Date: 2024-02-19 09:26
  */
 export declare const formatProductBundle: (bundle: any) => any;
+/**
+ * 获取子商品折扣信息
+ * @param item
+ */
+export declare const getBundleDiscountList: (bundle: any[]) => any[];
 export interface ResourceItem {
     [key: string]: any;
 }
@@ -37,6 +42,20 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+/**
+ * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
+ * @param item
+ * @returns
+ */
+export declare const formatOriginalPrice: (item: any) => number;
+/**
+ * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
+ * @param item
+ * @returns
+ */
+export declare const formatSellingPrice: (item: any) => number;
+export declare const getSourceProductPrice: (item: any) => number;
+export declare const getMainProductSellingPrice: (item: any) => number | undefined;
 /**
  * @title: 是否包含跨日预约商品
  * @description:

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

@@ -32,11 +32,16 @@ __export(utils_exports, {
   checkHolderIsError: () => checkHolderIsError,
   checkResourcesFormat: () => checkResourcesFormat,
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
+  formatOriginalPrice: () => formatOriginalPrice,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
+  formatSellingPrice: () => formatSellingPrice,
   formatValues: () => formatValues,
-  getHasMultiDayProduct: () => getHasMultiDayProduct
+  getBundleDiscountList: () => getBundleDiscountList,
+  getHasMultiDayProduct: () => getHasMultiDayProduct,
+  getMainProductSellingPrice: () => getMainProductSellingPrice,
+  getSourceProductPrice: () => getSourceProductPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -110,6 +115,8 @@ var formatProductBundle = (bundle) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
     return {
+      "is_charge_tax": d.is_charge_tax,
+      "tax_fee": d.tax_fee,
       "bundle_group_id": d.group_id,
       "bundle_id": d.id,
       "bundle_product_id": (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
@@ -117,16 +124,37 @@ var formatProductBundle = (bundle) => {
       "num": d.num,
       "extension_id": d.extension_id,
       "extension_type": d.extension_type,
-      "price": Number(d == null ? void 0 : d.price),
-      // checkout 2.0 新增
+      "price": Number(d == null ? void 0 : d.product_price),
       "price_type": d == null ? void 0 : d.price_type,
-      // checkout 2.0 新增
-      "custom_price": Math.abs(new import_decimal.default(d == null ? void 0 : d.price).sub(option_price).toNumber()).toFixed(2),
+      "price_type_ext": d == null ? void 0 : d.price_type_ext,
+      "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
+      "option": option,
+      "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,
+        // 子商品单数量附加费
+        "surcharge_fee": d.surcharge_fee,
+        // 可选，附加费均摊舍入金额
+        "surcharge_rounding_remainder": d.surcharge_rounding_remainder,
+        relation_surcharge_ids: d.relation_surcharge_ids || []
+      }
     };
   });
 };
+var getBundleDiscountList = (bundle) => {
+  if (!bundle) {
+    return [];
+  }
+  let discountList = [];
+  bundle.forEach((d) => {
+    if (d.discount_list && (0, import_utils5.isArr)(d.discount_list)) {
+      discountList.push(...d.discount_list.filter((item) => !item.id));
+    }
+  });
+  return discountList;
+};
 var getSubType = (item) => {
   var _a;
   const _type = (_a = item.duration) == null ? void 0 : _a.type;
@@ -214,7 +242,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)
@@ -258,6 +286,23 @@ var formatMetaData = (item, isMultiDayPrices) => {
   }
   return metadata;
 };
+var formatProductMetadata = (item) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  let metadata = {};
+  if ((_a = item._extend) == null ? void 0 : _a.surcharge_fee) {
+    metadata.main_product_attached_bundle_surcharge_fee = (_b = item._extend) == null ? void 0 : _b.surcharge_fee;
+  }
+  if ((_c = item._extend) == null ? void 0 : _c.main_product_attached_bundle_tax_fee) {
+    metadata.main_product_attached_bundle_tax_fee = (_d = item._extend) == null ? void 0 : _d.main_product_attached_bundle_tax_fee;
+  }
+  if ((_e = item._extend) == null ? void 0 : _e.surcharge_rounding_remainder) {
+    metadata.surcharge_rounding_remainder = (_f = item._extend) == null ? void 0 : _f.surcharge_rounding_remainder;
+  }
+  if ((_g = item._extend) == null ? void 0 : _g.relation_surcharge_ids) {
+    metadata.relation_surcharge_ids = (_h = item._extend) == null ? void 0 : _h.relation_surcharge_ids;
+  }
+  return metadata;
+};
 var getSourceProductPrice = (item) => {
   var _a, _b, _c;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
@@ -272,12 +317,29 @@ var getSourceProductPrice = (item) => {
   }
   return price;
 };
+var getMainProductSellingPrice = (item) => {
+  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 (((_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((_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;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
-  const discount_list = (item == null ? void 0 : item.discount_list) || [];
+  const bundleDiscountList = getBundleDiscountList(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
+  const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
+  discount_list.push(...bundleDiscountList);
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
   discount_list.forEach((d) => {
     d.metadata = {
@@ -292,30 +354,31 @@ var formatProducts = (item, quantity) => {
     item.product_id = 0;
   }
   return {
-    name: item.name,
-    num: quantity || item._extend.quantity,
-    price: formatProductPrice(item),
-    source_product_price: getSourceProductPrice(item),
-    product_id: (item == null ? void 0 : item.product_id) || item.product_id === 0 ? item.product_id : item.id,
-    discount_amount: notManualDiscount.length > 0 ? 0 : discount_amount,
-    product_discount_reason: item._extend.discount_reason || "",
-    is_charge_tax: item.is_charge_tax,
-    note: ((_a = item._extend) == null ? void 0 : _a.note) || "",
-    discountway: item._extend.discountway || "num",
-    discount_per: item._extend.discount_per,
-    discount_type: item._extend.discount_type || discount_type,
-    order_detail_id: item._extend.order_detail_id || 0,
-    product_bundle: formatProductBundle((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-    bundle_edit: item._extend.bundle_edit,
-    product_option_item: formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
-    product_variant_id: ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0,
-    discount_list: notManualDiscount,
-    metadata: formatMetaData(item, false),
+    "name": item.name,
+    "num": quantity || item._extend.quantity,
+    "price": formatProductPrice(item),
+    "main_product_selling_price": getMainProductSellingPrice(item) ?? formatProductPrice(item),
+    "source_product_price": getSourceProductPrice(item),
+    "product_id": (item == null ? void 0 : item.product_id) || item.product_id === 0 ? item.product_id : item.id,
+    "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
+    "product_discount_reason": item._extend.discount_reason || "",
+    "is_charge_tax": item.is_charge_tax,
+    "note": ((_c = item._extend) == null ? void 0 : _c.note) || "",
+    "discountway": item._extend.discountway || "num",
+    "discount_per": item._extend.discount_per,
+    "discount_type": item._extend.discount_type || discount_type,
+    "order_detail_id": item._extend.order_detail_id || 0,
+    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+    "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
+    "product_option_item": formatProductOption((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
+    "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
+    "discount_list": notManualDiscount,
+    metadata: formatProductMetadata(item),
     // checkout 需求新增字段
-    calculated_original_price: formatOriginalPrice(item),
-    calculated_selling_price: formatSellingPrice(item),
-    tax_fee: item._extend.tax_fee,
-    custom_deposit_data: item.custom_deposit_data
+    "calculated_original_price": formatOriginalPrice(item),
+    "calculated_selling_price": formatSellingPrice(item),
+    "tax_fee": item._extend.tax_fee,
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 var formatAppointmentProductLists = (data) => {
@@ -381,7 +444,7 @@ var formatBookings = (data, values) => {
   let bookings = [];
   let obj = {};
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -455,12 +518,20 @@ var formatBookings = (data, values) => {
     for (let i = 0; i < (item._extend.quantity || 1); i++) {
       const newItem = (0, import_lodash.cloneDeep)(item);
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
+      if (i > 0) {
+        newItem._extend.surcharge_rounding_remainder = void 0;
+        if (((_j = (_i = (_h = newItem._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.bundle) == null ? void 0 : _j.length) > 0) {
+          newItem._extend.other.bundle.forEach((bundleItem) => {
+            bundleItem.surcharge_rounding_remainder = void 0;
+          });
+        }
+      }
       bookings.push({
         ...booking,
         product: formatProducts(newItem, 1),
         number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: newItem }, false) : newItem._extend.number || 1,
         holder: getHolderByIndex(booking.holder, i),
-        metadata: formatMetaData(newItem)
+        metadata: formatMetaData(newItem, false)
       });
     }
   });
@@ -620,9 +691,14 @@ var checkHolderIsError = (state) => {
   checkHolderIsError,
   checkResourcesFormat,
   checkSubResourcesCapacity,
+  formatOriginalPrice,
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
+  formatSellingPrice,
   formatValues,
-  getHasMultiDayProduct
+  getBundleDiscountList,
+  getHasMultiDayProduct,
+  getMainProductSellingPrice,
+  getSourceProductPrice
 });

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

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

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

@@ -48,7 +48,7 @@ var import_utils3 = require("../../info/clientVariant/utils");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var services = {};
 var VoucherCard = (props) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const context = (0, import_useEngineContext.default)();
   const { state, dispatch, source, isInModal = false } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(isInModal ? true : false);
@@ -60,9 +60,13 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
+  const holderChangedRef = (0, import_react.useRef)(false);
+  const stateRef = (0, import_react.useRef)(state);
+  stateRef.current = state;
   services = state.service;
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
+    const beforeValue = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value;
     dispatch({
       type: "setClient",
       payload: {
@@ -70,7 +74,8 @@ var VoucherCard = (props) => {
         edit: true
       }
     });
-    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
+    if ((beforeValue == null ? void 0 : beforeValue.id) === (value == null ? void 0 : value.id)) return;
+    if ((_c2 = (_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.length) {
       dispatch({
         type: "setService",
         payload: {
@@ -104,7 +109,7 @@ var VoucherCard = (props) => {
   const serviceMemo = (0, import_react.useMemo)(() => {
     var _a2;
     const val = (_a2 = state.service.value || []) == null ? void 0 : _a2.map((value) => {
-      var _a3, _b2;
+      var _a3, _b2, _c2;
       return {
         booking_id: value.booking_id,
         id: value.id,
@@ -113,11 +118,17 @@ var VoucherCard = (props) => {
         discount_list: value.discount_list,
         origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total,
         quantity: value._extend.quantity,
-        startDate: value._extend.startDate
+        startDate: value._extend.startDate,
+        holder_id: (_c2 = value == null ? void 0 : value._extend) == null ? void 0 : _c2.holder_id
       };
     });
     return val;
   }, [state.service.value]);
+  const serviceTotal = (0, import_react.useMemo)(() => {
+    return serviceMemo.reduce((total, item) => {
+      return total + (item.total || 0);
+    }, 0);
+  }, [serviceMemo]);
   const onScanWallPassCode = (0, import_ahooks.useMemoizedFn)((e) => {
     if (!e.detail.code) {
       return;
@@ -148,6 +159,21 @@ var VoucherCard = (props) => {
     });
     return val;
   }, [state.addons.value]);
+  const holdersMemo = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (isBooking4Shop) {
+      let list = [];
+      if ((_a2 = state.pet) == null ? void 0 : _a2.value) {
+        let entries = Object.entries(state.pet.value);
+        if (entries.length === 1) {
+          list = entries[0][1];
+        }
+      }
+      shopDiscount.setHolders(list);
+      holderChangedRef.current = true;
+      return list || [];
+    }
+  }, [(_c = state.pet) == null ? void 0 : _c.value, isBooking4Shop]);
   const disabled = (0, import_react.useMemo)(() => {
     var _a2;
     if (["paid", "partially_paid"].includes(
@@ -160,24 +186,30 @@ var VoucherCard = (props) => {
   const { run } = (0, import_ahooks.useDebounceFn)(
     () => {
       var _a2, _b2;
-      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
+      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value && !holderChangedRef.current || !((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) {
         return;
       }
       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);
         productListToValue(val.productList);
+        holderChangedRef.current = false;
       }
     },
     { wait: 500 }
   );
   (0, import_react.useEffect)(() => {
     run();
-  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  }, [
+    JSON.stringify(serviceMemo),
+    JSON.stringify(addonsMemo),
+    JSON.stringify(holdersMemo),
+    isBooking4Shop
+  ]);
   (0, import_react.useEffect)(() => {
     if (shopDiscount) {
       const wrappedHandler = executeIfActive(fn);
@@ -237,6 +269,12 @@ var VoucherCard = (props) => {
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {
     var _a2;
     const { serviceList, addonsList } = (0, import_utils2.getServiceAddons)(list);
+    const newTotal = serviceList.reduce((total, item) => {
+      return total + (item._extend.total || 0);
+    }, 0);
+    if (newTotal !== serviceTotal) {
+      edit = true;
+    }
     serviceValueRef.current = serviceList;
     addonsValueRef.current = addonsList;
     let other = {};
@@ -253,12 +291,14 @@ var VoucherCard = (props) => {
       }
     });
     if (!((_a2 = props == null ? void 0 : props.state) == null ? void 0 : _a2.isBookingTicket2)) {
-      dispatch({
-        type: "setAddons",
-        payload: {
-          value: addonsList,
-          ...other
-        }
+      setTimeout(() => {
+        dispatch({
+          type: "setAddons",
+          payload: {
+            value: addonsList,
+            ...other
+          }
+        });
       });
     }
   });
@@ -322,7 +362,7 @@ var VoucherCard = (props) => {
       {
         style: { width: "100%" },
         isInModal: isInModal || false,
-        dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
+        dataSource: ((_e = (_d = state.service) == null ? void 0 : _d.value) == null ? void 0 : _e.length) ? availableData : [],
         mixedSort,
         onChange: (val) => {
           const detail = shopDiscount.setDiscountSelected({

package/lib/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/lib/components/booking/hooks/useQuotation.js

@@ -100,10 +100,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/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/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/lib/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/lib/components/booking/info/service2/utils.js

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

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

@@ -76,7 +76,8 @@ var CartClientCard = (0, import_react.forwardRef)(({
     ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.storage) == null ? void 0 : _c.get("umi_locale")) || "en"
   );
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
+    const beforeValue = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value;
     dispatch({
       type: "setClient",
       payload: {
@@ -84,7 +85,8 @@ var CartClientCard = (0, import_react.forwardRef)(({
         edit: true
       }
     });
-    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
+    if ((beforeValue == null ? void 0 : beforeValue.id) === (value == null ? void 0 : value.id)) return;
+    if ((_c2 = (_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.length) {
       dispatch({
         type: "setService",
         payload: {

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

@@ -244,7 +244,6 @@ var Info = (props) => {
           _extend: {
             start_date: state.date.value,
             quantity: (e == null ? void 0 : e.quantity) || 1,
-            price: _detail.price,
             product_name: item.title,
             other
           },
@@ -254,6 +253,7 @@ var Info = (props) => {
         if (isMultiDay) {
           cacheItem._extend.end_date = state.date.value.add(1, "day");
         }
+        cacheItem._extend.price = (0, import_utils3.getMainPrice)(cacheItem, _detail.price);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;

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

@@ -54,12 +54,13 @@ 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 import_EditTabs = __toESM(require("../../../info/service/editService/EditTabs"));
 var import_BookingList = __toESM(require("../../../info/service/editService/BookingList"));
 var import_dayjs = __toESM(require("dayjs"));
-var import_utils8 = require("../../../info/service2/Group/utils");
+var import_utils9 = require("../../../info/service2/Group/utils");
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
@@ -198,7 +199,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -259,12 +260,16 @@ var Info = (_, ref) => {
     }
     let _id = _item == null ? void 0 : _item._id;
     let groupId = (_h2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _h2.groupId;
+    _item = (0, import_utils8.setProductPrice)(_item, {
+      newTotal: values.total,
+      origin_total: (_i2 = _item._extend) == null ? void 0 : _i2.origin_total
+    });
     if (groupId) {
       _list = _list.filter((d) => {
         var _a3;
         return ((_a3 = d._extend) == null ? void 0 : _a3.groupId) !== groupId;
       });
-      _list = _list.concat((0, import_utils8.createBookingItemsByGroup)(_item, true));
+      _list = _list.concat((0, import_utils9.createBookingItemsByGroup)(_item, true));
     } else {
       if (!_list.some((d) => d._id === _id)) {
         const detail = (0, import_utils3.addService)(_list, _item, state);
@@ -279,7 +284,7 @@ var Info = (_, ref) => {
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_i2 = state.service.cacheItem) == null ? void 0 : _i2.new)) {
+    if (!!((_j2 = state.service.cacheItem) == null ? void 0 : _j2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -288,7 +293,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_j2 = window.closeBookingEditModal) == null ? void 0 : _j2.call(window);
+    (_k2 = window.closeBookingEditModal) == null ? void 0 : _k2.call(window);
     _list.sort((a, b) => {
       var _a3, _b3;
       const aHasHolderId = ((_a3 = a._extend) == null ? void 0 : _a3.holder_id) && (Array.isArray(a._extend.holder_id) ? a._extend.holder_id.length > 0 : true);
@@ -330,7 +335,24 @@ var Info = (_, ref) => {
       const startTime2 = performance.now();
       console.log(startTime2, "startTime");
       form.resetFields();
-      form.setFieldsValue(values);
+      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
+      });
       const endTime2 = performance.now();
       console.log(endTime2 - window.pp1, "打开商品5");
       console.log("执行时间", endTime2 - startTime2, values);
@@ -872,10 +894,10 @@ var Info = (_, ref) => {
     if (duration2 !== void 0) {
       cacheItem._extend.duration = duration2;
     }
-    cacheItem._extend.items = (0, import_utils8.createBookingItemsByGroup)(cacheItem);
+    cacheItem._extend.items = (0, import_utils9.createBookingItemsByGroup)(cacheItem);
     cacheItem._extend = {
       ...cacheItem._extend,
-      ...(0, import_utils8.getGroupTotalPrice)(cacheItem._extend.items)
+      ...(0, import_utils9.getGroupTotalPrice)(cacheItem._extend.items)
     };
     dispatch({
       type: "setService",

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;