@pisell/private-materials 6.11.48 → 6.11.49

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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/service/serviceManager/distributeDiscount.d.ts

@@ -5,6 +5,11 @@ interface Product {
         total: number;
     };
 }
+/**
+ * 根据 total 与 origin_total 的折扣比例，重新计算主商品单价 main_product_selling_price
+ * 如果存在子商品(bundle)，会先按折扣比例计算子商品总价，再用总价减去子商品总价得到主商品总价
+ */
+export declare function updateMainProductSellingPrice(extend: any): void;
 export declare function distributeDiscountOrIncrease(products: Product[], // 商品列表
 totalAdjustment: number, // 总折扣或加价金额，可能为负数（折扣）或正数（加价）
 totalPrice: number): Product[];

package/es/components/booking/info/service/serviceManager/distributeDiscount.js

@@ -5,6 +5,26 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import Decimal from 'decimal.js';
+/**
+ * 根据 total 与 origin_total 的折扣比例，重新计算主商品单价 main_product_selling_price
+ * 如果存在子商品(bundle)，会先按折扣比例计算子商品总价，再用总价减去子商品总价得到主商品总价
+ */
+export function updateMainProductSellingPrice(extend) {
+  var _extend$other, _extend$other2;
+  var bundles = (extend === null || extend === void 0 || (_extend$other = extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.bundle) || [];
+  var childProductsTotal = new Decimal(0);
+  if (bundles.length > 0) {
+    var discountRatio = new Decimal(extend.total).div(extend.origin_total);
+    bundles.forEach(function (bundle) {
+      var discountedPrice = new Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+      bundle.bundle_selling_price = discountedPrice.toNumber();
+      childProductsTotal = childProductsTotal.add(discountedPrice.mul(bundle.quantity));
+    });
+  }
+  var mainProductTotal = new Decimal(extend.total).sub(childProductsTotal);
+  var mainProductQuantity = ((_extend$other2 = extend.other) === null || _extend$other2 === void 0 ? void 0 : _extend$other2.quantity) || extend.quantity || 1;
+  extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+}
 export function distributeDiscountOrIncrease(products,
 // 商品列表
 totalAdjustment,
@@ -27,10 +47,12 @@ totalPrice) {
     // 防止价格变负，调整均摊金额
     var newPrice = productPrice.plus(adjustmentAmount).toFixed(2, Decimal.ROUND_HALF_UP);
     var adjustedPrice = new Decimal(newPrice).lessThan(0) ? '0.00' : newPrice;
+    var newExtend = _objectSpread(_objectSpread({}, product._extend), {}, {
+      total: parseFloat(adjustedPrice)
+    });
+    updateMainProductSellingPrice(newExtend);
     adjustedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
-      _extend: _objectSpread(_objectSpread({}, product._extend), {}, {
-        total: parseFloat(adjustedPrice)
-      })
+      _extend: newExtend
     }));
     totalAdjustmentApplied = totalAdjustmentApplied.plus(new Decimal(adjustmentAmount));
   });
@@ -48,6 +70,7 @@ totalPrice) {
     // 确保最后调整后的价格不为负数
     lastPrice = new Decimal(lastPrice).lessThan(0) ? '0.00' : lastPrice;
     lastProduct._extend.total = parseFloat(lastPrice);
+    updateMainProductSellingPrice(lastProduct._extend);
   }
 
   // 将结果格式化为以 _id 为键的对象

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

@@ -8,6 +8,7 @@ import { getUniqueId } from "@pisell/utils";
 import { getProductTotalPrice } from "../../../utils";
 import { distributeDiscountOrIncrease } from "../../service/serviceManager/distributeDiscount";
 import { genServiceKey } from "../../../../ticketBooking/utils";
+import { setProductPrice } from "../../../info2/service/editService/utils";
 
 // 创建group
 
