@pisell/private-materials 6.7.5 → 6.7.7

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 } from '@pisell/utils';
+import { isArr, locales, sendWarningLog, getUniqueId, isNumber, isString } 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": 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),
+      "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
+      // "bundle_sum_price": d?.original_price || 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$_extend7, _item$variant;
+  var _item$_extend6, _item$price, _item$_extend7, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
-  var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
+  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);
 
   // 组合规格: 根据当前选择的组合规格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$_extend$other, _item$_extend$other2, _item$_extend28;
-  if (!isNumber((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.main_product_selling_price)) {
+  var _item$_extend29, _item$_extend30, _item$_extend$other, _item$_extend$other2, _item$_extend31;
+  if (!isNumber((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.main_product_selling_price) && !isString((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.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$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.main_product_selling_price).add(optionPrice).toNumber();
+  return new Decimal((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.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$_extend29, _getMainProductSellin, _item$_extend30, _item$_extend31, _item$_extend32, _item$_extend33;
+  var _item$_extend32, _getMainProductSellin, _item$_extend33, _item$_extend34, _item$_extend35, _item$_extend36;
+  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$_extend29 = item._extend) === null || _item$_extend29 === void 0 || (_item$_extend29 = _item$_extend29.other) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.bundle) || []);
+  var bundleDiscountList = getBundleDiscountList(((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.other) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.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$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.note) || '',
+    "note": ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.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$_extend31 = item._extend) === null || _item$_extend31 === void 0 || (_item$_extend31 = _item$_extend31.other) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.bundle),
+    "product_bundle": formatProductBundle((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
-    "product_option_item": formatProductOption((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.other) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.option),
-    "product_variant_id": ((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 || (_item$_extend33 = _item$_extend33.other) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 || (_item$_extend35 = _item$_extend35.other) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.option),
+    "product_variant_id": ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 || (_item$_extend36 = _item$_extend36.other) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.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$_extend34;
-    var holderId = (_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.holder_id;
+    var _item$_extend37;
+    var holderId = (_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.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$_extend35;
-      return ((_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend38;
+      return ((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend36;
-      var key = (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.holder_id; // 分组键
+      var _item$_extend39;
+      var key = (_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.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$_extend41, _item$_extend42;
+    var _item$_extend44, _item$_extend45, _item$_extend46;
     // 自定义商品直接使用 _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$_extend37, _item$_extend38, _item$_extend39, _item$_extend40;
-      var startDate = ((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.startDate) || ((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.start_date);
-      var endDate = ((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.endDate) || ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.end_date);
+      var _item$_extend40, _item$_extend41, _item$_extend42, _item$_extend43;
+      var startDate = ((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.startDate) || ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.start_date);
+      var endDate = ((_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.endDate) || ((_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -638,7 +654,7 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    if (!((_item$_extend41 = item._extend) !== null && _item$_extend41 !== void 0 && _item$_extend41.unique_identification_number)) {
+    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;
     }
@@ -646,29 +662,35 @@ 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];
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend45 = item._extend) === null || _item$_extend45 === void 0 ? void 0 : _item$_extend45.groupId];
+    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;
+    }
+    debugger;
     var booking = _objectSpread(_objectSpread({
-      "product": formatProducts(item),
-      "metadata": formatMetaData(item, !isSetGroupId),
-      "relation_products": formatRelationDetails(item._extend.relation_details),
-      'id': item.booking_id || 0,
-      "relation_id": item._extend.relation_id || 0,
-      "like_status": item._extend.like_status || 'common',
-      "relation_type": item._extend.relation_type || '',
-      "is_all": false,
-      "schedule_id": item._extend.schedule_id || 0,
-      "end_time": end_time,
-      "sub_type": isDay ? 'days' : getSubType(item),
-      "select_date": start_date,
-      "start_time": start_time,
-      "end_date": end_date,
-      "start_date": start_date,
-      "duration": isDay ? 0 : flexibleObj.getValue(item._extend.duration),
-      "number": item._extend.capacity ? getSumCapacity({
+      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,
+      relation_id: item._extend.relation_id || 0,
+      like_status: item._extend.like_status || 'common',
+      relation_type: item._extend.relation_type || '',
+      is_all: false,
+      schedule_id: item._extend.schedule_id || 0,
+      end_time: end_time,
+      sub_type: isDay ? 'days' : getSubType(item),
+      select_date: start_date,
+      start_time: start_time,
+      end_date: end_date,
+      start_date: start_date,
+      duration: isDay ? 0 : flexibleObj.getValue(item._extend.duration),
+      number: item._extend.capacity ? getSumCapacity({
         cacheItem: item
       }) : item._extend.number || 1,
-      "resources": formatResource(item),
-      "note": item._extend.note
+      resources: formatResource(item),
+      note: item._extend.note,
+      metadata: formatMetaData(item, !isSetGroupId)
     }, eventOtherParams || {}), dayParams);
 
     // 记录下每个GroupId第一次出现的时机
@@ -720,16 +742,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$_extend43;
+    var _item$_extend47;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend47 = item._extend) === null || _item$_extend47 === void 0 ? void 0 : _item$_extend47.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend44;
-    if (!((_item$_extend44 = item._extend) !== null && _item$_extend44 !== void 0 && _item$_extend44.unique_identification_number)) {
+    var _item$_extend48;
+    if (!((_item$_extend48 = item._extend) !== null && _item$_extend48 !== void 0 && _item$_extend48.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -748,8 +770,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   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$_extend49;
+    if (!((_item$_extend49 = item._extend) !== null && _item$_extend49 !== void 0 && _item$_extend49.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -869,19 +891,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend47;
+    var _item$_extend51;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend46;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend46 = item._extend) === null || _item$_extend46 === void 0 || (_item$_extend46 = _item$_extend46.other) === null || _item$_extend46 === void 0 ? void 0 : _item$_extend46.rowKey);
+      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;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend47 = item._extend) === null || _item$_extend47 === void 0 || (_item$_extend47 = _item$_extend47.holder_id) === null || _item$_extend47 === void 0 ? void 0 : _item$_extend47.length) !== item._extend.quantity) {
-      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);
+    if (item._extend.quantity > 1 && ((_item$_extend51 = item._extend) === null || _item$_extend51 === void 0 || (_item$_extend51 = _item$_extend51.holder_id) === null || _item$_extend51 === void 0 ? void 0 : _item$_extend51.length) !== item._extend.quantity) {
+      var _item$_extend52;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend52 = item._extend) === null || _item$_extend52 === void 0 || (_item$_extend52 = _item$_extend52.other) === null || _item$_extend52 === void 0 ? void 0 : _item$_extend52.rowKey);
       return true;
     }
     return false;

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

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+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/es/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/es/components/booking/components/voucher/index.js

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

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 /**
  * @title: 表单选择器
@@ -7,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/es/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/es/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
-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/es/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/es/components/booking/hooks/useQuotation.js

@@ -85,9 +85,12 @@ var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
         return item.id === bundle.id;
       });
       var optionPrice = calculateTotalPrice((selectBundleInfo === null || selectBundleInfo === void 0 ? void 0 : selectBundleInfo.option) || []);
+
+      // 编辑预约时使用折扣卡
+      var isEditDiscount = item.booking_id && (bundle.discount_list || []).length;
       return _objectSpread(_objectSpread({}, bundle), {}, {
         base_price: bundleItemMap[bundle.id].base_price,
-        price: new Decimal(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
+        price: isEditDiscount ? bundle.price : new Decimal(bundleItemMap[bundle.id].price || 0).add(optionPrice).toNumber()
         // product_price: bundleItemMap[item.id].product_price,
       });
     });

package/es/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/es/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;

package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;
@@ -36,7 +36,7 @@ declare const useClientFn: (_params: useClientFnParams) => {
     };
     searchChange: (search: string) => void;
     loading: boolean;
-    loadMore: JSX.Element | null;
+    loadMore: React.JSX.Element | null;
     handleOpenClientModal: (val?: string) => void;
     getNickname: (item: any) => any;
     franchiseeLoading: number;

package/es/components/booking/info/clientVariant/vertical/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface VerticalClientProps {
+    globalState: any;
+    setGlobalState: any;
+}
+declare const VerticalClient: React.ForwardRefExoticComponent<VerticalClientProps & React.RefAttributes<unknown>>;
+export default VerticalClient;

package/es/components/booking/info/date/index.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
-declare const DateCom: () => JSX.Element;
+declare const DateCom: () => React.JSX.Element;
 export default DateCom;

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
-declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;
+declare const DateRange: ({ state, dispatch, key }: any) => React.JSX.Element;
 export default DateRange;

package/es/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const header: ({ state, dispatch }: any) => JSX.Element;
+declare const header: ({ state, dispatch }: any) => React.JSX.Element;
 export default header;

package/es/components/booking/info/hooks/useGetHolderList.d.ts

@@ -1,2 +1,2 @@
-declare const useGetHolderList: (state: any, dispatch: any) => () => Promise<void>;
+declare const useGetHolderList: (state: any, dispatch: any) => (this: unknown) => Promise<void>;
 export default useGetHolderList;

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;
-    handleEdit: (cacheItem: any, type?: string) => void;
+    handleEdit: (this: unknown, cacheItem: any, type?: string | undefined) => void;
     dispatchService: (type: string, payload: any) => void;
-    handleAction: (dataSource: any) => void;
+    handleAction: (this: unknown, dataSource: any) => void;
     showAddTimeModal: boolean;
     editNormalServiceRef: import("react").MutableRefObject<any>;
 };

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { InfoProps } from './main';
-declare const APP: (props: InfoProps) => JSX.Element;
+declare const APP: (props: InfoProps) => React.JSX.Element;
 export default APP;

package/es/components/booking/info/notes/index.d.ts

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

package/es/components/booking/info/pet/index.d.ts

@@ -10,5 +10,5 @@ interface PetProps {
     clientChangeNotSetPet?: boolean;
     previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
 }
-declare const Pet: (props: PetProps) => JSX.Element;
+declare const Pet: (props: PetProps) => React.JSX.Element;
 export default Pet;

package/es/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
+import React from 'react';
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => React.JSX.Element;
 export default Lists;

package/es/components/booking/info/service/actions/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Actions;

package/es/components/booking/info/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {
@@ -7,5 +8,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => JSX.Element;
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/es/components/booking/info/service/addTimeModal/index.d.ts

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

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 declare const BookingList: ({ items }: {
     items: any[];
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default BookingList;

package/es/components/booking/info/service/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;