@pisell/pisellos 2.1.45 → 2.1.47

package/lib/modules/Rules/types.d.ts

@@ -40,6 +40,7 @@ type ProductDetail = {
     num?: number;
     quantity: number;
     vouchersApplicable?: boolean;
+    startDate?: any;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;
@@ -50,8 +51,10 @@ export interface RulesParamsHooks {
         origin_total?: number;
         price?: string | number;
         variant?: any[];
-        original_price?: number;
+        original_price?: number | string;
         quantity?: number;
+        bundle?: any[];
+        main_product_selling_price?: string | number;
     }) => Record<string, any>;
 }
 export {};

package/lib/solution/BookingByStep/index.js

@@ -1619,6 +1619,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
+    this.core.effects.emit(
+      `${this.store.cart.name}:onUpdateBookingDate`,
+      {}
+    );
   }
   getScheduleDataByIds(scheduleIds) {
     const targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);

package/lib/solution/BookingTicket/index.js

@@ -122,12 +122,6 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  /**
-   * 初始化外设扫码结果监听
-   */
-  initPeripheralsListener() {
-    this.scan.initPeripheralsListener();
-  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表

package/lib/solution/Checkout/index.d.ts

@@ -48,6 +48,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 初始化结账流程
      */
     initializeCheckoutAsync(params: CheckoutInitParams): Promise<void>;
+    getHolderIdFromBooking(obj: any): number | undefined;
     getProductListByOrder(): {
         product_id: number;
         product_variant_id: string;

package/lib/solution/Checkout/index.js

@@ -196,6 +196,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  getHolderIdFromBooking(obj) {
+    var _a;
+    if (!obj)
+      return void 0;
+    let ret = obj.holder_id || ((_a = obj.holder) == null ? void 0 : _a.form_record);
+    if (Array.isArray(ret)) {
+      return ret.length > 0 ? Number(ret[0]) : void 0;
+    }
+    return Number(ret) || void 0;
+  }
   getProductListByOrder() {
     var _a, _b, _c, _d, _e;
     if (!this.store.currentOrder) {
@@ -206,22 +216,54 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return pre + (item.amount || 0);
       }, 0);
     };
-    const productList = ((_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings) == null ? void 0 : _b.map(
-      (item) => ({
-        product_id: item.product.product_id,
-        product_variant_id: item.product.product_variant_id,
-        quantity: item.product.num,
-        selling_price: item.product.calculated_selling_price
-      })
-    )) || [];
-    const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map(
-      (item) => ({
-        product_id: item.product_id,
-        product_variant_id: item.product_variant_id,
-        quantity: item.num,
-        selling_price: item.source_product_price
-      })
-    )) || [];
+    const formatProduct = (items) => {
+      return items.map(
+        (item) => ({
+          product_id: item.product_id,
+          product_variant_id: item.product_variant_id,
+          quantity: item.num,
+          // 商品是否含税：1；0
+          is_charge_tax: item.is_charge_tax ?? 0,
+          // 若商品不含税，计算得到的税费，单位（元）
+          tax_fee: item.tax_fee,
+          // 整个商品折扣后的总金额
+          selling_price: item.calculated_selling_price,
+          // 使用者id
+          holder_id: item.holder_id,
+          // 整个商品折扣前的总金额
+          original_price: item.calculated_original_price,
+          // 主商品折扣前金额，不包含套餐子商品
+          main_product_original_price: item.price,
+          // 主商品折扣后金额，不包含套餐子商品
+          main_product_selling_price: item.main_product_selling_price,
+          product_bundle: item.product_bundle.map((bundle) => {
+            return {
+              bundle_id: bundle.bundle_id,
+              bundle_product_id: bundle.bundle_product_id,
+              bundle_variant_id: bundle.bundle_variant_id,
+              price_type: bundle.price_type,
+              price_type_ext: bundle.price_type_ext,
+              // 套餐子商品总价，不包含折扣金额
+              bundle_sum_price: bundle.bundle_sum_price,
+              // 套餐子商品折扣后金额
+              bundle_selling_price: bundle.bundle_selling_price,
+              num: bundle.num
+            };
+          })
+        })
+      ) || [];
+    };
+    const productList = formatProduct(
+      ((_c = (_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.map(
+        (item) => {
+          return {
+            ...item.product,
+            holder_id: this.getHolderIdFromBooking(item)
+          };
+        }
+      )) || []
+    );
+    const relationProducts = formatProduct(((_e = (_d = this.store.currentOrder.order_info) == null ? void 0 : _d.original_order_data) == null ? void 0 : _e.relation_products) || []);
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {

package/lib/solution/ShopDiscount/index.d.ts

@@ -18,6 +18,8 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private initializePlugins;
     private registerDependentModules;
     private registerEventListeners;
+    getCurrentBookingTime(): string | null;
+    private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];

package/lib/solution/ShopDiscount/index.js

@@ -36,6 +36,7 @@ module.exports = __toCommonJS(ShopDiscount_exports);
 var import_BaseModule = require("../../modules/BaseModule");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
+var import_utils = require("./utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
@@ -50,7 +51,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       productList: [],
       discount: null,
       rules: null,
-      originalDiscountList: []
+      originalDiscountList: [],
+      currentBookingTime: "",
+      filteredDiscountList: []
     };
   }
   // =========== 生命周期方法 ===========
@@ -139,6 +142,44 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     );
   }
   // =========== 公共 API ===========
