@pisell/pisellos 1.0.85 → 1.0.87

package/dist/solution/ShopDiscount/utils.js

@@ -1,4 +1,8 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import Decimal from "decimal.js";
+import dayjs from "dayjs";
 export var uniqueById = function uniqueById(arr) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
@@ -7,6 +11,19 @@ export var uniqueById = function uniqueById(arr) {
   });
 };
 
+// 非预约商品 通过时长和日程判断是否是普通商品
+export var isNormalProductByDurationSchedule = function isNormalProductByDurationSchedule(item) {
+  var _item$schedules, _item$scheduleIds;
+  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !(item !== null && item !== void 0 && (_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
+};
+
+// 是否全部是普通商品
+export var isAllNormalProduct = function isAllNormalProduct(items) {
+  return items.every(function (item) {
+    return isNormalProductByDurationSchedule(item);
+  });
+};
+
 /**
  * 获取折扣金额 基于折扣卡类型计算 
  * 商品券：直接返回商品价格
@@ -42,11 +59,393 @@ export var getDiscountListAmountTotal = function getDiscountListAmountTotal(disc
 
 /**
  * 获取折扣金额 计算每个折扣的金额
- * @param discount 
- * @returns 
+ * @param discount
+ * @returns
  */
 export var getDiscountListAmount = function getDiscountListAmount(discount) {
   return discount.reduce(function (acc, cur) {
     return new Decimal(acc).plus(new Decimal(cur.amount || 0)).toNumber();
   }, new Decimal(0));
+};
+
+// 日程项接口定义
+
+// 获取时间是否在日程范围内
+export var getDateIsInSchedule = function getDateIsInSchedule(dateTime, scheduleList) {
+  if (!dateTime || !scheduleList || scheduleList.length === 0) {
+    return false;
+  }
+  var targetDate = dayjs(dateTime);
+  if (!targetDate.isValid()) {
+    return false;
+  }
+
+  // 遍历所有日程项
+  var _iterator = _createForOfIteratorHelper(scheduleList),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var schedule = _step.value;
+      if (isTimeInScheduleItem(dateTime, schedule)) {
+        return true;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return false;
+};
+
+// 判断时间是否在单个日程项范围内
+var isTimeInScheduleItem = function isTimeInScheduleItem(dateTime, schedule) {
+  var targetDate = dayjs(dateTime);
+  var targetDateString = dateTime.split(' ')[0]; // YYYY-MM-DD
+  var targetTimeString = dateTime.split(' ')[1] || '00:00:00'; // HH:mm:ss
+
+  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 = function isInStandardSchedule(targetDate, targetDateString, targetTimeString, schedule) {
+  if (!schedule.start_time || !schedule.end_time) {
+    return false;
+  }
+  var startDate = dayjs(schedule.start_time);
+  var endDate = dayjs(schedule.end_time);
+
+  // 先检查是否在基础时间范围内（不考虑重复）
+  var isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate);
+  if (schedule.repeat_type === 'none') {
+    return isInBasicRange;
+  }
+
+  // 处理重复日程
+  return isInRepeatingSchedule(targetDate, targetDateString, targetTimeString, schedule, startDate, endDate);
+};
+
+// 处理时间段类型日程
+var isInTimeSlotsSchedule = function isInTimeSlotsSchedule(targetDate, targetDateString, targetTimeString, schedule) {
+  if (!schedule.start_time) {
+    return false;
+  }
+
+  // 如果不重复，使用原有逻辑
+  if (schedule.repeat_type === 'none') {
+    var 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 = function isInDesignationSchedule(targetDate, targetDateString, targetTimeString, schedule) {
+  if (!schedule.designation) {
+    return false;
+  }
+  var _iterator2 = _createForOfIteratorHelper(schedule.designation),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var designation = _step2.value;
+      var startDateTime = "".concat(designation.start_date, " ").concat(designation.start_time, ":00");
+      var endDateTime = "".concat(designation.end_date, " ").concat(designation.end_time, ":00");
+      var startDate = dayjs(startDateTime);
+      var endDate = dayjs(endDateTime);
+      if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
+        return true;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return false;
+};
+
+// 处理重复日程逻辑
+var isInRepeatingSchedule = function isInRepeatingSchedule(targetDate, targetDateString, targetTimeString, schedule, startDate, endDate) {
+  if (!schedule.repeat_rule) {
+    return false;
+  }
+  var repeat_rule = schedule.repeat_rule,
+    repeat_type = schedule.repeat_type;
+  var targetDateOnly = dayjs(targetDateString); // 只取日期部分
+
+  // 首先检查是否在包含日期中（包含日期是额外增加的有效日期）
+  if (repeat_rule.included_date && repeat_rule.included_date.length > 0) {
+    var _iterator3 = _createForOfIteratorHelper(repeat_rule.included_date),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var includedDate = _step3.value;
+        var includeStartDate = dayjs(includedDate.start);
+        var includeEndDate = dayjs(includedDate.end);
+        if (targetDateOnly.isSameOrAfter(includeStartDate, 'day') && targetDateOnly.isSameOrBefore(includeEndDate, 'day')) {
+          // 在包含日期中，直接返回true，无需检查其他条件
+          return true;
+        }
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+  }
+
+  // 检查是否在排除日期中
+  var _iterator4 = _createForOfIteratorHelper(repeat_rule.excluded_date),
+    _step4;
+  try {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var excludedDate = _step4.value;
+      var excludeStartDate = dayjs(excludedDate.start);
+      var excludeEndDate = dayjs(excludedDate.end);
+      // 检查目标日期是否在排除范围内（包含边界）
+      if (targetDateOnly.isSameOrAfter(excludeStartDate, 'day') && targetDateOnly.isSameOrBefore(excludeEndDate, 'day')) {
+        return false;
+      }
+    }
+
+    // 检查重复规则的结束条件
+  } catch (err) {
+    _iterator4.e(err);
+  } finally {
+    _iterator4.f();
+  }
+  if (repeat_rule.end.type === 'date' && repeat_rule.end.end_date) {
+    var ruleEndDate = dayjs(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 = function isInDailyRepeat(targetDate, startDate, endDate, repeatRule) {
+  var daysDiff = targetDate.diff(startDate, 'day');
+  if (daysDiff < 0) {
+    return false;
+  }
+
+  // 检查频率
+  if (daysDiff % repeatRule.frequency !== 0) {
+    return false;
+  }
+
+  // 检查时间是否在日程的时间范围内
+  var targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
+  var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
+  var endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
+
+  // 每日重复：每天都在相同的时间段内有效
+  // 例如：01:00:00 - 16:00:00，每天都是这个时间段
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+};
+
+// 每周重复逻辑
+var isInWeeklyRepeat = function isInWeeklyRepeat(targetDate, startDate, endDate, repeatRule) {
+  var targetDayOfWeek = targetDate.day(); // 0=周日, 1=周一, ..., 6=周六
+
+  // 检查是否在指定的星期几内
+  if (!repeatRule.frequency_date.includes(targetDayOfWeek)) {
+    return false;
+  }
+
+  // 计算周差
+  var weeksDiff = targetDate.diff(startDate, 'week');
+  if (weeksDiff < 0) {
+    return false;
+  }
+
+  // 检查频率
+  if (weeksDiff % repeatRule.frequency !== 0) {
+    return false;
+  }
+
+  // 检查时间是否在日程的时间范围内
+  var targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
+  var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
+  var endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+};
+
+// 处理 time-slots 类型的重复日程
+var isInTimeSlotsRepeatingSchedule = function isInTimeSlotsRepeatingSchedule(targetDate, targetDateString, targetTimeString, schedule) {
+  if (!schedule.repeat_rule || !schedule.start_time) {
+    return false;
+  }
+  var repeat_rule = schedule.repeat_rule,
+    repeat_type = schedule.repeat_type;
+  var startDate = dayjs(schedule.start_time);
+  var targetDateOnly = dayjs(targetDateString);
+
+  // 检查包含日期
+  if (repeat_rule.included_date && repeat_rule.included_date.length > 0) {
+    var _iterator5 = _createForOfIteratorHelper(repeat_rule.included_date),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var includedDate = _step5.value;
+        var includeStartDate = dayjs(includedDate.start);
+        var includeEndDate = dayjs(includedDate.end);
+        if (targetDateOnly.isSameOrAfter(includeStartDate, 'day') && targetDateOnly.isSameOrBefore(includeEndDate, 'day')) {
+          // 在包含日期中，检查时间段
+          return checkTimeSlotsForDate(targetDate, targetDateString, schedule.time_slot);
+        }
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+  }
+
+  // 检查排除日期
+  var _iterator6 = _createForOfIteratorHelper(repeat_rule.excluded_date),
+    _step6;
+  try {
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var excludedDate = _step6.value;
+      var excludeStartDate = dayjs(excludedDate.start);
+      var excludeEndDate = dayjs(excludedDate.end);
+      if (targetDateOnly.isSameOrAfter(excludeStartDate, 'day') && targetDateOnly.isSameOrBefore(excludeEndDate, 'day')) {
+        return false;
+      }
+    }
+
+    // 检查重复规则的结束条件
+  } catch (err) {
+    _iterator6.e(err);
+  } finally {
+    _iterator6.f();
+  }
+  if (repeat_rule.end.type === 'date' && repeat_rule.end.end_date) {
+    var ruleEndDate = dayjs(repeat_rule.end.end_date);
+    if (targetDateOnly.isAfter(ruleEndDate, 'day')) {
+      return false;
+    }
+  }
+
+  // 检查目标日期是否在重复规则范围内
+  var 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;
+};
+
+// 检查目标时间是否在某个时间段内（使用目标日期 + time_slot 时间）
+var checkTimeSlotsForDate = function checkTimeSlotsForDate(targetDate, targetDateString, timeSlots) {
+  var _iterator7 = _createForOfIteratorHelper(timeSlots),
+    _step7;
+  try {
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var timeSlot = _step7.value;
+      var slotStart = "".concat(targetDateString, " ").concat(timeSlot.start_time, ":00");
+      var slotEnd = "".concat(targetDateString, " ").concat(timeSlot.end_time, ":00");
+      var slotStartDate = dayjs(slotStart);
+      var slotEndDate = dayjs(slotEnd);
+      if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
+        return true;
+      }
+    }
+  } catch (err) {
+    _iterator7.e(err);
+  } finally {
+    _iterator7.f();
+  }
+  return false;
+};
+
+// 检查日期是否满足每日重复规则（只检查日期，不检查时间）
+var isInDailyRepeatForDate = function isInDailyRepeatForDate(targetDate, startDate, repeatRule) {
+  var daysDiff = targetDate.diff(startDate, 'day');
+  if (daysDiff < 0) {
+    return false;
+  }
+
+  // 检查频率
+  return daysDiff % repeatRule.frequency === 0;
+};
+
+// 检查日期是否满足每周重复规则（只检查日期，不检查时间）
+var isInWeeklyRepeatForDate = function isInWeeklyRepeatForDate(targetDate, startDate, repeatRule) {
+  var targetDayOfWeek = targetDate.day(); // 0=周日, 1=周一, ..., 6=周六
+
+  // 检查是否在指定的星期几内
+  if (!repeatRule.frequency_date.includes(targetDayOfWeek)) {
+    return false;
+  }
+
+  // 计算周差
+  var weeksDiff = targetDate.diff(startDate, 'week');
+  if (weeksDiff < 0) {
+    return false;
+  }
+
+  // 检查频率
+  return weeksDiff % repeatRule.frequency === 0;
+};
+
+/**
+ * 根据预约时间过滤优惠券列表
+ * @param discountList 优惠券列表
+ * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @returns 过滤后的优惠券列表
+ */
+export var filterDiscountListByBookingTime = function filterDiscountListByBookingTime(discountList, bookingTime) {
+  if (!bookingTime) {
+    return discountList;
+  }
+  return discountList.filter(function (discount) {
+    var _discount$metadata2, _discount$metadata3, _discount$custom_sche;
+    if (!(discount !== null && discount !== void 0 && (_discount$metadata2 = discount.metadata) !== null && _discount$metadata2 !== void 0 && _discount$metadata2.validity_type) || (discount === null || discount === void 0 || (_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.validity_type) === "fixed_validity") {
+      return true;
+    }
+    return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
+  });
 };

package/lib/modules/Discount/index.d.ts

@@ -14,6 +14,8 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setDiscountList(discountList: Discount[]): Promise<void>;
     getDiscountList(): Discount[];
+    setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
+    getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;

package/lib/modules/Discount/index.js

@@ -44,7 +44,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     this.openCache = false;
   }
   async initialize(core, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
     if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.discountList)) {
@@ -52,11 +52,16 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     } else {
       this.store.discountList = [];
     }
-    if ((_b = options == null ? void 0 : options.otherParams) == null ? void 0 : _b.cacheId) {
+    if (Array.isArray((_b = options == null ? void 0 : options.initialState) == null ? void 0 : _b.originalDiscountList)) {
+      this.store.originalDiscountList = options == null ? void 0 : options.initialState.originalDiscountList;
+    } else {
+      this.store.originalDiscountList = [];
+    }
+    if ((_c = options == null ? void 0 : options.otherParams) == null ? void 0 : _c.cacheId) {
       this.openCache = options.otherParams.openCache;
       this.cacheId = options.otherParams.cacheId;
     }
-    if ((_c = options == null ? void 0 : options.otherParams) == null ? void 0 : _c.fatherModule) {
+    if ((_d = options == null ? void 0 : options.otherParams) == null ? void 0 : _d.fatherModule) {
       this.fatherModule = options.otherParams.fatherModule;
     }
     this.request = core.getPlugin("request");
@@ -78,6 +83,14 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   getDiscountList() {
     return this.store.discountList;
   }
+  // 设置原始优惠券列表
+  async setOriginalDiscountList(originalDiscountList) {
+    this.store.originalDiscountList = originalDiscountList;
+  }
+  // 获取原始优惠券列表
+  getOriginalDiscountList() {
+    return this.store.originalDiscountList || [];
+  }
   async loadPrepareConfig(params) {
     var _a, _b;
     const prepareConfig = await this.request.post(
@@ -177,6 +190,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   async clear() {
     this.store.discountList = [];
+    this.store.originalDiscountList = [];
     console.log("[Discount] clear");
   }
   storeChange() {

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

@@ -80,6 +80,7 @@ export interface Discount {
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
+        validity_type?: "custom_schedule_validity" | "fixed_validity";
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -107,9 +108,13 @@ export interface Discount {
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
     num?: number;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
 }
 export interface DiscountState {
     discountList: Discount[];
+    originalDiscountList?: Discount[];
 }
 export interface DiscountModuleAPI {
     setDiscountList: (discountList: Discount[]) => Promise<void>;

package/lib/modules/Rules/index.js

@@ -38,6 +38,7 @@ var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
+var import_dayjs = __toESM(require("dayjs"));
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -267,10 +268,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       addModeDiscount.forEach((discount) => {
         var _a, _b, _c, _d, _e, _f;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
+        let timeLimit = true;
+        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
         const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && isBundleAvailable) {
+        if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
           (_e = discountApplicability.get(discount.id)) == null ? void 0 : _e.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -344,6 +347,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
+        let timeLimit = true;
+        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
+        if (!timeLimit) {
+          return false;
+        }
         if (limitedData.type === "product_all") {
           if (!this.checkPackageSubItemUsageRules(discount, flatItem)) {
             return false;
@@ -524,6 +532,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           };
           appliedProducts.push(discountDetail);
           appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
+          let total = targetProductTotal;
+          if (product.options) {
+            total = product.options.reduce((accumulator, currentValue) => {
+              const currentPrice = new import_decimal.default(currentValue.price || 0);
+              const currentNum = new import_decimal.default(currentValue.num || 0);
+              return accumulator.add(currentPrice.mul(currentNum));
+            }, new import_decimal.default(total)).toNumber();
+          }
           if (product.isClient) {
             debugger;
             arr.push(this.hooks.setProduct(originProduct, {
@@ -539,7 +555,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               }),
               variant: originProduct._productInit.variant,
               original_price: new import_decimal.default(product.price || 0).toNumber(),
-              total: targetProductTotal
+              total
             }));
           } else {
             arr.push(this.hooks.setProduct(originProduct, {
@@ -547,7 +563,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
               price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
-              total: targetProductTotal,
+              total,
               origin_total: productOriginTotal,
               main_product_selling_price: targetProductTotal
             }));
@@ -810,6 +826,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
               });
             }
+            if (product == null ? void 0 : product.options) {
+              newTotalWithDiscount = product.options.reduce((accumulator, currentValue) => {
+                const currentPrice = new import_decimal.default(currentValue.price || 0);
+                const currentNum = new import_decimal.default(currentValue.num || 0);
+                return accumulator.add(currentPrice.mul(currentNum));
+              }, new import_decimal.default(newTotalWithDiscount)).toNumber();
+            }
             result.push(
               this.hooks.setProduct(mainProduct, {
                 ...mainProductData,
@@ -860,6 +883,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   newOriginTotalOriginal += Number(item.price) * Number(item.num);
                 });
               }
+              if (product == null ? void 0 : product.options) {
+                newTotalOriginal = product.options.reduce((accumulator, currentValue) => {
+                  const currentPrice = new import_decimal.default(currentValue.price || 0);
+                  const currentNum = new import_decimal.default(currentValue.num || 0);
+                  return accumulator.add(currentPrice.mul(currentNum));
+                }, new import_decimal.default(newTotalOriginal)).toNumber();
+              }
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,
@@ -935,6 +965,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   });
                 }
               }
+              if (product == null ? void 0 : product.options) {
+                newTotal = product.options.reduce((accumulator, currentValue) => {
+                  const currentPrice = new import_decimal.default(currentValue.price || 0);
+                  const currentNum = new import_decimal.default(currentValue.num || 0);
+                  return accumulator.add(currentPrice.mul(currentNum));
+                }, new import_decimal.default(newTotal)).toNumber();
+              }
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,

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;

package/lib/solution/BookingByStep/index.js

@@ -1609,6 +1609,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/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>[];