@pisell/private-materials 6.6.5 → 6.6.6

package/lib/components/appointmentBooking/components/Services/index.js

@@ -87,11 +87,14 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         setting: { can_input: true, item_max_length: isShowProductDetailStepper, is_detail_open: clickType === "cover" }
       },
       callback: async (data) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         if (data.isCancel) {
           appointmentBooking.closeProductDetail();
           return;
         }
+        if (data == null ? void 0 : data.origin) {
+          data.origin.isFormSubject = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.bookingSetting) == null ? void 0 : _b.bookingSubject) == null ? void 0 : _c.type) === "form";
+        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -125,7 +128,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             endDate
           });
         } else {
-          const resources = ((_b = (_a = data == null ? void 0 : data.origin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [];
+          const resources = ((_e = (_d = data == null ? void 0 : data.origin) == null ? void 0 : _d.product_resource) == null ? void 0 : _e.resources) || [];
           const activeStatus = resources.find((item2) => item2.status === 1);
           if (!activeStatus && !appointmentBooking.isTargetNormalProduct(data == null ? void 0 : data.origin)) {
             return (0, import_utils2.Toast)(

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -96,7 +96,7 @@ var VoucherCard = (props) => {
       return {
         _id: item._id,
         quantity: item.num,
-        bundle: item._bundleOrigin,
+        bundle: item.bundle,
         options: item._optionsOrigin,
         product: {
           ...item._productOrigin
@@ -111,6 +111,18 @@ var VoucherCard = (props) => {
     const val = shopDiscount.calcDiscount(products2);
     batchUpdateCart(val.productList);
   };
+  const stringifiedHolders = (0, import_react.useMemo)(() => {
+    let _ret;
+    try {
+      _ret = JSON.stringify(products.map((item) => (item == null ? void 0 : item.holder_id) || ""));
+    } catch (error) {
+      _ret = "";
+    }
+    return _ret;
+  }, [products]);
+  (0, import_react.useEffect)(() => {
+    onCartChange();
+  }, [stringifiedHolders]);
   (0, import_react.useEffect)(() => {
     const val = shopDiscount.getDiscountList();
     setDisCountList(val);

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

@@ -51,23 +51,31 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const bundleDiscountList = (0, import_utils.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);
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
       price: (0, import_utils.formatProductPrice)(item),
       product_id: item.id,
-      discount_list: (item == null ? void 0 : item.discount_list) || [],
+      discount_list: discount_list || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
       note: "",
       discountway: "num",
       discount_type: "discount",
-      bundle_edit: (_a = item._extend) == null ? void 0 : _a.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-      "product_option_item": (0, import_utils.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
+      bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
+      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
+      "product_option_item": (0, import_utils.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,
+      "source_product_price": (0, import_utils.getSourceProductPrice)(item),
+      "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
+      "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
+      "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
+      "tax_fee": item._extend.tax_fee
     };
   });
   return arr;
@@ -241,12 +249,12 @@ var Addons = (0, import_model.Provider)((props) => {
           isAddons: true,
           _key: e.key,
           _extend: {
-            price: _detail.price,
             other: e,
             quantity: (e == null ? void 0 : e.quantity) || 1
           },
           quantity: (e == null ? void 0 : e.quantity) || 1
         };
+        product._extend.price = (0, import_utils2.getMainPrice)(product, _detail.price);
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
         product._extend.origin_total = _total;

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

@@ -72,7 +72,8 @@ var ActionButtons = ({
   const { ScheduleModule } = pisellosAllModule;
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   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: {
@@ -80,7 +81,8 @@ var ActionButtons = ({
         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/components/footer/amount.d.ts

@@ -33,4 +33,5 @@ export declare const getSumTotal: (state: any, options: {
     dueAmount: number;
     roundingAmount: number;
     originExpectAmount: number;
+    originExpectAmountWithoutDiscount: number;
 };

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

@@ -48,7 +48,7 @@ var getRelationDetailsTotal = (relation_details) => {
   }
   return total.toNumber();
 };
-var getProductExpectAmount = (state, isEdit) => {
+var getProductExpectAmount = (state, isEdit, isOriginTotal) => {
   var _a, _b, _c, _d;
   let price = new import_decimal.default(0);
   let duration = new import_decimal.default(0);
@@ -62,7 +62,8 @@ var getProductExpectAmount = (state, isEdit) => {
           if (isDay || (0, import_utils3.isNormalProductByDurationSchedule)(item) || (0, import_utils4.isMultiDayProduct)(item)) {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
-            price = price.add(itemTotal.mul(quantity));
+            const itemOriginTotal = new import_decimal.default(item._extend.origin_total || 0);
+            price = price.add((isOriginTotal ? itemOriginTotal : itemTotal).mul(quantity));
             const _duration = !(0, import_utils3.isNormalProductByDurationSchedule)(item) ? new import_decimal.default(item._extend.duration || 0) : new import_decimal.default(0);
             if (isDay || (0, import_utils4.isMultiDayProduct)(item)) {
               dayDuration = dayDuration.add(_duration);
@@ -72,7 +73,8 @@ var getProductExpectAmount = (state, isEdit) => {
           } else {
             const quantity = new import_decimal.default(item._extend.quantity || 1);
             const itemTotal = new import_decimal.default(item._extend.total || 0);
-            price = price.add(itemTotal.mul(quantity));
+            const itemOriginTotal = new import_decimal.default(item._extend.origin_total || 0);
+            price = price.add((isOriginTotal ? itemOriginTotal : itemTotal).mul(quantity));
             const relationTotal = new import_decimal.default(getRelationDetailsTotal(
               item._extend.relation_details || []
             ));
@@ -91,7 +93,8 @@ var getProductExpectAmount = (state, isEdit) => {
         for (let item of state.addons.value) {
           const quantity = new import_decimal.default(item._extend.quantity || 1);
           const itemTotal = new import_decimal.default(item._extend.total || 0);
-          price = price.add(itemTotal.mul(quantity));
+          const itemOriginTotal = new import_decimal.default(item._extend.origin_total || 0);
+          price = price.add((isOriginTotal ? itemOriginTotal : itemTotal).mul(quantity));
         }
       }
     }
@@ -147,9 +150,10 @@ var getProductItemTax = (item, state, options) => {
       }
     }
   }
-  return singleItemTax.times(quantity);
+  return singleItemTax.times(quantity).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
 };
 var processItemsTax = (items, state, options) => {
+  var _a, _b, _c;
   const { tax_rate, is_price_include_tax, computed } = options;
   const { shopDiscount, productExpectAmount } = computed;
   let originTax = new import_decimal.default(0);
@@ -157,10 +161,11 @@ var processItemsTax = (items, state, options) => {
   for (let item of items) {
     const quantity = new import_decimal.default(item._extend.quantity || 1);
     const unitPrice = new import_decimal.default(item._extend.total || 0);
-    const originalTaxPerItem = getProductItemTax(
+    const mainProductPrice = new import_decimal.default(getMainProductTotal(item) || 0);
+    let originalTaxPerItem = getProductItemTax(
       {
         ...item,
-        total: unitPrice.toNumber(),
+        total: mainProductPrice.add(((_a = item._extend) == null ? void 0 : _a.surcharge_fee) || 0).toNumber(),
         quantity: 1
       },
       state,
@@ -170,19 +175,22 @@ var processItemsTax = (items, state, options) => {
     if (productExpectAmount > 0) {
       itemDiscount = unitPrice.dividedBy(productExpectAmount).times(shopDiscount);
     }
-    const itemDiscountedUnitPrice = unitPrice.minus(itemDiscount);
-    const discountedTaxPerItem = getProductItemTax(
+    let mainItemDiscount = new import_decimal.default(0);
+    if (unitPrice.greaterThan(0)) {
+      mainItemDiscount = mainProductPrice.dividedBy(productExpectAmount).times(shopDiscount);
+    }
+    const mainItemDiscountedUnitPrice = mainProductPrice.minus(mainItemDiscount).add(((_b = item._extend) == null ? void 0 : _b.surcharge_fee) || 0);
+    const maxDiscountedTaxPerItem = getProductItemTax(
       {
         ...item,
-        total: itemDiscountedUnitPrice.toNumber(),
+        total: mainItemDiscountedUnitPrice.toNumber(),
         price: item._extend.total,
         quantity: 1
       },
       state,
       { tax_rate, is_price_include_tax }
     );
-    item._extend.original_tax_fee = originalTaxPerItem.toNumber();
-    item._extend.tax_fee = discountedTaxPerItem.toNumber();
+    item._extend.main_product_attached_bundle_tax_fee = maxDiscountedTaxPerItem.toNumber();
     let addTimeTotalTax = new import_decimal.default(0);
     if (Array.isArray(item._extend.relation_details)) {
       for (let atItem of item._extend.relation_details) {
@@ -198,8 +206,7 @@ var processItemsTax = (items, state, options) => {
         const addTimeTaxPerItem = getProductItemTax(
           {
             ...atItem,
-            total: _discountedTotal,
-            // 可能包含原有数据，或前端临时数据
+            total: _discountedTotal.add((atItem == null ? void 0 : atItem.surcharge_fee) || 0).toNumber(),
             quantity: atItem.product_quantity || atItem.num || 1
           },
           state,
@@ -208,8 +215,51 @@ var processItemsTax = (items, state, options) => {
         addTimeTotalTax = addTimeTotalTax.plus(addTimeTaxPerItem);
       }
     }
-    originTax = originTax.plus(originalTaxPerItem.times(quantity)).plus(addTimeTotalTax);
-    tax = tax.plus(discountedTaxPerItem.times(quantity)).plus(addTimeTotalTax);
+    let bundleTotalOriginTax = new import_decimal.default(0);
+    let bundleTotalTax = new import_decimal.default(0);
+    if (Array.isArray((_c = item._extend.other) == null ? void 0 : _c.bundle)) {
+      for (let bundleItem of item._extend.other.bundle) {
+        if (getBundleItemIsOriginalPrice(bundleItem)) {
+          const bundleQuantity = new import_decimal.default(bundleItem.quantity || 1);
+          const bundleUnitPrice = new import_decimal.default(
+            bundleItem.bundle_selling_price ?? bundleItem.price ?? 0
+          );
+          const bundleOriginalTaxPerItem = getProductItemTax(
+            {
+              ...bundleItem,
+              total: bundleUnitPrice.add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0).toNumber(),
+              quantity: 1
+            },
+            state,
+            { tax_rate, is_price_include_tax }
+          );
+          let bundleItemDiscount = new import_decimal.default(0);
+          if (productExpectAmount > 0) {
+            bundleItemDiscount = bundleUnitPrice.dividedBy(productExpectAmount).times(shopDiscount);
+          }
+          const bundleDiscountedUnitPrice = bundleUnitPrice.minus(bundleItemDiscount).add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0);
+          const bundleDiscountedTaxPerItem = getProductItemTax(
+            {
+              ...bundleItem,
+              total: bundleDiscountedUnitPrice.toNumber(),
+              quantity: 1
+            },
+            state,
+            { tax_rate, is_price_include_tax }
+          );
+          bundleItem.original_tax_fee = new import_decimal.default(bundleOriginalTaxPerItem).toNumber();
+          bundleItem.tax_fee = new import_decimal.default(bundleDiscountedTaxPerItem).toNumber();
+          bundleTotalOriginTax = bundleTotalOriginTax.plus(bundleOriginalTaxPerItem.times(bundleQuantity));
+          bundleTotalTax = bundleTotalTax.plus(bundleDiscountedTaxPerItem.times(bundleQuantity));
+        }
+      }
+    }
+    const original_tax_fee = originalTaxPerItem.add(bundleTotalOriginTax);
+    const tax_fee = maxDiscountedTaxPerItem.add(bundleTotalTax);
+    item._extend.original_tax_fee = original_tax_fee.toNumber();
+    item._extend.tax_fee = tax_fee.toNumber();
+    originTax = originTax.plus(original_tax_fee.times(quantity)).plus(addTimeTotalTax);
+    tax = tax.plus(tax_fee.times(quantity)).plus(addTimeTotalTax);
   }
   return { originTax, tax };
 };
@@ -270,7 +320,7 @@ var isProductMatchSurchargeCondition = (item, options) => {
   }
   const isInScheduleByDate = (_a = options.ScheduleModule) == null ? void 0 : _a.isInScheduleByDate;
   const { surchargeConfig, scheduleById = {} } = options;
-  const { startDate, other, isCustomItem } = item._extend;
+  const { startDate, product_id, isCustomItem } = item;
   const {
     open_product = 0,
     // 1 | 0
@@ -294,7 +344,6 @@ var isProductMatchSurchargeCondition = (item, options) => {
       if (isCustomItem) {
         isProductMatch = false;
       } else {
-        const product_id = other == null ? void 0 : other.product_id;
         isProductMatch = available_product_ids.includes(product_id);
       }
     }
@@ -324,8 +373,71 @@ var isProductMatchSurchargeCondition = (item, options) => {
   }
   return isProductMatch && isScheduleMatch;
 };
+var getBundleItemIsOriginalPrice = (item) => {
+  return (item == null ? void 0 : item.price_type) === "markup" && (item == null ? void 0 : item.price_type_ext) === "product_price";
+};
+var getBundleItemIsMarkupPrice = (item) => {
+  return (item == null ? void 0 : item.price_type) === "markup" && ((item == null ? void 0 : item.price_type_ext) === "" || !(item == null ? void 0 : item.price_type_ext));
+};
+var getBundleItemIsDiscountPrice = (item) => {
+  return (item == null ? void 0 : item.price_type) === "markdown" && ((item == null ? void 0 : item.price_type_ext) === "" || !(item == null ? void 0 : item.price_type_ext));
+};
+var getBundleItemIsMarkupOrDiscountPrice = (item) => {
+  return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
+};
+var getDiscountAmount = (discounts) => {
+  return (discounts || []).reduce((total, discount) => {
+    return total.add(new import_decimal.default(discount.amount || 0));
+  }, new import_decimal.default(0)).toNumber();
+};
+var getMainProductTotal = (item) => {
+  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 ((_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);
+      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
+      total = total.add(bundleItemTotal);
+    }
+  }
+  return total.toNumber();
+};
+var clearSurchargeFee = (state) => {
+  var _a, _b;
+  const { service, addons } = state;
+  if (Array.isArray(service == null ? void 0 : service.value)) {
+    for (let item of service.value) {
+      item._extend.surcharge_fee = 0;
+      item._extend.relation_surcharge_ids = [];
+      for (let bundleItem of ((_a = item._extend.other) == null ? void 0 : _a.bundle) || []) {
+        bundleItem.surcharge_fee = 0;
+        bundleItem.relation_surcharge_ids = [];
+      }
+      for (let relationDetail of item._extend.relation_details || []) {
+        relationDetail.surcharge_fee = 0;
+        relationDetail.relation_surcharge_ids = [];
+      }
+    }
+  }
+  if (Array.isArray(addons == null ? void 0 : addons.value)) {
+    for (let item of addons.value) {
+      item._extend.surcharge_fee = 0;
+      item._extend.relation_surcharge_ids = [];
+      for (let bundleItem of ((_b = item._extend.other) == null ? void 0 : _b.bundle) || []) {
+        bundleItem.surcharge_fee = 0;
+        bundleItem.relation_surcharge_ids = [];
+      }
+    }
+  }
+};
 var getSurcharge = (state, options) => {
-  var _a;
+  var _a, _b, _c, _d, _e;
   const { isEdit, ScheduleModule, surcharge_list, scheduleById } = options;
   const { bookingDetail, bookingId } = state;
   if (!isEdit && bookingId) {
@@ -350,6 +462,7 @@ var getSurcharge = (state, options) => {
     }
     return [];
   }
+  clearSurchargeFee(state);
   const { service, addons } = state;
   if (!Array.isArray(surcharge_list) || !(surcharge_list == null ? void 0 : surcharge_list.length)) return [];
   const surchargeWithAmount = [];
@@ -360,24 +473,89 @@ var getSurcharge = (state, options) => {
       fixed = "0",
       id,
       type,
-      description
+      description,
+      open_product
     } = surchargeConfig;
     const matchedItems = [];
     if (Array.isArray(service == null ? void 0 : service.value)) {
       for (let item of service.value) {
-        if (isProductMatchSurchargeCondition(item, {
-          surchargeConfig,
-          scheduleById: scheduleById || {},
-          ScheduleModule
-        })) {
+        if (isProductMatchSurchargeCondition(
+          {
+            isCustomItem: item.isCustomItem,
+            startDate: item._extend.startDate,
+            product_id: item.product_id
+          },
+          {
+            surchargeConfig,
+            scheduleById: scheduleById || {},
+            ScheduleModule
+          }
+        )) {
+          const total = getMainProductTotal(item);
+          const mainQuantity = item._extend.quantity || 1;
           matchedItems.push({
-            total: Number(item._extend.total),
-            addTimeTotal: getRelationDetailsTotal(
-              item._extend.relation_details || []
-            ),
-            quantity: item._extend.quantity || 1
+            total,
+            // addTimeTotal: getRelationDetailsTotal(
+            //   item._extend.relation_details || []
+            // ),
+            isMain: true,
+            quantity: mainQuantity,
+            item,
+            mainQuantity
+            // 主商品的mainQuantity等于自己的quantity
           });
         }
+        for (let bundleItem of ((_b = item._extend.other) == null ? void 0 : _b.bundle) || []) {
+          if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition(
+            {
+              isCustomItem: false,
+              startDate: item._extend.startDate,
+              product_id: bundleItem._bundle_product_id
+            },
+            {
+              surchargeConfig,
+              scheduleById: scheduleById || {},
+              ScheduleModule
+            }
+          )) {
+            const mainQuantity = item._extend.quantity || 1;
+            matchedItems.push({
+              isMain: false,
+              total: Number(
+                bundleItem.bundle_selling_price ?? bundleItem.price ?? 0
+              ),
+              quantity: bundleItem.num || bundleItem.quantity || 1,
+              item: bundleItem,
+              mainQuantity
+              // 子商品的mainQuantity是所属主商品的quantity
+            });
+          }
+        }
+        for (let relationDetail of item._extend.relation_details || []) {
+          if (isProductMatchSurchargeCondition(
+            {
+              isCustomItem: false,
+              startDate: item._extend.startDate,
+              product_id: relationDetail.product_id
+            },
+            {
+              surchargeConfig,
+              scheduleById: scheduleById || {},
+              ScheduleModule
+            }
+          )) {
+            matchedItems.push({
+              isMain: false,
+              total: Number(
+                (relationDetail == null ? void 0 : relationDetail.price) || ((_c = relationDetail == null ? void 0 : relationDetail.metadata) == null ? void 0 : _c.main_product_attached_bundle_selling_price)
+              ),
+              quantity: relationDetail.num || relationDetail.quantity || 1,
+              item: relationDetail,
+              mainQuantity: 1
+              // 加时商品不受主商品数量影响
+            });
+          }
+        }
       }
     }
     if (Array.isArray(addons == null ? void 0 : addons.value)) {
@@ -388,28 +566,84 @@ var getSurcharge = (state, options) => {
           ScheduleModule
         })) {
           matchedItems.push({
+            isMain: true,
             total: Number(item._extend.total),
-            quantity: item._extend.quantity || 1
+            quantity: item._extend.quantity || 1,
+            item,
+            mainQuantity: 1
+            // addons独立商品，mainQuantity为1
           });
         }
       }
     }
     let finalAmount = 0;
+    const productCount = matchedItems.reduce((total, item) => {
+      if (item.isMain) {
+        return total + (item.quantity || 1);
+      } else {
+        return total + (item.quantity || 1) * (item.mainQuantity || 1);
+      }
+    }, 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 (percentage && new import_decimal.default(percentage).gt(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 item of matchedItems) {
+        for (let [index, item] of matchedItems.entries()) {
+          const isLast = index === matchedItems.length - 1;
           const itemPrice = new import_decimal.default(Math.max(0, item.total || 0));
-          const itemQuantity = new import_decimal.default(item.quantity || 1);
+          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 itemSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
-          configTotal = configTotal.plus(itemSurcharge);
+          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;
+          fixedTotal = fixedTotal.plus(new import_decimal.default(fixedSurcharge).times(quantity).toNumber());
+          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 {
+                item.item.surcharge_rounding_remainder = remaining;
+              }
+            }
+          }
+          if (open_product !== 0) {
+            if (item.isMain) {
+              const originSurchargeFee = new import_decimal.default(item.item._extend.surcharge_fee || 0);
+              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);
+              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];
+            }
+          }
+          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 || {};
@@ -427,7 +661,10 @@ var getSurcharge = (state, options) => {
       type: "default",
       fixed,
       amount: finalAmount,
-      percentage
+      percentage,
+      metadata: {
+        open_product
+      }
     });
   }
   return surchargeWithAmount;
@@ -537,6 +774,19 @@ var getSumTotal = (state, options) => {
     state,
     options
   });
+  const { productExpectAmount: productExpectAmountWithoutDiscount } = getProductExpectAmount(
+    state,
+    options.isEdit,
+    true
+  );
+  const originExpectAmountWithoutDiscount = getExpectAmount({
+    price: productExpectAmountWithoutDiscount,
+    tax: originTax,
+    surchargeAmount,
+    shopDiscount: 0,
+    state,
+    options
+  });
   const sumTotalAmount = getSumTotalAmount({ expectAmount, roundingAmount });
   const sumTotalAmountDecimal = new import_decimal.default((0, import_utils2.formatAmount)(sumTotalAmount, 2, "") || 0);
   const orderPaidAmountDecimal = new import_decimal.default(orderPaidAmount || 0);
@@ -563,7 +813,9 @@ var getSumTotal = (state, options) => {
     totalRefundAmount,
     dueAmount,
     roundingAmount,
-    originExpectAmount
+    originExpectAmount,
+    // 订单原价 不包含整单折扣 不包含商品券折扣卡抵扣
+    originExpectAmountWithoutDiscount
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -611,6 +611,7 @@ var Footer = (props) => {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
     }
+    debugger;
     const hasUnspecifiedHolderProduct = (_d2 = state.service.value) == null ? void 0 : _d2.some((item) => {
       var _a3, _b3, _c3;
       return (!((_a3 = item._extend) == null ? void 0 : _a3.holder_id) || ((_c3 = (_b3 = item._extend) == null ? void 0 : _b3.holder_id) == null ? void 0 : _c3.length) === 0) && !(0, import_utils2.isNormalProductByDurationSchedule)(item);
@@ -1260,7 +1261,8 @@ var Footer = (props) => {
     }
   };
   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: {
@@ -1268,7 +1270,8 @@ var Footer = (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: {