@pisell/private-materials 6.4.83 → 6.4.84

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/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,
         // 子商品单数量附加费
@@ -246,7 +246,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)
@@ -325,19 +325,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;
@@ -450,7 +450,7 @@ var formatBookings = (data, values) => {
   let bookings = [];
   let obj = {};
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -485,12 +485,15 @@ var formatBookings = (data, values) => {
         "minutes"
       );
     }
-    const isSetGroupId = obj[(_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.groupId];
-    if (!((_f = item._extend) == null ? void 0 : _f.unique_identification_number)) {
+    if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
+      const unique_identification_number = (0, import_utils5.getUniqueId)();
+      item._extend.unique_identification_number = unique_identification_number;
+    }
+    const isSetGroupId = obj[(_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.groupId];
+    if (!((_g = item._extend) == null ? void 0 : _g.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
-    debugger;
     const booking = {
       schedule_event_id: item == null ? void 0 : item.booking_id,
       product: formatProducts(item),
@@ -512,6 +515,23 @@ var formatBookings = (data, values) => {
       resources: formatResource(item),
       note: item._extend.note,
       "metadata": formatMetaData(item, !isSetGroupId),
+      "relation_products": formatRelationDetails(item._extend.relation_details),
+      "id": item.booking_id || 0,
+      "relation_id": item._extend.relation_id || 0,
+      "like_status": item._extend.like_status || "common",
+      "relation_type": item._extend.relation_type || "",
+      "is_all": false,
+      "schedule_id": item._extend.schedule_id || 0,
+      "end_time": end_time,
+      "sub_type": isDay ? "days" : getSubType(item),
+      "select_date": start_date,
+      "start_time": start_time,
+      "end_date": end_date,
+      "start_date": start_date,
+      "duration": isDay ? 0 : import_utils.flexibleObj.getValue(item._extend.duration),
+      "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
+      "resources": formatResource(item),
+      "note": item._extend.note,
       ...eventOtherParams || {},
       ...dayParams
     };
@@ -527,7 +547,7 @@ var formatBookings = (data, values) => {
       newItem._extend.unique_identification_number = `${item._extend.unique_identification_number}_${i}`;
       if (i > 0) {
         newItem._extend.surcharge_rounding_remainder = void 0;
-        if (((_i = (_h = (_g = newItem._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.bundle) == null ? void 0 : _i.length) > 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;
           });
@@ -535,10 +555,10 @@ var formatBookings = (data, values) => {
       }
       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, false)
+        "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, false)
       });
     }
   });

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,15 +163,15 @@ 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);
         productListToValue(val.productList);
       }
     },
