@pisell/private-materials 6.6.37 → 6.6.39

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/footer/utils.js

@@ -439,9 +439,9 @@ var formatProductMetadata = function formatProductMetadata(item) {
 
 // 获取商品价格 包含组合规格
 export var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend29, _item$_extend30, _item$variant2;
+  var _item$_extend29, _item$price2, _item$_extend30, _item$variant2;
   var other = (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.other;
-  var price = Number((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.price);
+  var price = Number((_item$price2 = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price2 !== void 0 ? _item$price2 : (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.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) {

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/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service2/Group/utils.js

@@ -91,7 +91,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
       // 编辑时组商品需要清空booking_id  否则会重复
       booking_id: isBatchEdit ? 0 : item.booking_id,
       _id: "".concat(item._id, "-").concat(i + 1),
-      price: price,
+      // price: price,
       _extend: _objectSpread(_objectSpread({}, _extend), {}, {
         order_detail_id: isBatchEdit ? 0 : item.order_detail_id,
         groupId: groupId,

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

@@ -216,4 +216,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -38,10 +38,10 @@ import { ConfigProvider, Iconfont } from '@pisell/materials';
 import { addService, genHolderKey, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
 import { disabledDate as _disabledDate, isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { editSessionProduct } from "../../../info/utils";
-import { deleteCacheParams, getDays, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
+import { deleteCacheParams, getDays, getProductOriginTotalPrice, getProductTotalPrice, getServiceTimes, isSessionProduct, isWalkIn } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { getProductAllDiscountList, setProductPrice } from "./utils";
+import { getProductAllDiscountList, mergeBundleWithOriginalPrice, setProductPrice } from "./utils";
 import NoteModal from "../../../../../plus/noteModal";
 import { DiscountKeyboard } from "../../../../../pro/priceKeyboard";
 import EditTabs from "../../../info/service/editService/EditTabs";
@@ -660,11 +660,17 @@ var Info = function Info(_, ref) {
         })
       },
       callback: function callback(e, extension_type, detail) {
-        var _cacheItem$_extend, _cacheItem$_extend2;
+        var _cacheItem$metadata, _cacheItem$_extend, _cacheItem$_extend2;
         // 标记已执行过编辑操作
         isEditedRef.current = true;
         var _detail = detail || item;
         var other = JSON.parse(JSON.stringify(e));
+
+        // 手动折扣时 合并 bundle price，优先使用编辑前的价格
+        if (item.discount_amount) {
+          var _item$_extend10;
+          other = mergeBundleWithOriginalPrice(other, ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.other) || {});
+        }
         other.session = e.session;
 
         // 重新生成商品
@@ -680,6 +686,12 @@ var Info = function Info(_, ref) {
           new: 0
         });
 
+        // 手动折扣编辑时保留原有折扣
+        if (cacheItem.discount_amount && cacheItem !== null && cacheItem !== void 0 && (_cacheItem$metadata = cacheItem.metadata) !== null && _cacheItem$metadata !== void 0 && _cacheItem$metadata.main_product_selling_price) {
+          var _cacheItem$metadata2;
+          cacheItem._extend.price = cacheItem === null || cacheItem === void 0 || (_cacheItem$metadata2 = cacheItem.metadata) === null || _cacheItem$metadata2 === void 0 ? void 0 : _cacheItem$metadata2.main_product_selling_price;
+        }
+
         // 获取商品总价
         var _total = getProductTotalPrice(cacheItem);
 
@@ -700,11 +712,15 @@ var Info = function Info(_, ref) {
             });
           }, 200);
         }
+        var origin_total = _total;
+        if (item.discount_amount) {
+          origin_total = getProductOriginTotalPrice(cacheItem);
+        }
 
         // 用于储存原价
-        cacheItem._extend.origin_total = _total;
+        cacheItem._extend.origin_total = origin_total;
         (((_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.items) || []).forEach(function (item) {
-          return item._extend.origin_total = _total;
+          return item._extend.origin_total = origin_total;
         });
 
         // 覆盖商品

package/es/components/booking/info2/service/editService/utils.d.ts

@@ -32,3 +32,10 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
+/**
+ * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
+ * @param other - callback 返回的新数据
+ * @param originalOther - 编辑前的原始数据 (item._extend.other)
+ * @returns 合并后的 other
+ */
+export declare const mergeBundleWithOriginalPrice: (other: any, originalOther: any) => any;

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

@@ -83,6 +83,9 @@ export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
   })) {
     return cacheItem;
   }
+  if (cacheItem.discount_amount) {
+    return cacheItem;
+  }
 
   // 计算折扣比例
   var discountRatio = new Decimal(newTotal).div(new Decimal(origin_total));
@@ -145,4 +148,31 @@ export var getProductAllDiscountList = function getProductAllDiscountList(cacheI
   var bundleDiscountList = getBundleDiscountList(((_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 || (_cacheItem$_extend = _cacheItem$_extend.other) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.bundle) || []) || [];
   (_discountList = discountList).push.apply(_discountList, _toConsumableArray(bundleDiscountList));
   return discountList;
+};
+
+/**
+ * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
+ * @param other - callback 返回的新数据
+ * @param originalOther - 编辑前的原始数据 (item._extend.other)
+ * @returns 合并后的 other
+ */
+export var mergeBundleWithOriginalPrice = function mergeBundleWithOriginalPrice(other, originalOther) {
+  var _other$bundle, _originalOther$bundle;
+  if (!(other !== null && other !== void 0 && (_other$bundle = other.bundle) !== null && _other$bundle !== void 0 && _other$bundle.length) || !(originalOther !== null && originalOther !== void 0 && (_originalOther$bundle = originalOther.bundle) !== null && _originalOther$bundle !== void 0 && _originalOther$bundle.length)) return other;
+  other.bundle = other.bundle.map(function (bundle) {
+    var matched = originalOther.bundle.find(function (orig) {
+      return orig.id === bundle.id && orig.product_id === bundle.product_id;
+    });
+    if (matched && matched.price !== undefined) {
+      var _matched$original_tot, _matched$original_pri, _matched$custom_price;
+      return _objectSpread(_objectSpread({}, bundle), {}, {
+        price: matched.price,
+        original_total: (_matched$original_tot = matched === null || matched === void 0 ? void 0 : matched.original_total) !== null && _matched$original_tot !== void 0 ? _matched$original_tot : bundle.original_total,
+        original_price: (_matched$original_pri = matched === null || matched === void 0 ? void 0 : matched.original_price) !== null && _matched$original_pri !== void 0 ? _matched$original_pri : bundle.original_price,
+        custom_price: (_matched$custom_price = matched === null || matched === void 0 ? void 0 : matched.custom_price) !== null && _matched$custom_price !== void 0 ? _matched$custom_price : bundle.custom_price
+      });
+    }
+    return bundle;
+  });
+  return other;
 };

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -110,11 +109,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/notes/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/payments/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/utils.d.ts

@@ -163,6 +163,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
 export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
+export declare const getProductOriginTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration
  * @description: 用于处理不同格式的duration
@@ -174,10 +175,10 @@ export declare const getProductTotalPrice: (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/booking/utils.js

@@ -820,6 +820,42 @@ export var getProductTotalPrice = function getProductTotalPrice(item) {
   }
   return price.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 };
+export var getProductOriginTotalPrice = function getProductOriginTotalPrice(item) {
+  var _ref2, _ref3, _item$metadata$source, _item$metadata, _item$_extend3, _item$_extend4, _item$_extend5;
+  var price = new Decimal((_ref2 = (_ref3 = (_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.price) !== null && _ref3 !== void 0 ? _ref3 : item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.price) !== null && _ref2 !== void 0 ? _ref2 : 0);
+  var other = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.other;
+  // 如果有 priceOverride，则强制使用 priceOverride，不受规则约束
+  if ((_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.priceOverride) {
+    var _item$_extend6;
+    price = new Decimal(((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.priceOverride) || 0);
+    return price.toNumber();
+  }
+
+  // 多规格
+  if (other !== null && other !== void 0 && other.product_variant_id) {
+    price = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
+  }
+  if (other !== null && other !== void 0 && other.bundle) {
+    // bundle
+    price = other === null || other === void 0 ? void 0 : other.bundle.reduce(function (accumulator, currentValue) {
+      var _ref4, _ref5, _ref6, _currentValue$source_;
+      var currentPrice = new Decimal((_ref4 = (_ref5 = (_ref6 = (_currentValue$source_ = currentValue === null || currentValue === void 0 ? void 0 : currentValue.source_product_price) !== null && _currentValue$source_ !== void 0 ? _currentValue$source_ : currentValue === null || currentValue === void 0 ? void 0 : currentValue.original_price) !== null && _ref6 !== void 0 ? _ref6 : currentValue === null || currentValue === void 0 ? void 0 : currentValue.product_price) !== null && _ref5 !== void 0 ? _ref5 : currentValue.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
+      var currentNum = new Decimal(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
+    }, price);
+  }
+
+  // 单规格
+  if (other !== null && other !== void 0 && other.option) {
+    price = other === null || other === void 0 ? void 0 : other.option.reduce(function (accumulator, currentValue) {
+      var currentPrice = new Decimal(currentValue.price || 0);
+      var currentNum = new Decimal(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
+    }, price);
+  }
+  return price.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+};
+
 /**
  * @title: 判断 duration
  * @description: 用于处理不同格式的duration

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

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -178,7 +178,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -299,10 +299,10 @@ 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" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -312,7 +312,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -30,11 +29,4 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-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/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-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/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "walletPass" | "wallet" | "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/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/lib/components/booking/components/footer/utils.js

@@ -337,7 +337,7 @@ var formatProductMetadata = (item) => {
 var getSourceProductPrice = (item) => {
   var _a, _b, _c;
   const other = (_a = item._extend) == null ? void 0 : _a.other;
-  let price = Number((_b = item._extend) == null ? void 0 : _b.price);
+  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 variant = item.variant.find(
       (d) => d.id === (other == null ? void 0 : other.product_variant_id)

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

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

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

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

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service2/Group/utils.js

@@ -81,7 +81,7 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
       // 编辑时组商品需要清空booking_id  否则会重复
       booking_id: isBatchEdit ? 0 : item.booking_id,
       _id: `${item._id}-${i + 1}`,
-      price,
+      // price: price,
       _extend: {
         ..._extend,
         order_detail_id: isBatchEdit ? 0 : item.order_detail_id,

package/lib/components/booking/info/service2/utils.d.ts

@@ -216,4 +216,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;