@@ -120,6 +121,13 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     var discountAmount = (groupOriginTotalPrice - groupTotalPrice) * -1;
     if (discountAmount !== 0) {
       bookings = distributeDiscountOrIncrease(bookings, discountAmount, groupOriginTotalPrice);
+      bookings = bookings.map(function (booking) {
+        var _booking$_extend, _booking$_extend2;
+        return setProductPrice(booking, {
+          newTotal: booking === null || booking === void 0 || (_booking$_extend = booking._extend) === null || _booking$_extend === void 0 ? void 0 : _booking$_extend.total,
+          origin_total: booking === null || booking === void 0 || (_booking$_extend2 = booking._extend) === null || _booking$_extend2 === void 0 ? void 0 : _booking$_extend2.origin_total
+        });
+      });
     }
   }
   console.log('bookings', bookings);

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

@@ -216,7 +216,7 @@ 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[];
 /**
  * @description: 根据_id和sourceProductId来获取主商品已选择的赠品
  * @param {string} productId 主商品_id

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

@@ -49,9 +49,9 @@ import BookingList from "../../../info/service/editService/BookingList";
 import dayjs from "dayjs";
 import { createBookingItemsByGroup, getGroupTotalPrice } from "../../../info/service2/Group/utils";
 import { getOpenNormalServiceHandler } from "../openNormalService";
-import Decimal from 'decimal.js';
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import useCartChangeEffect from "../../../../ticketBooking/hooks/pisellos/useCartChangeEffect";
+import { updateMainProductSellingPrice } from "../../../info/service/serviceManager/distributeDiscount";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _context$appHelper, _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI7, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI12, _state$bookingConfig5, _state$service$cacheI13, _state$service$cacheI14, _state$service9, _state$service$resour2, _state$service$cacheI16, _state$service$cacheI18, _state$client2;
@@ -316,28 +316,7 @@ var Info = function Info(_, ref) {
       _extend.endDate = endDate;
     }
     if (isChangeTotal.current) {
-      var _extend$other, _extend$other2;
-      // 计算折扣比例
-      var discountRatio = new Decimal(values.total).div(_item._extend.origin_total);
-
-      // 处理子商品
-      var _bundles = (_extend === null || _extend === void 0 || (_extend$other = _extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.bundle) || [];
-      var childProductsTotal = new Decimal(0);
-      if (_bundles.length > 0) {
-        _bundles.forEach(function (bundle) {
-          // 计算子商品折扣后的单价（保留两位小数）
-          var discountedPrice = new Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-          bundle.bundle_selling_price = discountedPrice.toNumber();
-
-          // 累计子商品折扣后总价
-          childProductsTotal = childProductsTotal.add(discountedPrice.mul(bundle.quantity));
-        });
-      }
-
-      // 计算主商品折扣后的单价
-      var mainProductTotal = new Decimal(values.total).sub(childProductsTotal);
-      var mainProductQuantity = ((_extend$other2 = _extend.other) === null || _extend$other2 === void 0 ? void 0 : _extend$other2.quantity) || _extend.quantity || 1;
-      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+      updateMainProductSellingPrice(_extend);
     }
     if (_extend.bundle_edit !== undefined) {
       _extend.bundle_edit = 1;

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/eventBooking/components/ErrorTip/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CallToBookProps = {
     show: boolean;

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

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

@@ -22,7 +22,7 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
     order_id: string;
     payment_group_id: number;
     payments: {
-        amount: string | number;
+        amount: string | number | undefined;
         wallet_pass_use_value: any;
         voucher_id: any;
         tag: any;
@@ -48,7 +48,7 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
  */
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
-export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string | number;
+export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string | number | undefined;
 export declare const clientPayment: (params: {
     order_id: number;
     type: "aliPay" | "wxPay" | 'google_pay';

package/es/components/shoppingCart/components/Empty/index.d.ts

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

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" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/plus/orderList/config.d.ts

@@ -9,7 +9,7 @@ export declare const getTableColumns: (locales: any) => ({
     dataIndex: string;
     key: string;
     width: number;
-    render: (value: any, record: any) => React.JSX.Element | "-";
+    render: (value: any, record: any) => "-" | React.JSX.Element;
     isShow?: undefined;
 } | {
     title: any;
@@ -38,7 +38,7 @@ export declare const getTableColumns: (locales: any) => ({
     key: string;
     isShow: boolean;
     width: number;
-    render: (value: any) => React.JSX.Element | "-";
+    render: (value: any) => "-" | React.JSX.Element;
 })[];
 export declare const getQuickFilterList: (locales: any) => ({
     name: string;

package/es/plus/pisellSalesManagement/config/booking.d.ts

@@ -19,7 +19,7 @@ export declare const getFilterButtonList: () => ({
         }[];
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        component?: undefined;
+        readonly component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -45,7 +45,7 @@ export declare const getFilterButtonList: () => ({
         mode?: undefined;
         maxTagCount?: undefined;
         options?: undefined;
-        component?: undefined;
+        readonly component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -90,7 +90,7 @@ export declare const getFilterButtonList: () => ({
         options: () => Promise<any>;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        component?: undefined;
+        readonly component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -110,7 +110,7 @@ export declare const getFilterButtonList: () => ({
         options?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        component?: undefined;
+        readonly component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
         showTime?: undefined;
@@ -132,7 +132,7 @@ export declare const getFilterButtonList: () => ({
         maxTagCount?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        component?: undefined;
+        readonly component?: undefined;
         showTime?: undefined;
     };
     sort?: undefined;
@@ -151,7 +151,7 @@ export declare const getFilterButtonList: () => ({
         options?: undefined;
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
-        component?: undefined;
+        readonly component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
     };

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/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/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/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/selectHolder/components/ErrorTip/index.d.ts

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

package/es/pro/Selector/Selector.d.ts

@@ -3,7 +3,7 @@ import { ItemLayout, ItemProps, PresetConfig, SelectorProps, SelectorVariant } f
 import './selector.less';
 export declare const SelectorContext: React.Context<{
     disabled?: boolean | undefined;
-    mode?: "multiple" | "single" | undefined;
+    mode?: "single" | "multiple" | undefined;
     itemLayout?: ItemLayout | undefined;
     valueType?: "object" | "primitive" | undefined;
     variant?: SelectorVariant | undefined;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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/service/serviceManager/distributeDiscount.d.ts

@@ -5,6 +5,11 @@ interface Product {
         total: number;
     };
 }
+/**
+ * 根据 total 与 origin_total 的折扣比例，重新计算主商品单价 main_product_selling_price
+ * 如果存在子商品(bundle)，会先按折扣比例计算子商品总价，再用总价减去子商品总价得到主商品总价
+ */
+export declare function updateMainProductSellingPrice(extend: any): void;
 export declare function distributeDiscountOrIncrease(products: Product[], // 商品列表
 totalAdjustment: number, // 总折扣或加价金额，可能为负数（折扣）或正数（加价）
 totalPrice: number): Product[];

package/lib/components/booking/info/service/serviceManager/distributeDiscount.js

@@ -29,10 +29,29 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/info/service/serviceManager/distributeDiscount.ts
 var distributeDiscount_exports = {};
 __export(distributeDiscount_exports, {
-  distributeDiscountOrIncrease: () => distributeDiscountOrIncrease
+  distributeDiscountOrIncrease: () => distributeDiscountOrIncrease,
+  updateMainProductSellingPrice: () => updateMainProductSellingPrice
 });
 module.exports = __toCommonJS(distributeDiscount_exports);
 var import_decimal = __toESM(require("decimal.js"));
+function updateMainProductSellingPrice(extend) {
+  var _a, _b;
+  const bundles = ((_a = extend == null ? void 0 : extend.other) == null ? void 0 : _a.bundle) || [];
+  let childProductsTotal = new import_decimal.default(0);
+  if (bundles.length > 0) {
+    const discountRatio = new import_decimal.default(extend.total).div(extend.origin_total);
+    bundles.forEach((bundle) => {
+      const discountedPrice = new import_decimal.default(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+      bundle.bundle_selling_price = discountedPrice.toNumber();
+      childProductsTotal = childProductsTotal.add(
+        discountedPrice.mul(bundle.quantity)
+      );
+    });
+  }
+  const mainProductTotal = new import_decimal.default(extend.total).sub(childProductsTotal);
+  const mainProductQuantity = ((_b = extend.other) == null ? void 0 : _b.quantity) || extend.quantity || 1;
+  extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+}
 function distributeDiscountOrIncrease(products, totalAdjustment, totalPrice) {
   const totalAdjustmentDecimal = new import_decimal.default(totalAdjustment);
   let totalAdjustmentApplied = new import_decimal.default(0);
@@ -42,12 +61,14 @@ function distributeDiscountOrIncrease(products, totalAdjustment, totalPrice) {
     let adjustmentAmount = productPrice.div(totalPrice).times(totalAdjustmentDecimal).toFixed(2, import_decimal.default.ROUND_HALF_UP);
     const newPrice = productPrice.plus(adjustmentAmount).toFixed(2, import_decimal.default.ROUND_HALF_UP);
     const adjustedPrice = new import_decimal.default(newPrice).lessThan(0) ? "0.00" : newPrice;
+    const newExtend = {
+      ...product._extend,
+      total: parseFloat(adjustedPrice)
+    };
+    updateMainProductSellingPrice(newExtend);
     adjustedProducts.push({
       ...product,
-      _extend: {
-        ...product._extend,
-        total: parseFloat(adjustedPrice)
-      }
+      _extend: newExtend
     });
     totalAdjustmentApplied = totalAdjustmentApplied.plus(new import_decimal.default(adjustmentAmount));
   });
@@ -61,10 +82,12 @@ function distributeDiscountOrIncrease(products, totalAdjustment, totalPrice) {
     let lastPrice = new import_decimal.default(lastProduct._extend.total).plus(adjustmentDifference).toFixed(2, import_decimal.default.ROUND_HALF_UP);
     lastPrice = new import_decimal.default(lastPrice).lessThan(0) ? "0.00" : lastPrice;
     lastProduct._extend.total = parseFloat(lastPrice);
+    updateMainProductSellingPrice(lastProduct._extend);
   }
   return adjustedProducts;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  distributeDiscountOrIncrease
+  distributeDiscountOrIncrease,
+  updateMainProductSellingPrice
 });

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

@@ -32,6 +32,7 @@ var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../../utils");
 var import_distributeDiscount = require("../../service/serviceManager/distributeDiscount");
 var import_utils3 = require("../../../../ticketBooking/utils");
+var import_utils4 = require("../../../info2/service/editService/utils");
 var getGroupTotalPrice = (items) => {
   return items.reduce((prev, next) => {
     prev.duration += next._extend.duration;
@@ -108,6 +109,13 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     const discountAmount = (groupOriginTotalPrice - groupTotalPrice) * -1;
     if (discountAmount !== 0) {
       bookings = (0, import_distributeDiscount.distributeDiscountOrIncrease)(bookings, discountAmount, groupOriginTotalPrice);
+      bookings = bookings.map((booking) => {
+        var _a2, _b2;
+        return (0, import_utils4.setProductPrice)(booking, {
+          newTotal: (_a2 = booking == null ? void 0 : booking._extend) == null ? void 0 : _a2.total,
+          origin_total: (_b2 = booking == null ? void 0 : booking._extend) == null ? void 0 : _b2.origin_total
+        });
+      });
     }
   }
   console.log("bookings", bookings);

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

@@ -216,7 +216,7 @@ 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[];
 /**
  * @description: 根据_id和sourceProductId来获取主商品已选择的赠品
  * @param {string} productId 主商品_id

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;

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

@@ -62,9 +62,9 @@ var import_BookingList = __toESM(require("../../../info/service/editService/Book
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils9 = require("../../../info/service2/Group/utils");
 var import_openNormalService = require("../openNormalService");
-var import_decimal = __toESM(require("decimal.js"));
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_useCartChangeEffect = __toESM(require("../../../../ticketBooking/hooks/pisellos/useCartChangeEffect"));
+var import_distributeDiscount = require("../../../info/service/serviceManager/distributeDiscount");
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L;
@@ -210,7 +210,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -246,21 +246,7 @@ var Info = (_, ref) => {
       _extend.endDate = endDate;
     }
     if (isChangeTotal.current) {
-      const discountRatio = new import_decimal.default(values.total).div(_item._extend.origin_total);
-      const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
-      let childProductsTotal = new import_decimal.default(0);
-      if (bundles2.length > 0) {
-        bundles2.forEach((bundle) => {
-          const discountedPrice = new import_decimal.default(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
-          bundle.bundle_selling_price = discountedPrice.toNumber();
-          childProductsTotal = childProductsTotal.add(
-            discountedPrice.mul(bundle.quantity)
-          );
-        });
-      }
-      const mainProductTotal = new import_decimal.default(values.total).sub(childProductsTotal);
-      const mainProductQuantity = ((_d2 = _extend.other) == null ? void 0 : _d2.quantity) || _extend.quantity || 1;
-      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+      (0, import_distributeDiscount.updateMainProductSellingPrice)(_extend);
     }
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
@@ -269,7 +255,7 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     _item._holderKey = (0, import_utils3.genHolderKey)(_item);
-    if (((_f2 = (_e2 = _item._extend) == null ? void 0 : _e2.holder_id) == null ? void 0 : _f2.length) > 1 || ((_g2 = _item._extend) == null ? void 0 : _g2.quantity) > 1 && ((_i2 = (_h2 = _item._extend) == null ? void 0 : _h2.holder_id) == null ? void 0 : _i2.length) >= 1) {
+    if (((_d2 = (_c2 = _item._extend) == null ? void 0 : _c2.holder_id) == null ? void 0 : _d2.length) > 1 || ((_e2 = _item._extend) == null ? void 0 : _e2.quantity) > 1 && ((_g2 = (_f2 = _item._extend) == null ? void 0 : _f2.holder_id) == null ? void 0 : _g2.length) >= 1) {
       let holder_ids = _item._extend.holder_id;
       _item._extend.holder_id = holder_ids[0];
       holder_ids = holder_ids.slice(1);
@@ -288,7 +274,7 @@ var Info = (_, ref) => {
       }
     }
     let _id = _item == null ? void 0 : _item._id;
-    let groupId = (_j2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _j2.groupId;
+    let groupId = (_h2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _h2.groupId;
     if (groupId) {
       _list = _list.filter((d) => {
         var _a3;
@@ -298,7 +284,7 @@ var Info = (_, ref) => {
     } else {
       _item = (0, import_utils8.setProductPrice)(_item, {
         newTotal: values.total,
-        origin_total: (_k2 = _item._extend) == null ? void 0 : _k2.origin_total
+        origin_total: (_i2 = _item._extend) == null ? void 0 : _i2.origin_total
       });
       if (!_list.some((d) => d._id === _id)) {
         const detail = (0, import_utils3.addService)(_list, _item, state);
@@ -313,7 +299,7 @@ var Info = (_, ref) => {
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_l2 = state.service.cacheItem) == null ? void 0 : _l2.new)) {
+    if (!!((_j2 = state.service.cacheItem) == null ? void 0 : _j2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -322,7 +308,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_m2 = window.closeBookingEditModal) == null ? void 0 : _m2.call(window);
+    (_k2 = window.closeBookingEditModal) == null ? void 0 : _k2.call(window);
     _list.sort((a, b) => {
       var _a3, _b3;
       const aHasHolderId = ((_a3 = a._extend) == null ? void 0 : _a3.holder_id) && (Array.isArray(a._extend.holder_id) ? a._extend.holder_id.length > 0 : true);

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