@pisell/private-materials 6.6.86 → 6.6.88

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

@@ -436,9 +436,20 @@ var formatProductMetadata = function formatProductMetadata(item) {
 };
 // 获取商品价格 包含组合规格
 export var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend34, _item$price2, _item$_extend35, _item$variant2;
+  var _item$_extend34, _item$metadata3, _item$_extend35, _item$price2, _item$_extend36, _item$variant2;
   var other = (_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.other;
-  var price = Number((_item$price2 = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price2 !== void 0 ? _item$price2 : (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.price);
+  var sourceProductPrice = item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.source_product_price;
+  var sourceProductPriceNumber = Number(sourceProductPrice);
+  var originalVariantId = Number((item === null || item === void 0 ? void 0 : item.product_variant_id) || 0);
+  var currentVariantId = Number((other === null || other === void 0 ? void 0 : other.product_variant_id) || 0);
+  var isExistingOrderProduct = Boolean((item === null || item === void 0 ? void 0 : item.booking_id) || (item === null || item === void 0 || (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.order_detail_id));
+
+  // 已有订单仅编辑套餐时保留主商品历史价格快照，避免被当前商品目录价覆盖。
+  // 主动切换组合规格时仍按新规格价格重新计算 source_product_price。
+  if (isExistingOrderProduct && originalVariantId === currentVariantId && sourceProductPrice !== null && sourceProductPrice !== undefined && sourceProductPrice !== '' && Number.isFinite(sourceProductPriceNumber)) {
+    return sourceProductPriceNumber;
+  }
+  var price = Number((_item$price2 = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price2 !== void 0 ? _item$price2 : (_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.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) {
@@ -454,8 +465,8 @@ export var getSourceProductPrice = function getSourceProductPrice(item) {
 
 // 获取主商品价格 要增加option
 export var getMainProductSellingPrice = function getMainProductSellingPrice(item) {
-  var _item$_extend36, _item$_extend37, _item$_extend$other, _item$_extend$other2, _item$_extend38;
-  if (!isNumber((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.main_product_selling_price) && !isString((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.main_product_selling_price)) {
+  var _item$_extend37, _item$_extend38, _item$_extend$other, _item$_extend$other2, _item$_extend39;
+  if (!isNumber((_item$_extend37 = item._extend) === null || _item$_extend37 === void 0 ? void 0 : _item$_extend37.main_product_selling_price) && !isString((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.main_product_selling_price)) {
     return undefined;
   }
   var optionPrice = new Decimal(0);
@@ -471,7 +482,7 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
       optionPrice = optionPrice.sub(getOptionDiscountAmount((item === null || item === void 0 ? void 0 : item.discount_list) || []));
     }
   }
-  return new Decimal((_item$_extend38 = item._extend) === null || _item$_extend38 === void 0 ? void 0 : _item$_extend38.main_product_selling_price).add(optionPrice).toNumber();
+  return new Decimal((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.main_product_selling_price).add(optionPrice).toNumber();
 };
 
 /**
@@ -483,11 +494,11 @@ export var getMainProductSellingPrice = function getMainProductSellingPrice(item
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend39, _getMainProductSellin, _item$_extend40, _item$_extend41, _item$_extend42, _item$_extend43;
+  var _item$_extend40, _getMainProductSellin, _item$_extend41, _item$_extend42, _item$_extend43, _item$_extend44;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
-  var bundleDiscountList = getBundleDiscountList(((_item$_extend39 = item._extend) === null || _item$_extend39 === void 0 || (_item$_extend39 = _item$_extend39.other) === null || _item$_extend39 === void 0 ? void 0 : _item$_extend39.bundle) || []);
+  var bundleDiscountList = getBundleDiscountList(((_item$_extend40 = item._extend) === null || _item$_extend40 === void 0 || (_item$_extend40 = _item$_extend40.other) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.bundle) || []);
   var discount_list = _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []);
   discount_list.push.apply(discount_list, _toConsumableArray(bundleDiscountList));
 
@@ -516,15 +527,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$_extend40 = item._extend) === null || _item$_extend40 === void 0 ? void 0 : _item$_extend40.note) || '',
+    "note": ((_item$_extend41 = item._extend) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.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$_extend41 = item._extend) === null || _item$_extend41 === void 0 || (_item$_extend41 = _item$_extend41.other) === null || _item$_extend41 === void 0 ? void 0 : _item$_extend41.bundle),
+    "product_bundle": formatProductBundle((_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 || (_item$_extend42 = _item$_extend42.other) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
-    "product_option_item": formatProductOption((_item$_extend42 = item._extend) === null || _item$_extend42 === void 0 || (_item$_extend42 = _item$_extend42.other) === null || _item$_extend42 === void 0 ? void 0 : _item$_extend42.option),
-    "product_variant_id": ((_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 || (_item$_extend43 = _item$_extend43.other) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend43 = item._extend) === null || _item$_extend43 === void 0 || (_item$_extend43 = _item$_extend43.other) === null || _item$_extend43 === void 0 ? void 0 : _item$_extend43.option),
+    "product_variant_id": ((_item$_extend44 = item._extend) === null || _item$_extend44 === void 0 || (_item$_extend44 = _item$_extend44.other) === null || _item$_extend44 === void 0 ? void 0 : _item$_extend44.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatProductMetadata(item),
     // checkout 需求新增字段
@@ -549,8 +560,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend44;
-    var holderId = (_item$_extend44 = item._extend) === null || _item$_extend44 === void 0 ? void 0 : _item$_extend44.holder_id;
+    var _item$_extend45;
+    var holderId = (_item$_extend45 = item._extend) === null || _item$_extend45 === void 0 ? void 0 : _item$_extend45.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -576,15 +587,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend45;
-      return ((_item$_extend45 = item._extend) === null || _item$_extend45 === void 0 ? void 0 : _item$_extend45.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend46;
+      return ((_item$_extend46 = item._extend) === null || _item$_extend46 === void 0 ? void 0 : _item$_extend46.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend46;
-      var key = (_item$_extend46 = item._extend) === null || _item$_extend46 === void 0 ? void 0 : _item$_extend46.holder_id; // 分组键
+      var _item$_extend47;
+      var key = (_item$_extend47 = item._extend) === null || _item$_extend47 === void 0 ? void 0 : _item$_extend47.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -620,8 +631,8 @@ var getHolderByIndex = function getHolderByIndex(holder, index) {
 export var getHasMultiDayProduct = function getHasMultiDayProduct(data) {
   var list = data.service.value;
   var isHas = list.some(function (item) {
-    var _item$_extend47;
-    return (_item$_extend47 = item._extend) === null || _item$_extend47 === void 0 ? void 0 : _item$_extend47.groupId;
+    var _item$_extend48;
+    return (_item$_extend48 = item._extend) === null || _item$_extend48 === void 0 ? void 0 : _item$_extend48.groupId;
   });
   return isHas;
 };
@@ -661,7 +672,7 @@ var formatBookings = function formatBookings(data, values) {
   var bookings = [];
   var obj = {};
   list.forEach(function (item) {
-    var _item$_extend48, _item$_extend53, _item$_extend54;
+    var _item$_extend49, _item$_extend54, _item$_extend55;
     // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
     if (item.isCustomItem) {
       bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
@@ -671,7 +682,7 @@ var formatBookings = function formatBookings(data, values) {
     }
 
     // 当前商品是跨日预约商品
-    var isMultiDay = (_item$_extend48 = item._extend) === null || _item$_extend48 === void 0 ? void 0 : _item$_extend48.groupId;
+    var isMultiDay = (_item$_extend49 = item._extend) === null || _item$_extend49 === void 0 ? void 0 : _item$_extend49.groupId;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format('HH:mm');
@@ -685,9 +696,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend49, _item$_extend50, _item$_extend51, _item$_extend52;
-      var startDate = ((_item$_extend49 = item._extend) === null || _item$_extend49 === void 0 ? void 0 : _item$_extend49.startDate) || ((_item$_extend50 = item._extend) === null || _item$_extend50 === void 0 ? void 0 : _item$_extend50.start_date);
-      var endDate = ((_item$_extend51 = item._extend) === null || _item$_extend51 === void 0 ? void 0 : _item$_extend51.endDate) || ((_item$_extend52 = item._extend) === null || _item$_extend52 === void 0 ? void 0 : _item$_extend52.end_date);
+      var _item$_extend50, _item$_extend51, _item$_extend52, _item$_extend53;
+      var startDate = ((_item$_extend50 = item._extend) === null || _item$_extend50 === void 0 ? void 0 : _item$_extend50.startDate) || ((_item$_extend51 = item._extend) === null || _item$_extend51 === void 0 ? void 0 : _item$_extend51.start_date);
+      var endDate = ((_item$_extend52 = item._extend) === null || _item$_extend52 === void 0 ? void 0 : _item$_extend52.endDate) || ((_item$_extend53 = item._extend) === null || _item$_extend53 === void 0 ? void 0 : _item$_extend53.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -713,8 +724,8 @@ var formatBookings = function formatBookings(data, values) {
     // 跨日预约处理： 跨日预约所有数据都在list中， 每一组预约通过groupId进行分组
     // 通过obj 记录下每个GroupId第一次出现的时机，  第一次出现需要设置 metadata.multiDayPrices
     // 后续出现不需要设置 metadata.multiDayPrices. 节省体积
-    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend53 = item._extend) === null || _item$_extend53 === void 0 ? void 0 : _item$_extend53.groupId];
-    if (!((_item$_extend54 = item._extend) !== null && _item$_extend54 !== void 0 && _item$_extend54.unique_identification_number)) {
+    var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend54 = item._extend) === null || _item$_extend54 === void 0 ? void 0 : _item$_extend54.groupId];
+    if (!((_item$_extend55 = item._extend) !== null && _item$_extend55 !== void 0 && _item$_extend55.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -793,16 +804,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$_extend55;
+    var _item$_extend56;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend55 = item._extend) === null || _item$_extend55 === void 0 ? void 0 : _item$_extend55.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend56 = item._extend) === null || _item$_extend56 === void 0 ? void 0 : _item$_extend56.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend56;
-    if (!((_item$_extend56 = item._extend) !== null && _item$_extend56 !== void 0 && _item$_extend56.unique_identification_number)) {
+    var _item$_extend57;
+    if (!((_item$_extend57 = item._extend) !== null && _item$_extend57 !== void 0 && _item$_extend57.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -821,8 +832,8 @@ var formatNormalProducts = function formatNormalProducts(data) {
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
-    var _item$_extend57;
-    if (!((_item$_extend57 = item._extend) !== null && _item$_extend57 !== void 0 && _item$_extend57.unique_identification_number)) {
+    var _item$_extend58;
+    if (!((_item$_extend58 = item._extend) !== null && _item$_extend58 !== void 0 && _item$_extend58.unique_identification_number)) {
       var unique_identification_number = getUniqueId();
       item._extend.unique_identification_number = unique_identification_number;
     }
@@ -947,19 +958,19 @@ export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var errorRowKey = '';
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend$holder_2, _item$_extend59;
+    var _item$_extend$holder_2, _item$_extend60;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && (!item._extend.holder_id || ((_item$_extend$holder_2 = item._extend.holder_id) === null || _item$_extend$holder_2 === void 0 ? void 0 : _item$_extend$holder_2.length) === 0)) {
-      var _item$_extend58;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend58 = item._extend) === null || _item$_extend58 === void 0 || (_item$_extend58 = _item$_extend58.other) === null || _item$_extend58 === void 0 ? void 0 : _item$_extend58.rowKey);
+      var _item$_extend59;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend59 = item._extend) === null || _item$_extend59 === void 0 || (_item$_extend59 = _item$_extend59.other) === null || _item$_extend59 === void 0 ? void 0 : _item$_extend59.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend59 = item._extend) === null || _item$_extend59 === void 0 || (_item$_extend59 = _item$_extend59.holder_id) === null || _item$_extend59 === void 0 ? void 0 : _item$_extend59.length) !== item._extend.quantity) {
-      var _item$_extend60;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend60 = item._extend) === null || _item$_extend60 === void 0 || (_item$_extend60 = _item$_extend60.other) === null || _item$_extend60 === void 0 ? void 0 : _item$_extend60.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend60 = item._extend) === null || _item$_extend60 === void 0 || (_item$_extend60 = _item$_extend60.holder_id) === null || _item$_extend60 === void 0 ? void 0 : _item$_extend60.length) !== item._extend.quantity) {
+      var _item$_extend61;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend61 = item._extend) === null || _item$_extend61 === void 0 || (_item$_extend61 = _item$_extend61.other) === null || _item$_extend61 === void 0 ? void 0 : _item$_extend61.rowKey);
       return true;
     }
     return false;

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

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

package/es/components/booking/info2/service/editService/index.js

@@ -731,7 +731,7 @@ var Info = function Info(_, ref) {
         })
       },
       callback: function callback(e, extension_type, detail) {
-        var _item$_extend10, _item$_extend11, _item$_extend12, _cacheItem$metadata, _cacheItem$metadata3, _cacheItem$_extend, _cacheItem$_extend2;
+        var _item$_extend10, _item$_extend11, _item$_extend12, _other, _ref, _item$metadata$source, _item$metadata, _cacheItem$metadata, _cacheItem$metadata3, _cacheItem$_extend, _cacheItem$_extend2;
         // 标记已执行过编辑操作
         isEditedRef.current = true;
         shouldReallocateBundlePriceRef.current = false;
@@ -753,12 +753,20 @@ var Info = function Info(_, ref) {
           other = mergeBundleWithOriginalPrice(other, ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other) || {});
         }
         other.session = e.session;
+        var originalVariantId = Number((item === null || item === void 0 ? void 0 : item.product_variant_id) || 0);
+        var currentVariantId = Number(((_other = other) === null || _other === void 0 ? void 0 : _other.product_variant_id) || 0);
+        var isProductVariantChanged = originalVariantId !== currentVariantId;
+        var sourceProductPrice = (_ref = (_item$metadata$source = item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source_product_price) !== null && _item$metadata$source !== void 0 ? _item$metadata$source : item === null || item === void 0 ? void 0 : item.source_product_price) !== null && _ref !== void 0 ? _ref : item === null || item === void 0 ? void 0 : item.price;
 
         // 重新生成商品
         var cacheItem = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
           product_id: item.id,
           _id: item === null || item === void 0 ? void 0 : item._id,
           _key: e.key,
+          metadata: _objectSpread(_objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.metadata), _detail === null || _detail === void 0 ? void 0 : _detail.metadata), item !== null && item !== void 0 && item.booking_id ? {
+            // 仅编辑套餐时保留历史主商品价格；切换组合规格时由新规格重新生成。
+            source_product_price: isProductVariantChanged ? undefined : sourceProductPrice
+          } : {}),
           _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
             quantity: (e === null || e === void 0 ? void 0 : e.quantity) || (values === null || values === void 0 ? void 0 : values.quantity) || 1,
             // 覆盖选择的规格和套餐
@@ -1185,12 +1193,12 @@ var Info = function Info(_, ref) {
     })));
   }, [isEditGroup, currentTab, items]);
   var updateMultiDay = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var start_date, end_date, duration, cacheItem, fieldsValues;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            start_date = _ref.start_date, end_date = _ref.end_date, duration = _ref.duration;
+            start_date = _ref2.start_date, end_date = _ref2.end_date, duration = _ref2.duration;
             _context.next = 3;
             return getMultiDay({
               start_date: start_date,
@@ -1224,7 +1232,7 @@ var Info = function Info(_, ref) {
       }, _callee);
     }));
     return function updateMultiDay(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var onValuesChange = function onValuesChange(changedValues) {
@@ -1307,8 +1315,8 @@ var Info = function Info(_, ref) {
    * const price = getBundleOriginalSellingPrice({ bundle_sum_price: '8.00', price: 7.2 });
    */
   var getBundleOriginalSellingPrice = function getBundleOriginalSellingPrice(bundle) {
-    var _ref3, _ref4, _ref5, _bundle$bundle_sum_pr;
-    var priceSource = (_ref3 = (_ref4 = (_ref5 = (_bundle$bundle_sum_pr = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _bundle$bundle_sum_pr !== void 0 ? _bundle$bundle_sum_pr : bundle === null || bundle === void 0 ? void 0 : bundle.original_total) !== null && _ref5 !== void 0 ? _ref5 : bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _ref4 !== void 0 ? _ref4 : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref3 !== void 0 ? _ref3 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+    var _ref4, _ref5, _ref6, _bundle$bundle_sum_pr;
+    var priceSource = (_ref4 = (_ref5 = (_ref6 = (_bundle$bundle_sum_pr = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _bundle$bundle_sum_pr !== void 0 ? _bundle$bundle_sum_pr : bundle === null || bundle === void 0 ? void 0 : bundle.original_total) !== null && _ref6 !== void 0 ? _ref6 : bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _ref5 !== void 0 ? _ref5 : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref4 !== void 0 ? _ref4 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
     var price = Number(priceSource);
     if (!Number.isFinite(price)) {
       return undefined;
@@ -1322,7 +1330,7 @@ var Info = function Info(_, ref) {
     setDiscountChangeModalOpen(false);
   };
   var handleContinue = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheItem;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -1341,7 +1349,7 @@ var Info = function Info(_, ref) {
       }, _callee2);
     }));
     return function handleContinue() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var handleRemove = function handleRemove() {

package/es/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -109,4 +110,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/notes/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

package/es/components/booking/payments/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

@@ -175,10 +175,10 @@ export declare const getProductOriginTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (this: unknown, value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: (this: unknown) => void;

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "mx51" | "payo" | "windcave" | "stripe" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -299,15 +299,15 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
+        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        eftpos?: "tyro" | "mx51" | "payo" | "windcave" | "stripe" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "unset" | "step" | undefined;
+        type?: "step" | "unset" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;

package/es/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,4 +30,11 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/plus/productSelect/ProductCard/SkuCard/components/Capacity/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Capacity: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Capacity;

package/es/plus/productSelect/ProductCard/SkuCard/components/CardMask/index.d.ts

@@ -3,5 +3,5 @@ import { SkuStatusOverlayConfig } from '../../type';
 import './index.less';
 declare const CardMask: ({ props }: {
     props: SkuStatusOverlayConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default CardMask;

package/es/plus/productSelect/ProductCard/SkuCard/components/Countdown/index.d.ts

@@ -3,5 +3,5 @@ import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const Countdown: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Countdown;

package/es/plus/productSelect/ProductCard/SkuCard/components/Duration/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Duration: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Duration;

package/es/plus/productSelect/ProductCard/SkuCard/components/MemberPrice/index.d.ts

@@ -3,5 +3,5 @@ import { ProductCardConfig } from '../../type';
 import './index.less';
 declare const MemberPrice: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default MemberPrice;

package/es/plus/productSelect/ProductCard/SkuCard/components/Resource/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Resource: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Resource;

package/es/plus/productSelect/ProductCard/SkuCard/components/Stock/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Stock: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Stock;

package/es/plus/productSelect/ProductCard/SkuCard/components/Time/index.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { ProductCardConfig } from '../../type';
 declare const Time: ({ props }: {
     props: ProductCardConfig;
-}) => string | number | true | React.JSX.Element | Iterable<React.ReactNode> | null;
+}) => string | number | true | Iterable<React.ReactNode> | React.JSX.Element | null;
 export default Time;

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

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

@@ -342,10 +342,20 @@ var formatProductMetadata = (item) => {
   return metadata;
 };
 var getSourceProductPrice = (item) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
-  let price = Number((item == null ? void 0 : item.price) ?? ((_b = item._extend) == null ? void 0 : _b.price));
-  if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_c = item == null ? void 0 : item.variant) == null ? void 0 : _c.length) > 0) {
+  const sourceProductPrice = (_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.source_product_price;
+  const sourceProductPriceNumber = Number(sourceProductPrice);
+  const originalVariantId = Number((item == null ? void 0 : item.product_variant_id) || 0);
+  const currentVariantId = Number((other == null ? void 0 : other.product_variant_id) || 0);
+  const isExistingOrderProduct = Boolean(
+    (item == null ? void 0 : item.booking_id) || ((_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.order_detail_id)
+  );
+  if (isExistingOrderProduct && originalVariantId === currentVariantId && sourceProductPrice !== null && sourceProductPrice !== void 0 && sourceProductPrice !== "" && Number.isFinite(sourceProductPriceNumber)) {
+    return sourceProductPriceNumber;
+  }
+  let price = Number((item == null ? void 0 : item.price) ?? ((_d = item._extend) == null ? void 0 : _d.price));
+  if ((other == null ? void 0 : other.product_variant_id) > 0 && ((_e = item == null ? void 0 : item.variant) == null ? void 0 : _e.length) > 0) {
     const variant = item.variant.find(
       (d) => d.id === (other == null ? void 0 : other.product_variant_id)
     );