+  // 设置预约时间
+  // public async setBookingTime(bookingTime: string | null): Promise<void> {
+  //   if (this.store.currentBookingTime !== bookingTime) {
+  //     this.store.currentBookingTime = bookingTime;
+  //
+  //     // 更新过滤后的优惠券列表
+  //     await this.updateFilteredDiscountList();
+  //   }
+  // }
+  // 获取当前预约时间
+  getCurrentBookingTime() {
+    return this.store.currentBookingTime;
+  }
+  // 根据预约时间过滤优惠券列表
+  filterDiscountListByBookingTime(discountList, bookingTime) {
+    if ((0, import_utils.isAllNormalProduct)(this.store.productList || [])) {
+      return discountList;
+    }
+    return (0, import_utils.filterDiscountListByBookingTime)(discountList, bookingTime);
+  }
+  // 更新过滤后的优惠券列表
+  // private async updateFilteredDiscountList(): Promise<void> {
+  //   const originalList = this.store.originalDiscountList;
+  //   const filteredList = this.filterDiscountListByBookingTime(originalList, this.store.currentBookingTime);
+  //
+  //   this.store.filteredDiscountList = filteredList;
+  //
+  //   // 更新 DiscountModule 中的优惠券列表
+  //   this.setDiscountList(filteredList);
+  //
+  //   if (this.store.productList?.length) {
+  //     const result = this.calcDiscount(this.store.productList);
+  //     await this.core.effects.emit(
+  //       ShopDiscountHooks.onLoadPrepareCalcResult,
+  //       result,
+  //     );
+  //   }
+  // }
   // 设置客户
   async setCustomer(customer) {
     var _a;
@@ -324,7 +365,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -335,7 +376,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),
+                savedAmount: discount.amount * ((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1),
                 isAvailable: true,
                 id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
                 format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
@@ -355,15 +396,17 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const isProductFree = (id) => {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
+      if (!targetProduct)
+        return false;
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
       return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
     };
-    const allUsedProductIds = newDiscountList.map((n) => {
+    const allUsedProductIds = newDiscountList.filter((item) => !(item == null ? void 0 : item.isEditMode)).map((n) => {
       var _a2;
-      return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
+      return n.isSelected ? ((_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
         var _a3;
         return (_a3 = n2.discount) == null ? void 0 : _a3.product_id;
-      }) : [];
+      })) || n.product_id : [];
     }).flat();
     newDiscountList.forEach((item) => {
       var _a2;
@@ -425,7 +468,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 加载准备配置
   async loadPrepareConfig(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     try {
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
@@ -441,8 +484,11 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
       const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
       this.store.originalDiscountList = newDiscountList;
-      this.setDiscountList(newDiscountList || []);
-      if ((_d = this.store.productList) == null ? void 0 : _d.length) {
+      await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(newDiscountList));
+      const filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+      this.store.filteredDiscountList = filteredDiscountList;
+      this.setDiscountList(filteredDiscountList || []);
+      if ((_e = this.store.productList) == null ? void 0 : _e.length) {
         const result = this.calcDiscount(this.store.productList);
         await this.core.effects.emit(
           `${this.name}:onLoadPrepareCalcResult`,
@@ -451,7 +497,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }
       await this.core.effects.emit(
         `${this.name}:onLoadDiscountList`,
-        newDiscountList
+        filteredDiscountList
       );
     } catch (error) {
       console.error("[ShopDiscount] 加载准备配置出错:", error);

package/lib/solution/ShopDiscount/types.d.ts

@@ -1,5 +1,6 @@
-import { DiscountModule, Discount } from '../../modules/Discount';
+import { DiscountModule } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
+import { Discount } from "../../modules/Discount/types";
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
     onDestroy = "shopDiscount:onDestroy",
@@ -23,6 +24,8 @@ export interface ShopDiscountState {
     rules: RulesModule | null;
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
+    currentBookingTime: string | null;
+    filteredDiscountList: Discount[];
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/lib/solution/ShopDiscount/utils.d.ts

@@ -1,5 +1,7 @@
 import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
+export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
+export declare const isAllNormalProduct: (items: any[]) => boolean;
 /**
  * 获取折扣金额 基于折扣卡类型计算
  * 商品券：直接返回商品价格
@@ -10,3 +12,56 @@ export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
+/**
+ * 获取折扣金额 计算每个折扣的金额
+ * @param discount
+ * @returns
+ */
+export declare const getDiscountListAmount: (discount: Discount[]) => any;
+export interface ScheduleItem {
+    id: number;
+    name: string | {
+        [key: string]: string;
+    };
+    type: 'standard' | 'time-slots' | 'designation';
+    start_time: string | null;
+    end_time: string | null;
+    repeat_type: 'none' | 'daily' | 'weekly';
+    repeat_rule: {
+        end: {
+            type: 'never' | 'date' | 'occurrence';
+            end_date: string | null;
+            occurrence: number | null;
+        };
+        frequency: number;
+        excluded_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        included_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        frequency_date: number[];
+    } | null;
+    designation: Array<{
+        start_date: string;
+        start_time: string;
+        end_date: string;
+        end_time: string;
+    }> | null;
+    is_all: number;
+    time_slot: Array<{
+        start_time: string;
+        end_time: string;
+    }>;
+}
+export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
+/**
+ * 根据预约时间过滤优惠券列表
+ * @param discountList 优惠券列表
+ * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @returns 过滤后的优惠券列表
+ */
+export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];

package/lib/solution/ShopDiscount/utils.js

@@ -29,28 +29,282 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/ShopDiscount/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  filterDiscountListByBookingTime: () => filterDiscountListByBookingTime,
+  getDateIsInSchedule: () => getDateIsInSchedule,
   getDiscountAmount: () => getDiscountAmount,
+  getDiscountListAmount: () => getDiscountListAmount,
+  getDiscountListAmountTotal: () => getDiscountListAmountTotal,
+  isAllNormalProduct: () => isAllNormalProduct,
+  isNormalProductByDurationSchedule: () => isNormalProductByDurationSchedule,
   uniqueById: () => uniqueById
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
+var import_dayjs = __toESM(require("dayjs"));
 var uniqueById = (arr, key = "id") => {
   const seen = /* @__PURE__ */ new Set();
   return arr.filter((item) => !seen.has(item[key]) && seen.add(item[key]));
 };
+var isNormalProductByDurationSchedule = (item) => {
+  var _a, _b;
+  return !(item == null ? void 0 : item.duration) && !((_a = item == null ? void 0 : item.schedules) == null ? void 0 : _a.length) && !((_b = item == null ? void 0 : item["schedule.ids"]) == null ? void 0 : _b.length);
+};
+var isAllNormalProduct = (items) => {
+  return items.every((item) => isNormalProductByDurationSchedule(item));
+};
 var getDiscountAmount = (discount, total, price) => {
   var _a;
   if (discount.tag === "good_pass") {
-    return new import_decimal.default(total).minus(new import_decimal.default(price || 0)).toNumber();
+    return new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
   }
   const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
   if (isFixedAmount) {
-    return Math.max(new import_decimal.default(total).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+    return Math.max(new import_decimal.default(price).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+  }
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
+};
+var getDiscountListAmountTotal = (discount) => {
+  return discount.reduce((acc, cur) => {
+    return new import_decimal.default(acc).plus(new import_decimal.default(cur.num || 1).mul(new import_decimal.default(cur.amount || 0))).toNumber();
+  }, new import_decimal.default(0));
+};
+var getDiscountListAmount = (discount) => {
+  return discount.reduce((acc, cur) => {
+    return new import_decimal.default(acc).plus(new import_decimal.default(cur.amount || 0)).toNumber();
+  }, new import_decimal.default(0));
+};
+var getDateIsInSchedule = (dateTime, scheduleList) => {
+  if (!dateTime || !scheduleList || scheduleList.length === 0) {
+    return false;
+  }
+  const targetDate = (0, import_dayjs.default)(dateTime);
+  if (!targetDate.isValid()) {
+    return false;
+  }
+  for (const schedule of scheduleList) {
+    if (isTimeInScheduleItem(dateTime, schedule)) {
+      return true;
+    }
+  }
+  return false;
+};
+var isTimeInScheduleItem = (dateTime, schedule) => {
+  const targetDate = (0, import_dayjs.default)(dateTime);
+  const targetDateString = dateTime.split(" ")[0];
+  const targetTimeString = dateTime.split(" ")[1] || "00:00:00";
+  switch (schedule.type) {
+    case "standard":
+      return isInStandardSchedule(targetDate, targetDateString, targetTimeString, schedule);
+    case "time-slots":
+      return isInTimeSlotsSchedule(targetDate, targetDateString, targetTimeString, schedule);
+    case "designation":
+      return isInDesignationSchedule(targetDate, targetDateString, targetTimeString, schedule);
+    default:
+      return false;
+  }
+};
+var isInStandardSchedule = (targetDate, targetDateString, targetTimeString, schedule) => {
+  if (!schedule.start_time || !schedule.end_time) {
+    return false;
+  }
+  const startDate = (0, import_dayjs.default)(schedule.start_time);
+  const endDate = (0, import_dayjs.default)(schedule.end_time);
+  const isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate);
+  if (schedule.repeat_type === "none") {
+    return isInBasicRange;
+  }
+  return isInRepeatingSchedule(targetDate, targetDateString, targetTimeString, schedule, startDate, endDate);
+};
+var isInTimeSlotsSchedule = (targetDate, targetDateString, targetTimeString, schedule) => {
+  if (!schedule.start_time) {
+    return false;
+  }
+  if (schedule.repeat_type === "none") {
+    const scheduleDate = schedule.start_time.split(" ")[0];
+    if (targetDateString !== scheduleDate) {
+      return false;
+    }
+    return checkTimeSlotsForDate(targetDate, targetDateString, schedule.time_slot);
+  }
+  return isInTimeSlotsRepeatingSchedule(targetDate, targetDateString, targetTimeString, schedule);
+};
+var isInDesignationSchedule = (targetDate, targetDateString, targetTimeString, schedule) => {
+  if (!schedule.designation) {
+    return false;
+  }
+  for (const designation of schedule.designation) {
+    const startDateTime = `${designation.start_date} ${designation.start_time}:00`;
+    const endDateTime = `${designation.end_date} ${designation.end_time}:00`;
+    const startDate = (0, import_dayjs.default)(startDateTime);
+    const endDate = (0, import_dayjs.default)(endDateTime);
+    if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
+      return true;
+    }
+  }
+  return false;
+};
+var isInRepeatingSchedule = (targetDate, targetDateString, targetTimeString, schedule, startDate, endDate) => {
+  if (!schedule.repeat_rule) {
+    return false;
+  }
+  const { repeat_rule, repeat_type } = schedule;
+  const targetDateOnly = (0, import_dayjs.default)(targetDateString);
+  if (repeat_rule.included_date && repeat_rule.included_date.length > 0) {
+    for (const includedDate of repeat_rule.included_date) {
+      const includeStartDate = (0, import_dayjs.default)(includedDate.start);
+      const includeEndDate = (0, import_dayjs.default)(includedDate.end);
+      if (targetDateOnly.isSameOrAfter(includeStartDate, "day") && targetDateOnly.isSameOrBefore(includeEndDate, "day")) {
+        return true;
+      }
+    }
+  }
+  for (const excludedDate of repeat_rule.excluded_date) {
+    const excludeStartDate = (0, import_dayjs.default)(excludedDate.start);
+    const excludeEndDate = (0, import_dayjs.default)(excludedDate.end);
+    if (targetDateOnly.isSameOrAfter(excludeStartDate, "day") && targetDateOnly.isSameOrBefore(excludeEndDate, "day")) {
+      return false;
+    }
+  }
+  if (repeat_rule.end.type === "date" && repeat_rule.end.end_date) {
+    const ruleEndDate = (0, import_dayjs.default)(repeat_rule.end.end_date);
+    if (targetDate.isAfter(ruleEndDate)) {
+      return false;
+    }
+  }
+  switch (repeat_type) {
+    case "daily":
+      return isInDailyRepeat(targetDate, startDate, endDate, repeat_rule);
+    case "weekly":
+      return isInWeeklyRepeat(targetDate, startDate, endDate, repeat_rule);
+    default:
+      return false;
+  }
+};
+var isInDailyRepeat = (targetDate, startDate, endDate, repeatRule) => {
+  const daysDiff = targetDate.diff(startDate, "day");
+  if (daysDiff < 0) {
+    return false;
+  }
+  if (daysDiff % repeatRule.frequency !== 0) {
+    return false;
+  }
+  const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
+  const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
+  const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+};
+var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
+  const targetDayOfWeek = targetDate.day();
+  if (!repeatRule.frequency_date.includes(targetDayOfWeek)) {
+    return false;
+  }
+  const weeksDiff = targetDate.diff(startDate, "week");
+  if (weeksDiff < 0) {
+    return false;
+  }
+  if (weeksDiff % repeatRule.frequency !== 0) {
+    return false;
+  }
+  const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
+  const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
+  const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+};
+var isInTimeSlotsRepeatingSchedule = (targetDate, targetDateString, targetTimeString, schedule) => {
+  if (!schedule.repeat_rule || !schedule.start_time) {
+    return false;
+  }
+  const { repeat_rule, repeat_type } = schedule;
+  const startDate = (0, import_dayjs.default)(schedule.start_time);
+  const targetDateOnly = (0, import_dayjs.default)(targetDateString);
+  if (repeat_rule.included_date && repeat_rule.included_date.length > 0) {
+    for (const includedDate of repeat_rule.included_date) {
+      const includeStartDate = (0, import_dayjs.default)(includedDate.start);
+      const includeEndDate = (0, import_dayjs.default)(includedDate.end);
+      if (targetDateOnly.isSameOrAfter(includeStartDate, "day") && targetDateOnly.isSameOrBefore(includeEndDate, "day")) {
+        return checkTimeSlotsForDate(targetDate, targetDateString, schedule.time_slot);
+      }
+    }
+  }
+  for (const excludedDate of repeat_rule.excluded_date) {
+    const excludeStartDate = (0, import_dayjs.default)(excludedDate.start);
+    const excludeEndDate = (0, import_dayjs.default)(excludedDate.end);
+    if (targetDateOnly.isSameOrAfter(excludeStartDate, "day") && targetDateOnly.isSameOrBefore(excludeEndDate, "day")) {
+      return false;
+    }
+  }
+  if (repeat_rule.end.type === "date" && repeat_rule.end.end_date) {
+    const ruleEndDate = (0, import_dayjs.default)(repeat_rule.end.end_date);
+    if (targetDateOnly.isAfter(ruleEndDate, "day")) {
+      return false;
+    }
+  }
+  let isDateValid = false;
+  switch (repeat_type) {
+    case "daily":
+      isDateValid = isInDailyRepeatForDate(targetDateOnly, startDate, repeat_rule);
+      break;
+    case "weekly":
+      isDateValid = isInWeeklyRepeatForDate(targetDateOnly, startDate, repeat_rule);
+      break;
+    default:
+      return false;
+  }
+  if (isDateValid) {
+    return checkTimeSlotsForDate(targetDate, targetDateString, schedule.time_slot);
+  }
+  return false;
+};
+var checkTimeSlotsForDate = (targetDate, targetDateString, timeSlots) => {
+  for (const timeSlot of timeSlots) {
+    const slotStart = `${targetDateString} ${timeSlot.start_time}:00`;
+    const slotEnd = `${targetDateString} ${timeSlot.end_time}:00`;
+    const slotStartDate = (0, import_dayjs.default)(slotStart);
+    const slotEndDate = (0, import_dayjs.default)(slotEnd);
+    if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
+      return true;
+    }
+  }
+  return false;
+};
+var isInDailyRepeatForDate = (targetDate, startDate, repeatRule) => {
+  const daysDiff = targetDate.diff(startDate, "day");
+  if (daysDiff < 0) {
+    return false;
+  }
+  return daysDiff % repeatRule.frequency === 0;
+};
+var isInWeeklyRepeatForDate = (targetDate, startDate, repeatRule) => {
+  const targetDayOfWeek = targetDate.day();
+  if (!repeatRule.frequency_date.includes(targetDayOfWeek)) {
+    return false;
+  }
+  const weeksDiff = targetDate.diff(startDate, "week");
+  if (weeksDiff < 0) {
+    return false;
+  }
+  return weeksDiff % repeatRule.frequency === 0;
+};
+var filterDiscountListByBookingTime = (discountList, bookingTime) => {
+  if (!bookingTime) {
+    return discountList;
   }
-  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(total)).toNumber();
+  return discountList.filter((discount) => {
+    var _a, _b, _c;
+    if (!((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.validity_type) || ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.validity_type) === "fixed_validity") {
+      return true;
+    }
+    return getDateIsInSchedule(bookingTime, ((_c = discount.custom_schedule_snapshot) == null ? void 0 : _c.data) || []);
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  filterDiscountListByBookingTime,
+  getDateIsInSchedule,
   getDiscountAmount,
+  getDiscountListAmount,
+  getDiscountListAmountTotal,
+  isAllNormalProduct,
+  isNormalProductByDurationSchedule,
   uniqueById
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.45",
+  "version": "2.1.47",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",