@pisell/private-materials 6.8.74 → 6.8.76

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

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var amount_exports = {};
 __export(amount_exports, {
   getIsPriceIncludeTax: () => getIsPriceIncludeTax,
+  getProductDiscountProductDiscountDifference: () => getProductDiscountProductDiscountDifference,
   getRelationDetailsTotal: () => getRelationDetailsTotal,
   getSumTotal: () => getSumTotal
 });
@@ -39,6 +40,7 @@ var import_utils2 = require("@pisell/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils3 = require("../../info/service2/utils");
 var import_utils4 = require("../../info2/service/addService/utils");
+var import_utils5 = require("./utils");
 var getRelationDetailsTotal = (relation_details) => {
   let total = new import_decimal.default(0);
   for (let item of relation_details) {
@@ -48,6 +50,16 @@ var getRelationDetailsTotal = (relation_details) => {
   }
   return total.toNumber();
 };
+var getProductDiscountProductDiscountDifference = (product) => {
+  var _a, _b;
+  const mainDiscountList = product.discount_list || [];
+  const bundleDiscountList = (0, import_utils5.getBundleDiscountList)(((_b = (_a = product._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
+  const discountList = [...mainDiscountList, ...bundleDiscountList];
+  return discountList.reduce((pre, cur) => {
+    var _a2;
+    return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+  }, 0);
+};
 var getProductExpectAmount = (state, isEdit, isOriginTotal) => {
   var _a, _b, _c, _d;
   let price = new import_decimal.default(0);
@@ -64,6 +76,7 @@ var getProductExpectAmount = (state, isEdit, isOriginTotal) => {
             const itemTotal = new import_decimal.default(item._extend.total || 0);
             const itemOriginTotal = new import_decimal.default(item._extend.origin_total || 0);
             price = price.add((isOriginTotal ? itemOriginTotal : itemTotal).mul(quantity));
+            price = price.sub(getProductDiscountProductDiscountDifference(item));
             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);
@@ -79,6 +92,7 @@ var getProductExpectAmount = (state, isEdit, isOriginTotal) => {
               item._extend.relation_details || []
             ));
             price = price.add(relationTotal);
+            price = price.sub(getProductDiscountProductDiscountDifference(item));
             const itemDuration = new import_decimal.default(import_utils.flexibleObj.getValue(item._extend.duration) || 0);
             duration = duration.add(itemDuration);
             if ((0, import_utils4.isMultiDayProduct)(item)) {
@@ -150,19 +164,22 @@ var getProductItemTax = (item, state, options) => {
       }
     }
   }
-  return singleItemTax.times(quantity).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+  return singleItemTax.times(quantity);
 };
 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);
-  let tax = new import_decimal.default(0);
+  let preciseOriginTax = new import_decimal.default(0);
+  let preciseTax = new import_decimal.default(0);
+  let roundedOriginTax = new import_decimal.default(0);
+  let roundedTax = new import_decimal.default(0);
+  let lastTaxableItem = null;
   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 mainProductPrice = new import_decimal.default(getMainProductTotal(item) || 0);
-    let originalTaxPerItem = getProductItemTax(
+    let originalTaxPerItemPrecise = getProductItemTax(
       {
         ...item,
         total: mainProductPrice.add(((_a = item._extend) == null ? void 0 : _a.surcharge_fee) || 0).toNumber(),
@@ -180,7 +197,7 @@ var processItemsTax = (items, state, options) => {
       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(
+    const maxDiscountedTaxPerItemPrecise = getProductItemTax(
       {
         ...item,
         total: mainItemDiscountedUnitPrice.toNumber(),
@@ -190,8 +207,13 @@ var processItemsTax = (items, state, options) => {
       state,
       { tax_rate, is_price_include_tax }
     );
-    item._extend.main_product_attached_bundle_tax_fee = maxDiscountedTaxPerItem.toNumber();
-    let addTimeTotalTax = new import_decimal.default(0);
+    const maxDiscountedTaxPerItemRounded = maxDiscountedTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+    item._extend.main_product_attached_bundle_tax_fee = maxDiscountedTaxPerItemRounded.toNumber();
+    if (maxDiscountedTaxPerItemPrecise.gt(0)) {
+      lastTaxableItem = { type: "main", item };
+    }
+    let addTimePreciseTax = new import_decimal.default(0);
+    let addTimeRoundedTax = new import_decimal.default(0);
     if (Array.isArray(item._extend.relation_details)) {
       for (let atItem of item._extend.relation_details) {
         const _originTotal = new import_decimal.default(
@@ -203,7 +225,7 @@ var processItemsTax = (items, state, options) => {
             _originTotal.dividedBy(productExpectAmount).times(shopDiscount)
           );
         }
-        const addTimeTaxPerItem = getProductItemTax(
+        const addTimeTaxPerItemPrecise = getProductItemTax(
           {
             ...atItem,
             total: _discountedTotal.add((atItem == null ? void 0 : atItem.surcharge_fee) || 0).toNumber(),
@@ -212,11 +234,19 @@ var processItemsTax = (items, state, options) => {
           state,
           { tax_rate, is_price_include_tax }
         );
-        addTimeTotalTax = addTimeTotalTax.plus(addTimeTaxPerItem);
+        const addTimeTaxPerItemRounded = addTimeTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+        atItem.tax_fee = addTimeTaxPerItemRounded.toNumber();
+        addTimePreciseTax = addTimePreciseTax.plus(addTimeTaxPerItemPrecise);
+        addTimeRoundedTax = addTimeRoundedTax.plus(addTimeTaxPerItemRounded);
+        if (addTimeTaxPerItemPrecise.gt(0)) {
+          lastTaxableItem = { type: "addTime", item: atItem };
+        }
       }
     }
-    let bundleTotalOriginTax = new import_decimal.default(0);
-    let bundleTotalTax = new import_decimal.default(0);
+    let bundlePreciseOriginTax = new import_decimal.default(0);
+    let bundlePreciseTax = new import_decimal.default(0);
+    let bundleRoundedOriginTax = new import_decimal.default(0);
+    let bundleRoundedTax = 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)) {
@@ -224,7 +254,7 @@ var processItemsTax = (items, state, options) => {
           const bundleUnitPrice = new import_decimal.default(
             bundleItem.bundle_selling_price ?? bundleItem.price ?? 0
           );
-          const bundleOriginalTaxPerItem = getProductItemTax(
+          const bundleOriginalTaxPerItemPrecise = getProductItemTax(
             {
               ...bundleItem,
               total: bundleUnitPrice.add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0).toNumber(),
@@ -238,7 +268,7 @@ var processItemsTax = (items, state, options) => {
             bundleItemDiscount = bundleUnitPrice.dividedBy(productExpectAmount).times(shopDiscount);
           }
           const bundleDiscountedUnitPrice = bundleUnitPrice.minus(bundleItemDiscount).add((bundleItem == null ? void 0 : bundleItem.surcharge_fee) || 0);
-          const bundleDiscountedTaxPerItem = getProductItemTax(
+          const bundleDiscountedTaxPerItemPrecise = getProductItemTax(
             {
               ...bundleItem,
               total: bundleDiscountedUnitPrice.toNumber(),
@@ -247,21 +277,86 @@ var processItemsTax = (items, state, options) => {
             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 bundleOriginalTaxPerItemRounded = bundleOriginalTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+          const bundleDiscountedTaxPerItemRounded = bundleDiscountedTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+          bundleItem.original_tax_fee = bundleOriginalTaxPerItemRounded.toNumber();
+          bundleItem.tax_fee = bundleDiscountedTaxPerItemRounded.toNumber();
+          bundlePreciseOriginTax = bundlePreciseOriginTax.plus(bundleOriginalTaxPerItemPrecise.times(bundleQuantity));
+          bundlePreciseTax = bundlePreciseTax.plus(bundleDiscountedTaxPerItemPrecise.times(bundleQuantity));
+          bundleRoundedOriginTax = bundleRoundedOriginTax.plus(bundleOriginalTaxPerItemRounded.times(bundleQuantity));
+          bundleRoundedTax = bundleRoundedTax.plus(bundleDiscountedTaxPerItemRounded.times(bundleQuantity));
+          if (bundleDiscountedTaxPerItemPrecise.gt(0)) {
+            lastTaxableItem = { type: "bundle", item: bundleItem };
+          }
         }
       }
     }
-    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);
+    const originalTaxFeePrecise = originalTaxPerItemPrecise.plus(bundlePreciseOriginTax);
+    const taxFeePrecise = maxDiscountedTaxPerItemPrecise.plus(bundlePreciseTax);
+    const originalTaxFeeRounded = originalTaxPerItemPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).plus(bundleRoundedOriginTax);
+    const taxFeeRounded = maxDiscountedTaxPerItemRounded.plus(bundleRoundedTax);
+    item._extend.original_tax_fee = originalTaxFeeRounded.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+    item._extend.tax_fee = taxFeeRounded.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+    preciseOriginTax = preciseOriginTax.plus(originalTaxFeePrecise.times(quantity)).plus(addTimePreciseTax);
+    preciseTax = preciseTax.plus(taxFeePrecise.times(quantity)).plus(addTimePreciseTax);
+    roundedOriginTax = roundedOriginTax.plus(originalTaxFeeRounded.times(quantity)).plus(addTimeRoundedTax);
+    roundedTax = roundedTax.plus(taxFeeRounded.times(quantity)).plus(addTimeRoundedTax);
+  }
+  const expectedOriginTax = preciseOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+  const expectedTax = preciseTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+  const originTaxRemainder = expectedOriginTax.minus(roundedOriginTax).toNumber();
+  const taxRemainder = expectedTax.minus(roundedTax).toNumber();
+  if (lastTaxableItem) {
+    if (originTaxRemainder !== 0) {
+      if (lastTaxableItem.type === "main") {
+        lastTaxableItem.item._extend.original_tax_fee_rounding_remainder = originTaxRemainder;
+      } else {
+        lastTaxableItem.item.original_tax_fee_rounding_remainder = originTaxRemainder;
+      }
+    }
+    if (taxRemainder !== 0) {
+      if (lastTaxableItem.type === "main") {
+        lastTaxableItem.item._extend.tax_fee_rounding_remainder = taxRemainder;
+      } else {
+        lastTaxableItem.item.tax_fee_rounding_remainder = taxRemainder;
+      }
+    }
+  }
+  return { originTax: expectedOriginTax, tax: expectedTax };
+};
+var clearTaxFee = (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.tax_fee = 0;
+      item._extend.original_tax_fee = 0;
+      item._extend.tax_fee_rounding_remainder = void 0;
+      item._extend.main_product_attached_bundle_tax_fee = 0;
+      for (let bundleItem of ((_a = item._extend.other) == null ? void 0 : _a.bundle) || []) {
+        bundleItem.tax_fee = 0;
+        bundleItem.original_tax_fee = 0;
+        bundleItem.tax_fee_rounding_remainder = void 0;
+      }
+      for (let relationDetail of item._extend.relation_details || []) {
+        relationDetail.tax_fee = 0;
+        relationDetail.tax_fee_rounding_remainder = void 0;
+      }
+    }
+  }
+  if (Array.isArray(addons == null ? void 0 : addons.value)) {
+    for (let item of addons.value) {
+      item._extend.tax_fee = 0;
+      item._extend.original_tax_fee = 0;
+      item._extend.tax_fee_rounding_remainder = void 0;
+      item._extend.main_product_attached_bundle_tax_fee = 0;
+      for (let bundleItem of ((_b = item._extend.other) == null ? void 0 : _b.bundle) || []) {
+        bundleItem.tax_fee = 0;
+        bundleItem.original_tax_fee = 0;
+        bundleItem.tax_fee_rounding_remainder = void 0;
+      }
+    }
   }
-  return { originTax, tax };
 };
 var getTax = (state, options) => {
   var _a, _b, _c;
@@ -269,6 +364,7 @@ var getTax = (state, options) => {
   if (!isEdit) {
     return { tax: Number((_a = state.bookingDetail) == null ? void 0 : _a.tax_fee) || 0 };
   }
+  clearTaxFee(state);
   let totalOriginTax = new import_decimal.default(0);
   let totalTax = new import_decimal.default(0);
   if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
@@ -821,6 +917,7 @@ var getSumTotal = (state, options) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getIsPriceIncludeTax,
+  getProductDiscountProductDiscountDifference,
   getRelationDetailsTotal,
   getSumTotal
 });

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 /**
  * @title: 底部
@@ -7,5 +8,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Footer: (props: any) => JSX.Element;
+declare const Footer: (props: any) => React.JSX.Element;
 export default Footer;

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

@@ -114,6 +114,10 @@ var formatProductBundle = (bundle) => {
     const option_price = option.reduce((temp, item) => {
       return temp + Number(item.num) * item.custom_add_price;
     }, 0);
+    const product_discount_difference = ((d == null ? void 0 : d.discount_list) || []).reduce((pre, cur) => {
+      var _a;
+      return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+    }, 0);
     return {
       "is_charge_tax": d.is_charge_tax,
       "tax_fee": d.tax_fee,
@@ -138,7 +142,10 @@ var formatProductBundle = (bundle) => {
         "surcharge_fee": d.surcharge_fee,
         // 可选，附加费均摊舍入金额
         "surcharge_rounding_remainder": d.surcharge_rounding_remainder,
-        relation_surcharge_ids: d.relation_surcharge_ids || []
+        // 可选，税费均摊舍入金额（折后税费）
+        "tax_fee_rounding_remainder": d.tax_fee_rounding_remainder,
+        relation_surcharge_ids: d.relation_surcharge_ids || [],
+        product_discount_difference
       }
     };
   });
@@ -175,7 +182,12 @@ var formatRelationDetails = (list) => {
       price: item.original_price || 0,
       product_id: item.product_id,
       is_charge_tax: item.is_charge_tax,
-      order_detail_id: item.order_detail_id
+      order_detail_id: item.order_detail_id,
+      tax_fee: item.tax_fee,
+      metadata: {
+        // 可选，税费均摊舍入金额（折后税费）
+        tax_fee_rounding_remainder: item.tax_fee_rounding_remainder
+      }
     };
   });
 };
@@ -272,7 +284,7 @@ var formatSellingPrice = (item) => {
   return Number((_a = item._extend) == null ? void 0 : _a.total);
 };
 var formatMetaData = (item, isMultiDayPrices) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
     metadata.capacity = item._extend.capacity;
@@ -280,19 +292,26 @@ var formatMetaData = (item, isMultiDayPrices) => {
   if (item._extend.groupId) {
     metadata.groupId = item._extend.groupId;
   }
-  if ((_b = item._extend) == null ? void 0 : _b.holder_id) {
-    metadata.holder_id = (_c = item._extend) == null ? void 0 : _c.holder_id;
+  metadata.holder_id = ((_b = item._extend) == null ? void 0 : _b.holder_id) ?? null;
+  if (isMultiDayPrices && ((_c = item._extend) == null ? void 0 : _c.multiDayPrices)) {
+    metadata.multiDayPrices = (_d = item._extend) == null ? void 0 : _d.multiDayPrices;
   }
-  if (isMultiDayPrices && ((_d = item._extend) == null ? void 0 : _d.multiDayPrices)) {
-    metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
+  if ((_e = item._extend) == null ? void 0 : _e.unique_identification_number) {
+    metadata.unique_identification_number = (_f = item._extend) == null ? void 0 : _f.unique_identification_number;
   }
-  if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
-    metadata.unique_identification_number = (_g = item._extend) == null ? void 0 : _g.unique_identification_number;
+  if (item.discount_list && (0, import_utils5.isArr)(item.discount_list)) {
+    metadata.product_discount_difference = item.discount_list.filter((item2) => {
+      var _a2;
+      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+    }).reduce((pre, cur) => {
+      var _a2;
+      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+    }, 0);
   }
   return metadata;
 };
 var formatProductMetadata = (item) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
   let metadata = {};
   if (((_a = item._extend) == null ? void 0 : _a.surcharge_fee) || ((_b = item.metadata) == null ? void 0 : _b.main_product_attached_bundle_surcharge_fee)) {
     metadata.main_product_attached_bundle_surcharge_fee = ((_c = item._extend) == null ? void 0 : _c.surcharge_fee) || ((_d = item.metadata) == null ? void 0 : _d.main_product_attached_bundle_surcharge_fee);
@@ -303,11 +322,23 @@ var formatProductMetadata = (item) => {
   if (((_i = item._extend) == null ? void 0 : _i.surcharge_rounding_remainder) || ((_j = item.metadata) == null ? void 0 : _j.surcharge_rounding_remainder)) {
     metadata.surcharge_rounding_remainder = ((_k = item._extend) == null ? void 0 : _k.surcharge_rounding_remainder) || ((_l = item.metadata) == null ? void 0 : _l.surcharge_rounding_remainder);
   }
-  if (((_m = item._extend) == null ? void 0 : _m.relation_surcharge_ids) || ((_n = item.metadata) == null ? void 0 : _n.relation_surcharge_ids)) {
-    metadata.relation_surcharge_ids = ((_o = item._extend) == null ? void 0 : _o.relation_surcharge_ids) || ((_p = item.metadata) == null ? void 0 : _p.relation_surcharge_ids);
+  if ((_m = item._extend) == null ? void 0 : _m.tax_fee_rounding_remainder) {
+    metadata.tax_fee_rounding_remainder = (_n = item._extend) == null ? void 0 : _n.tax_fee_rounding_remainder;
+  }
+  if (((_o = item._extend) == null ? void 0 : _o.relation_surcharge_ids) || ((_p = item.metadata) == null ? void 0 : _p.relation_surcharge_ids)) {
+    metadata.relation_surcharge_ids = ((_q = item._extend) == null ? void 0 : _q.relation_surcharge_ids) || ((_r = item.metadata) == null ? void 0 : _r.relation_surcharge_ids);
+  }
+  if (((_s = item._extend) == null ? void 0 : _s.unique_identification_number) || ((_t = item.metadata) == null ? void 0 : _t.unique_identification_number)) {
+    metadata.unique_identification_number = ((_u = item._extend) == null ? void 0 : _u.unique_identification_number) || ((_v = item.metadata) == null ? void 0 : _v.unique_identification_number);
   }
-  if (((_q = item._extend) == null ? void 0 : _q.unique_identification_number) || ((_r = item.metadata) == null ? void 0 : _r.unique_identification_number)) {
-    metadata.unique_identification_number = ((_s = item._extend) == null ? void 0 : _s.unique_identification_number) || ((_t = item.metadata) == null ? void 0 : _t.unique_identification_number);
+  if (item.discount_list && (0, import_utils5.isArr)(item.discount_list)) {
+    metadata.product_discount_difference = item.discount_list.filter((item2) => {
+      var _a2;
+      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+    }).reduce((pre, cur) => {
+      var _a2;
+      return pre + (((_a2 = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a2.product_discount_difference) || 0);
+    }, 0);
   }
   return metadata;
 };

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

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

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

@@ -6,5 +6,5 @@ interface MenuButtonProps {
     menuWrapStyle?: React.CSSProperties;
     dropdownProps?: DropdownProps;
 }
-declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => JSX.Element;
+declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => React.JSX.Element;
 export default MenuButton;

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

@@ -1,8 +1,9 @@
+import React from 'react';
 import './index.less';
 interface IProps {
     modal: any;
     onReload: () => Promise<any>;
     onCancel: () => void;
 }
-declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => JSX.Element;
+declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => React.JSX.Element;
 export default ReloadResourceModal;

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

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

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

@@ -14,5 +14,5 @@ declare type ClientItemProps = {
     className?: string;
     walkInName?: string;
 };
-declare const ClientItem: (props: ClientItemProps) => JSX.Element;
+declare const ClientItem: (props: ClientItemProps) => React.JSX.Element;
 export default ClientItem;

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

@@ -21,5 +21,5 @@ declare type DepositItemProps = {
     isBookingCancelled: boolean;
     hideOrderDetail?: boolean;
 };
-declare const DepositItem: (props: DepositItemProps) => JSX.Element;
+declare const DepositItem: (props: DepositItemProps) => React.JSX.Element;
 export default DepositItem;

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

@@ -1,2 +1,3 @@
-declare const Deposit: (props: any) => JSX.Element;
+import React from 'react';
+declare const Deposit: (props: any) => React.JSX.Element;
 export default Deposit;

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

@@ -1,6 +1,7 @@
+import React from 'react';
 interface FooterProps {
     state: any;
     reload: () => void;
 }
-declare const Footer: ({ state, reload }: FooterProps) => JSX.Element | null;
+declare const Footer: ({ state, reload }: FooterProps) => React.JSX.Element | null;
 export default Footer;

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

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

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

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 /**
  * @title: 表单选择器
@@ -6,5 +7,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:06
  */
-declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => JSX.Element;
+declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => React.JSX.Element;
 export default Single;

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

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

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

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

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

@@ -1,5 +1,6 @@
+import React from 'react';
 export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
-    dom: JSX.Element;
+    dom: React.JSX.Element;
 };
 export default useQuotation;

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

@@ -54,6 +54,12 @@ var formatBundleItemMap = (product) => {
     };
   }, {});
 };
+var formatVariantItemMap = (product) => {
+  return ((product == null ? void 0 : product.variants) || []).reduce((pre, cur) => {
+    pre[cur.id] = cur;
+    return pre;
+  }, {});
+};
 var calculateTotalPrice = (data) => {
   const _price = data.reduce((total, item) => {
     const _price2 = (item == null ? void 0 : item.price) || (item == null ? void 0 : item.add_price);
@@ -74,7 +80,7 @@ var setNewCartValue = (cartValue, newProducts) => {
   const notFoundProducts = [];
   const multiDayPricesCache = /* @__PURE__ */ new Map();
   const value = cartValue.map((item) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     const itemScheduleDate = ((_a = item._extend) == null ? void 0 : _a.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : "";
     const newProduct = newProducts.find(
       (newItem2) => newItem2.id === item.product_id && newItem2.schedule_date === itemScheduleDate
@@ -84,6 +90,7 @@ var setNewCartValue = (cartValue, newProducts) => {
     }
     let isChangePrice = newProduct.price != item.price;
     const bundleItemMap = formatBundleItemMap(newProduct);
+    const variantItemMap = formatVariantItemMap(newProduct);
     const newBundle = (((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle) || []).map((bundle) => {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
@@ -109,7 +116,17 @@ var setNewCartValue = (cartValue, newProducts) => {
         // product_price: bundleItemMap[item.id].product_price,
       };
     });
-    if ((_d = item._extend) == null ? void 0 : _d.groupId) {
+    const newVariant = (((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.variant) || []).map((variant) => {
+      if (!variantItemMap[variant.id]) {
+        return variant;
+      }
+      return {
+        ...variant,
+        price: variantItemMap[variant.id].price,
+        base_price: variantItemMap[variant.id].base_price
+      };
+    });
+    if ((_f = item._extend) == null ? void 0 : _f.groupId) {
       if (!multiDayPricesCache.has(item._extend.groupId)) {
         const productPrices = newProducts.filter((p) => p.id === item.product_id);
         const multiDayPrices = {};
@@ -132,10 +149,14 @@ var setNewCartValue = (cartValue, newProducts) => {
     } else {
       isChange = true;
     }
+    let price = newProduct.price;
+    if ((_h = (_g = item._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.product_variant_id) {
+      price = ((_k = variantItemMap[(_j = (_i = item._extend) == null ? void 0 : _i.other) == null ? void 0 : _j.product_variant_id]) == null ? void 0 : _k.price) ?? newProduct.price;
+    }
     const newItem = {
       ...item,
       original_price: newProduct.original_price,
-      price: newProduct.price,
+      price,
       base_price: newProduct.base_price,
       _extend: {
         ...item._extend,
@@ -144,8 +165,9 @@ var setNewCartValue = (cartValue, newProducts) => {
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: {
           ...item._extend.other,
-          option: (_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option,
-          bundle: newBundle
+          option: (_m = (_l = item._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.option,
+          bundle: newBundle,
+          variant: newVariant || []
         }
       }
     };

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

@@ -1,6 +1,7 @@
+import React from 'react';
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
 export default AddServiceVariant;

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;