@pisell/private-materials 6.4.82 → 6.4.83

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/es/components/appointmentBooking/components/Cart/index.d.ts

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

package/es/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/es/components/appointmentBooking/components/Footer/index.d.ts

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

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

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

@@ -35,7 +35,7 @@ import ProductItem from "../components/TabProduct/selectProductItem";
 import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
-import { formatOriginalPrice, formatProductBundle, formatProductOption, formatProductPrice, formatSellingPrice, getBundleDiscountList, getSourceProductPrice, getMainProductSellingPrice } from "../components/footer/utils";
+import { formatOriginalPrice, formatProductBundle, formatProductOption, formatProductPrice, formatSellingPrice, getBundleDiscountList, getMainProductSellingPrice, getSourceProductPrice } from "../components/footer/utils";
 import { formatProductListByCategory, getIsEject, getIsOnlySession, getMainPrice, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";

package/es/components/booking/addons/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/es/components/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/es/components/booking/components/collapsibleList/utils.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/es/components/booking/components/emptyBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/es/components/booking/components/footer/FooterMenus/index.d.ts

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

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

@@ -605,8 +605,16 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref3, _ref4, _item$_extend$main_pr, _item$_extend3, _item$metadata, _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
-  var total = new Decimal((_ref3 = (_ref4 = (_item$_extend$main_pr = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.main_product_selling_price) !== null && _item$_extend$main_pr !== void 0 ? _item$_extend$main_pr : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item._extend.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+  var _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
+  var total = new Decimal(item._extend.main_product_selling_price || item._extend.price || 0);
+
+  // 如果主商品没有main_product_selling_price 则通过discount_list计算
+  if (!item._extend.main_product_selling_price) {
+    // 主商品折扣金额
+    var discountAmount = getDiscountAmount(item.discount_list);
+    // 主商品总价 - 主商品折扣金额
+    total = total.minus(discountAmount);
+  }
 
   // 单规格 
   if ((_item$_extend$other2 = item._extend.other) !== null && _item$_extend$other2 !== void 0 && _item$_extend$other2.option && Array.isArray((_item$_extend$other3 = item._extend.other) === null || _item$_extend$other3 === void 0 ? void 0 : _item$_extend$other3.option)) {
@@ -621,13 +629,13 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var bundleItem = _step8.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref5, _bundleItem$bundle_se2;
+        var _ref3, _bundleItem$bundle_se2;
         // 子商品折扣金额
-        var discountAmount = getDiscountAmount(bundleItem.discount_list);
+        var _discountAmount = getDiscountAmount(bundleItem.discount_list);
         // 子商品价格
-        var bundleItemPrice = new Decimal((_ref5 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+        var bundleItemPrice = new Decimal((_ref3 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
         // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
+        var bundleItemTotal = bundleItemPrice.minus(_discountAmount);
         total = total.add(bundleItemTotal);
       }
     }
@@ -829,11 +837,11 @@ var getSurcharge = function getSurcharge(state, options) {
                 scheduleById: scheduleById || {},
                 ScheduleModule: ScheduleModule
               })) {
-                var _ref6, _bundleItem$bundle_se3;
+                var _ref4, _bundleItem$bundle_se3;
                 var _mainQuantity = item._extend.quantity || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref6 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref6 !== void 0 ? _ref6 : 0),
+                  total: Number((_ref4 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -928,17 +936,10 @@ var getSurcharge = function getSurcharge(state, options) {
 
     // 追加进入的固定附加费总值
     var fixedTotal = new Decimal(0);
-    // 追加到商品的附加费总值 用于追加抹平字段
-    var productTotalSurcharge = new Decimal(0);
     if (matchedItems.length > 0) {
       // 基于每个商品计算附加费：max(0, 商品价格) * rate + fixed
       var configTotal = new Decimal(0);
 
-      // 计算固定附加费 - 只加一次
-      if (fixed && new Decimal(fixed).gt(0)) {
-        configTotal = configTotal.plus(fixed);
-      }
-
       // 计算百分比附加费 - 对每个商品单独计算
       if (percentage && new Decimal(percentage).gt(0) || fixed) {
         var percentageRate = new Decimal(percentage);
@@ -956,7 +957,6 @@ var getSurcharge = function getSurcharge(state, options) {
             var addTimeTotal = new Decimal(_item4.addTimeTotal || 0);
             // 单个商品总附加费
             var itemTotalSurcharge = itemPrice.times(itemQuantity).plus(addTimeTotal).times(percentageRate);
-            configTotal = configTotal.plus(itemTotalSurcharge);
 
             // 单个商品单数量附加费
             var itemSurcharge = itemPrice.times(percentageRate);
@@ -965,12 +965,10 @@ var getSurcharge = function getSurcharge(state, options) {
             var fixedSurcharge = new Decimal(1).div(productCount).times(fixed).times(100).floor().div(100).toFixed(2);
             var quantity = _item4.isMain ? _item4.quantity : _item4.quantity * _item4.mainQuantity;
             fixedTotal = fixedTotal.plus(new Decimal(fixedSurcharge).times(quantity).toNumber());
-
             // 如果是最后一个商品 判断fixed - fixedTotal 是否有剩余小数 如果有的话，追加抹平字段
             if (isLast && fixedTotal.gt(0)) {
               var remaining = new Decimal(fixed).minus(fixedTotal).toNumber();
               if (remaining > 0) {
-                productTotalSurcharge = productTotalSurcharge.plus(remaining);
                 if (_item4.isMain) {
                   _item4.item._extend.surcharge_rounding_remainder = remaining;
                 } else {
@@ -985,34 +983,17 @@ var getSurcharge = function getSurcharge(state, options) {
                 var _item4$item$_extend;
                 var originSurchargeFee = new Decimal(_item4.item._extend.surcharge_fee || 0);
                 // 保留两位小数
-                var surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
-                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(surchargeFee).times(itemQuantity).toNumber());
-                _item4.item._extend.surcharge_fee = surchargeFee;
+                _item4.item._extend.surcharge_fee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
                 _item4.item._extend.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item$_extend = _item4.item._extend) === null || _item4$item$_extend === void 0 ? void 0 : _item4$item$_extend.relation_surcharge_ids) || []), [id]);
               } else {
                 var _item4$item;
                 var _originSurchargeFee = new Decimal(_item4.item.surcharge_fee || 0);
                 // 保留两位小数
-                var _surchargeFee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
-                productTotalSurcharge = productTotalSurcharge.plus(new Decimal(_surchargeFee).times(itemQuantity).toNumber());
-                _item4.item.surcharge_fee = _surchargeFee;
+                _item4.item.surcharge_fee = _originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toNumber();
                 _item4.item.relation_surcharge_ids = [].concat(_toConsumableArray(((_item4$item = _item4.item) === null || _item4$item === void 0 ? void 0 : _item4$item.relation_surcharge_ids) || []), [id]);
               }
             }
-            // 最后一个商品 判断configTotal - productTotalSurcharge 是否有剩余小数 如果有的话，追加抹平字段
-            if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {
-              // 四舍五入configTotal
-              var configTotalRounded = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-              if (_item4.isMain) {
-                var newRoundingRemainder = new Decimal(_item4.item._extend.surcharge_rounding_remainder || 0);
-                newRoundingRemainder = newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
-                _item4.item._extend.surcharge_rounding_remainder = newRoundingRemainder.toNumber();
-              } else {
-                var _newRoundingRemainder = new Decimal(_item4.item.surcharge_rounding_remainder || 0);
-                _newRoundingRemainder = _newRoundingRemainder.plus(configTotalRounded.minus(productTotalSurcharge));
-                _item4.item.surcharge_rounding_remainder = _newRoundingRemainder.toNumber();
-              }
-            }
+            configTotal = configTotal.plus(itemTotalSurcharge);
           }
         } catch (err) {
           _iterator18.e(err);
@@ -1021,6 +1002,11 @@ var getSurcharge = function getSurcharge(state, options) {
         }
       }
 
+      // 计算固定附加费 - 只加一次
+      if (fixed && new Decimal(fixed).gt(0)) {
+        configTotal = configTotal.plus(fixed);
+      }
+
       // 如果该配置有金额，则添加到结果中
       finalAmount = configTotal.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
     }
@@ -1113,13 +1099,13 @@ export var getIsPriceIncludeTax = function getIsPriceIncludeTax(state) {
   var _state$bookingDetail$, _state$bookingDetail6;
   return (_state$bookingDetail$ = (_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.is_price_include_tax) !== null && _state$bookingDetail$ !== void 0 ? _state$bookingDetail$ : 0;
 };
-var getExpectAmount = function getExpectAmount(_ref7) {
-  var price = _ref7.price,
-    tax = _ref7.tax,
-    surchargeAmount = _ref7.surchargeAmount,
-    shopDiscount = _ref7.shopDiscount,
-    state = _ref7.state,
-    options = _ref7.options;
+var getExpectAmount = function getExpectAmount(_ref5) {
+  var price = _ref5.price,
+    tax = _ref5.tax,
+    surchargeAmount = _ref5.surchargeAmount,
+    shopDiscount = _ref5.shopDiscount,
+    state = _ref5.state,
+    options = _ref5.options;
   var _tax = tax;
   // 如果价格含税, 则将税费改为0
   if (getIsPriceIncludeTax(state) || options !== null && options !== void 0 && options.is_price_include_tax) {
@@ -1141,9 +1127,9 @@ var getRoundingAmount = function getRoundingAmount(state) {
   var _state$bookingDetail9;
   return Number(state === null || state === void 0 || (_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.rounding_amount) || 0;
 };
-var getSumTotalAmount = function getSumTotalAmount(_ref8) {
-  var expectAmount = _ref8.expectAmount,
-    roundingAmount = _ref8.roundingAmount;
+var getSumTotalAmount = function getSumTotalAmount(_ref6) {
+  var expectAmount = _ref6.expectAmount,
+    roundingAmount = _ref6.roundingAmount;
   return expectAmount + roundingAmount;
 };
 

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

@@ -57,7 +57,7 @@ import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/use
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$addons4, _state$notes4;
+  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$addons4, _state$notes4, _state$bookingConfig7, _state$client3;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -1941,8 +1941,20 @@ var Footer = function Footer(props) {
     data: paymentModalData,
     callback: paymentCallback || undefined,
     setEditCartMode: setEditCartMode,
-    state: state,
-    dispatch: dispatch,
+    paymentResultDisplayMode: state === null || state === void 0 || (_state$bookingConfig7 = state.bookingConfig) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.config) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.payment_setting) === null || _state$bookingConfig7 === void 0 ? void 0 : _state$bookingConfig7.payment_result_display_mode,
+    shopDiscount: state.shop_discount,
+    client: (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : _state$client3.value,
+    currentTotalPrice: total.productAmount,
+    onChangeShopDiscount: function onChangeShopDiscount(discount) {
+      dispatch({
+        type: 'setState',
+        payload: {
+          shop_discount: discount
+        }
+      });
+    },
+    onChangeOrderNote: handleNoteConfirm,
+    onDeleteOrderNote: handleNoteDelete,
     onClose: function onClose(reset) {
       // console.log('🔄 Footer: Closing PaymentModal');
       setIsPaymentModalOpen(false);

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

@@ -17,7 +17,7 @@ import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
-import { isArr, locales, sendWarningLog, getUniqueId, isNumber, isString } from '@pisell/utils';
+import { isArr, locales, sendWarningLog, getUniqueId, isNumber } from '@pisell/utils';
 import { PisellToast } from '@pisell/materials';
 import { getClientName } from "../../../../plus/clientName/utils";
 import { cloneDeep } from 'lodash';
@@ -127,8 +127,8 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "custom_price": (d === null || d === void 0 ? void 0 : d.custom_price) || Math.abs(new Decimal((d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
       "custom_price_type": d === null || d === void 0 ? void 0 : d.price_type,
       "option": option,
-      "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
-      // "bundle_sum_price": d?.original_price || d?.original_total,
+      "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
+      "bundle_sum_price": (d === null || d === void 0 ? void 0 : d.original_price) || (d === null || d === void 0 ? void 0 : d.original_total),
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -152,6 +152,11 @@ export var getBundleDiscountList = function getBundleDiscountList(bundle) {
   var discountList = [];
   bundle.forEach(function (d) {
     if (d.discount_list && isArr(d.discount_list)) {
+      d.discount_list.forEach(function (item) {
+        if (item !== null && item !== void 0 && item.id) {
+          item.order_discount_id = item.id;
+        }
+      });
       discountList.push.apply(discountList, _toConsumableArray(d.discount_list.filter(function (item) {
         return !item.id;
       })));
@@ -274,9 +279,9 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend6, _item$price, _item$_extend7, _item$variant;
+  var _item$_extend6, _item$_extend7, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
-  var price = Number((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
+  var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant = item.variant) === null || _item$variant === void 0 ? void 0 : _item$variant.length) > 0) {
@@ -341,7 +346,7 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
   return metadata;
 };
 var formatProductMetadata = function formatProductMetadata(item) {
-  var _item$_extend17, _item$_extend19, _item$_extend21, _item$_extend23;
+  var _item$_extend17, _item$_extend19, _item$_extend21, _item$_extend23, _item$_extend25;
   var metadata = {};
 
   // 主商品+非原价(加减价)子商品附加费
@@ -367,6 +372,10 @@ var formatProductMetadata = function formatProductMetadata(item) {
     var _item$_extend24;
     metadata.relation_surcharge_ids = (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.relation_surcharge_ids;
   }
+  if ((_item$_extend25 = item._extend) !== null && _item$_extend25 !== void 0 && _item$_extend25.unique_identification_number) {
+    var _item$_extend26;
+    metadata.unique_identification_number = (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.unique_identification_number;
+  }
   return metadata;
 };
 
@@ -386,9 +395,9 @@ var formatProductMetadata = function formatProductMetadata(item) {
 
 // 获取商品价格 包含组合规格
 export var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend25, _item$_extend26, _item$variant2;
-  var other = (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.other;
-  var price = Number((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.price);
+  var _item$_extend27, _item$_extend28, _item$variant2;
+  var other = (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.other;
+  var price = Number((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
@@ -404,8 +413,8 @@ export var getSourceProductPrice = function getSourceProductPrice(item) {
 
 // 获取主商品价格 要增加option
 export var getMainProductSellingPrice = function getMainProductSellingPrice(item) {
-  var _item$_extend27, _item$_extend28, _item$_extend$other, _item$_extend$other2, _item$_extend29;
-  if (!isNumber((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.main_product_selling_price) && !isString((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.main_product_selling_price)) {
+  var _item$_extend29, _item$_extend$other, _item$_extend$other2, _item$_extend30;
+  if (!isNumber((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.main_product_selling_price)) {
     return undefined;
   }
   var optionPrice = new Decimal(0);
@@ -418,7 +427,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
       return accumulator.add(currentPrice.mul(currentNum));
     }, optionPrice);
   }
-  return new Decimal((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.main_product_selling_price).add(optionPrice).toNumber();
+  return new Decimal((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.main_product_selling_price).add(optionPrice).toNumber();
 };
 
 /**
@@ -430,11 +439,18 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend30, _getMainProductSellin, _item$_extend31, _item$_extend32, _item$_extend33, _item$_extend34;
+  var _item$_extend31, _getMainProductSellin, _item$_extend32, _item$_extend33, _item$_extend34, _item$_extend35;
+  if (item !== null && item !== void 0 && item.discount_list) {
+    item === null || item === void 0 || item.discount_list.forEach(function (d) {
+      if (d !== null && d !== void 0 && d.id) {
+        d.order_discount_id = d.id;
+      }
+    });
+  }
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
-  var bundleDiscountList = getBundleDiscountList(((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 || (_item$_extend30 = _item$_extend30.other) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.bundle) || []);
+  var bundleDiscountList = getBundleDiscountList(((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 || (_item$_extend31 = _item$_extend31.other) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.bundle) || []);
   var discount_list = _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []);
   discount_list.push.apply(discount_list, _toConsumableArray(bundleDiscountList));
 
@@ -463,15 +479,15 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
     "is_charge_tax": item.is_charge_tax,
-    "note": ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.note) || '',
+    "note": ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.note) || '',
     "discountway": item._extend.discountway || "num",
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.other) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.bundle),
+    "product_bundle": formatProductBundle((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 || (_item$_extend33 = _item$_extend33.other) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
-    "product_option_item": formatProductOption((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 || (_item$_extend33 = _item$_extend33.other) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.option),
-    "product_variant_id": ((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.option),
+    "product_variant_id": ((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.other) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatProductMetadata(item),
     // checkout 需求新增字段
@@ -496,8 +512,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend35;
-    var holderId = (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.holder_id;
+    var _item$_extend36;
+    var holderId = (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -523,15 +539,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend36;
-      return ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend37;
+      return ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend37;
-      var key = (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.holder_id; // 分组键
+      var _item$_extend38;
+      var key = (_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -593,7 +609,7 @@ var formatBookings = function formatBookings(data, values) {
   var bookings = [];
   var obj = {};
   list.forEach(function (item) {
-    var _item$_extend42, _item$_extend43;
+    var _item$_extend43, _item$_extend44;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -614,9 +630,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend38, _item$_extend39, _item$_extend40, _item$_extend41;
-      var startDate = ((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.startDate) || ((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.start_date);
-      var endDate = ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.endDate) || ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.end_date);
+      var _item$_extend39, _item$_extend40, _item$_extend41, _item$_extend42;
+      var startDate = ((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.startDate) || ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.start_date);
+      var endDate = ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.endDate) || ((_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -642,12 +658,14 @@ var formatBookings = function formatBookings(data, values) {
     // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
     // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
     // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
-    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.groupId];
-    if (!((_item$_extend43 = item._extend) !== null && _item$_extend43 !== void 0 && _item$_extend43.unique_identification_number)) {
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.groupId];
+    if (!((_item$_extend44 = item._extend) !== null && _item$_extend44 !== void 0 && _item$_extend44.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
+    debugger;
     var booking = _objectSpread(_objectSpread({
+      schedule_event_id: item === null || item === void 0 ? void 0 : item.booking_id,
       product: formatProducts(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
@@ -720,16 +738,16 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend44;
+    var _item$_extend45;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend44 = item._extend) === null || _item$_extend44 === void 0 ? void 0 : _item$_extend44.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend45 = item._extend) === null || _item$_extend45 === void 0 ? void 0 : _item$_extend45.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend45;
-    if (!((_item$_extend45 = item._extend) !== null && _item$_extend45 !== void 0 && _item$_extend45.unique_identification_number)) {
+    var _item$_extend46;
+    if (!((_item$_extend46 = item._extend) !== null && _item$_extend46 !== void 0 && _item$_extend46.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -748,8 +766,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend46;
-    if (!((_item$_extend46 = item._extend) !== null && _item$_extend46 !== void 0 && _item$_extend46.unique_identification_number)) {
+    var _item$_extend47;
+    if (!((_item$_extend47 = item._extend) !== null && _item$_extend47 !== void 0 && _item$_extend47.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -870,19 +888,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend48;
+    var _item$_extend49;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend47;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend47 = item._extend) === null || _item$_extend47 === void 0 || (_item$_extend47 = _item$_extend47.other) === null || _item$_extend47 === void 0 ? void 0 : _item$_extend47.rowKey);
+      var _item$_extend48;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend48 = item._extend) === null || _item$_extend48 === void 0 || (_item$_extend48 = _item$_extend48.other) === null || _item$_extend48 === void 0 ? void 0 : _item$_extend48.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend48 = item._extend) === null || _item$_extend48 === void 0 || (_item$_extend48 = _item$_extend48.holder_id) === null || _item$_extend48 === void 0 ? void 0 : _item$_extend48.length) !== item._extend.quantity) {
-      var _item$_extend49;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend49 = item._extend) === null || _item$_extend49 === void 0 || (_item$_extend49 = _item$_extend49.other) === null || _item$_extend49 === void 0 ? void 0 : _item$_extend49.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend49 = item._extend) === null || _item$_extend49 === void 0 || (_item$_extend49 = _item$_extend49.holder_id) === null || _item$_extend49 === void 0 ? void 0 : _item$_extend49.length) !== item._extend.quantity) {
+      var _item$_extend50;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend50 = item._extend) === null || _item$_extend50 === void 0 || (_item$_extend50 = _item$_extend50.other) === null || _item$_extend50 === void 0 ? void 0 : _item$_extend50.rowKey);
       return true;
     }
     return false;

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

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

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

@@ -70,8 +70,6 @@ var VoucherCard = function VoucherCard(props) {
   var shopDiscount = useShopDiscountModule();
   var _useActiveExecute = useActiveExecute(),
     executeIfActive = _useActiveExecute.executeIfActive;
-  var stateRef = useRef(state);
-  stateRef.current = state;
   services = state.service;
 
   // 将选中的客户数据传递给状态管理
@@ -171,7 +169,7 @@ var VoucherCard = function VoucherCard(props) {
         return;
       }
       if (isBooking4Shop) {
-        var val = shopDiscount.calcDiscount([].concat(_toConsumableArray(stateRef.current.service.value), _toConsumableArray(stateRef.current.addons.value)));
+        var val = shopDiscount.calcDiscount([].concat(_toConsumableArray(state.service.value), _toConsumableArray(state.addons.value)));
         console.log('input: ', state.service.value);
         console.log('output: ', val);
         productListToValue(val.productList);

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

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

package/es/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/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;
     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;