-    { wait: 500 }
+    { wait: 1e3 }
   );
   (0, import_react.useEffect)(() => {
     run();

package/lib/components/booking/dashboard/serve.js

@@ -24,7 +24,12 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var getBookingList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/booking`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/forms/serve.js

@@ -24,8 +24,18 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
-var getFormData = async (params) => import_utils.request.getRequest().get(`/shop/form/data/v1`, params);
-var sendFormReminder = async (params) => import_utils.request.getRequest().post(`/shop/form/form-reminder`, params);
+var getFormData = async (params) => import_utils.request.getRequest().get(`/shop/form/data/v1`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
+var sendFormReminder = async (params) => import_utils.request.getRequest().post(`/shop/form/form-reminder`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getFormData,

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/client/serve.js

@@ -25,11 +25,22 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFranchiseeCustomerInfo = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 var getFranchiseeCustomerList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, { abort: true });
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, {
+    abort: true,
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/info/pet/serve.js

@@ -24,7 +24,12 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFormDetail = async (id) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`);
+  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -60,7 +60,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
       if (type === "view" || type === "edit_product") {
         let product = currentItem._origin;
         let cacheItem = { ...product, new: 0 };
-        if (isParallelResource) {
+        if (isParallelResource && !(0, import_utils.isNormalProductByDurationSchedule)(product)) {
           cacheItem = (0, import_utils2.getProductExtend)({
             cacheItem,
             state

package/lib/components/booking/info/service/addTimeModal/serve.js

@@ -25,7 +25,13 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getAddTimeProducts = async (params, config) => {
-  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, config);
+  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, {
+    ...config,
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 var saveAddTimeProduct = async ({ orderId, params }) => {

package/lib/components/booking/info/service/serve.js

@@ -25,11 +25,25 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
-var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params);
+var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
 var postMultiDay = async (id, params) => import_utils.request.getRequest().post(`/shop/product/multi-day/detail/${id}`, params, {
-  useCache: true
+  useCache: true,
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
+});
+var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params, {
+  cache: {
+    mode: "remote_local",
+    type: "indexDB"
+  }
 });
-var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getProductDetail,

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

@@ -476,10 +476,13 @@ var getGeneralParams = (item, state, isParallelResource) => {
   const parallelResourceOtherParams = {};
   let multiResources;
   if (isParallelResource) {
-    const hasDataItem = (0, import_utils6.getProductExtend)({
-      cacheItem: { ...item, new: 0 },
-      state
-    });
+    let hasDataItem = item;
+    if (!isNormalProductByDurationSchedule(hasDataItem) && !hasDataItem._data) {
+      hasDataItem = (0, import_utils6.getProductExtend)({
+        cacheItem: { ...item, new: 0 },
+        state
+      });
+    }
     const { resourceMaps, resources } = hasDataItem._data || {};
     parallelResourceOtherParams.errorMessage = getErrorMessageInfo2(getAllErrorList(hasDataItem));
     multiResources = resources.map((resource) => {
@@ -556,13 +559,17 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
     const options = formatOptions((_c = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.option);
     const bundle = formatBundle((_e = (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle);
     const isNormalProduct = !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) || (state == null ? void 0 : state.renderType) === "eventBooking";
+    const isNormalProductByDurationScheduleVal = isNormalProductByDurationSchedule(item);
     let resourceItem = {};
     let errorMessage = "";
-    if (_isDayBookingProduct || isGeneral) {
+    if ((_isDayBookingProduct || isGeneral) && !isNormalProductByDurationScheduleVal) {
       resourceItem = getResourceItem((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
-    const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    let generalParams = {};
+    if (isGeneral && !isNormalProductByDurationScheduleVal) {
+      generalParams = getGeneralParams(item, state, !!isParallelResource);
+    }
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,

package/lib/components/booking/info2/serve.js

@@ -27,7 +27,12 @@ module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var import_utils2 = require("./utils");
 var getResourceList = async (params, bookingId = []) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params);
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params, {
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return (0, import_utils2.getFormatResourceListAndMap)(data, bookingId);
 };
 var createBookings = async (params) => {

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

@@ -397,6 +397,7 @@ var getIsAutoClose = (cacheItem) => {
 };
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
   var _a, _b, _c, _d, _e, _f, _g;
+  console.time("console.time getProductExtend");
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
@@ -498,7 +499,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       state
     });
   }
-  console.log("_cacheItem_cacheItem", _cacheItem);
+  console.timeEnd("console.time getProductExtend");
   return _cacheItem;
 };
 var transServiceList = (list) => {

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;

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,21 +16,32 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/booking/info2/service/editService/utils.tsx
 var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
-  setAutoAllocationStorage: () => setAutoAllocationStorage
+  setAutoAllocationStorage: () => setAutoAllocationStorage,
+  setProductPrice: () => setProductPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("@pisell/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
     const valueObj = JSON.parse(value);
-    return (0, import_utils.isBoolean)(valueObj[id]) ? valueObj[id] : true;
+    return (0, import_utils2.isBoolean)(valueObj[id]) ? valueObj[id] : true;
   }
   return true;
 };
@@ -41,8 +54,32 @@ var setAutoAllocationStorage = (data) => {
     localStorage.setItem("resource-auto-allocation", JSON.stringify({ ...data }));
   }
 };
+var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const discountRatio = new import_decimal.default(newTotal).div(new import_decimal.default(origin_total));
+  let subTotal = new import_decimal.default(0);
+  if (((_a = cacheItem._extend.other) == null ? void 0 : _a.bundle) && (0, import_utils.isArr)((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle)) {
+    (_d = (_c = cacheItem._extend.other) == null ? void 0 : _c.bundle) == null ? void 0 : _d.forEach((bundle) => {
+      const newPrice = new import_decimal.default(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+      const quantity = bundle.num ?? bundle.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
+      bundle.price = newPrice;
+    });
+  }
+  if (((_e = cacheItem._extend.other) == null ? void 0 : _e.option) && (0, import_utils.isArr)((_f = cacheItem._extend.other) == null ? void 0 : _f.option)) {
+    (_h = (_g = cacheItem._extend.other) == null ? void 0 : _g.option) == null ? void 0 : _h.forEach((option) => {
+      const newPrice = new import_decimal.default(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+      const quantity = option.num ?? option.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.default(newPrice).mul(quantity));
+      option.price = newPrice;
+    });
+  }
+  cacheItem._extend.price = new import_decimal.default(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getAutoAllocationStorage,
-  setAutoAllocationStorage
+  setAutoAllocationStorage,
+  setProductPrice
 });