@pisell/pisellos 0.0.354 → 0.0.356

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -24,10 +24,11 @@ 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 { BaseModule } from "../BaseModule";
-import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
+import dayjs from 'dayjs';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -400,19 +401,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _product, _product2, _product3, _flatItem$bundleItem;
+          var _product, _product2, _product3, _product4, _flatItem$bundleItem;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
-
+          var timeLimit = true;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product = product) === null || _product === void 0 ? void 0 : _product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
           var isLimitedProduct = limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id);
 
           // 编辑的商品 使用了优惠券不可用
-          var isAvailableProduct = flatItem.type === 'main' ? !((_product = product) !== null && _product !== void 0 && _product.booking_id && (_product2 = product) !== null && _product2 !== void 0 && (_product2 = _product2.discount_list) !== null && _product2 !== void 0 && _product2.length && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.every(function (discount) {
+          var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (discount) {
             return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem = flatItem.bundleItem) !== null && _flatItem$bundleItem !== void 0 && (_flatItem$bundleItem = _flatItem$bundleItem.metadata) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.custom_product_bundle_map_id);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -451,7 +453,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product4, _product$discount_lis2, _product5;
+        var _product5, _product$discount_lis2, _product6;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -476,7 +478,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 已有优惠的商品跳过
-        if ((_product4 = product) !== null && _product4 !== void 0 && _product4.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product5 = product) !== null && _product5 !== void 0 && (_product5 = _product5.discount_list) !== null && _product5 !== void 0 && _product5.every(function (discount) {
+        if ((_product5 = product) !== null && _product5 !== void 0 && _product5.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product6 = product) !== null && _product6 !== void 0 && (_product6 = _product6.discount_list) !== null && _product6 !== void 0 && _product6.every(function (discount) {
           return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
         })) {
           if (flatItem.type === 'main') {
@@ -505,6 +507,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
+          var timeLimit = true;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+          if (!timeLimit) {
+            return false;
+          }
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {
@@ -534,12 +541,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis4, _product6, _product6$every;
+          var _product$discount_lis4, _product7, _product7$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
             var _ref3;
             return !((_ref3 = item.discount_list || []) !== null && _ref3 !== void 0 && _ref3.length);
-          }) && (!((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length) || ((_product6 = product) === null || _product6 === void 0 || (_product6 = _product6.discount_list) === null || _product6 === void 0 || (_product6$every = _product6.every) === null || _product6$every === void 0 ? void 0 : _product6$every.call(_product6, function (item) {
+          }) && (!((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length) || ((_product7 = product) === null || _product7 === void 0 || (_product7 = _product7.discount_list) === null || _product7 === void 0 || (_product7$every = _product7.every) === null || _product7$every === void 0 ? void 0 : _product7$every.call(_product7, function (item) {
             return item.type === 'product';
           })));
         } else {

package/dist/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/dist/solution/BookingByStep/index.d.ts

@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -2316,6 +2316,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
+      this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateBookingDate"), {});
     }
   }, {
     key: "getScheduleDataByIds",
@@ -3181,7 +3182,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var product = _ref13.product,
         date = _ref13.date,
         account = _ref13.account;
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (item) {
+        return !isNormalProduct(item._productOrigin);
+      });
 
       // 将 ProductData 转换为 CartItem 但不真正添加到购物车
       var currentCartItem = this.convertProductToCartItem({

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

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

package/dist/solution/ShopDiscount/index.js

@@ -25,7 +25,6 @@ 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 { BaseModule } from "../../modules/BaseModule";
-import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
 import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
@@ -212,33 +211,16 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     // =========== 公共 API ===========
 
     // 设置预约时间
-  }, {
-    key: "setBookingTime",
-    value: function () {
-      var _setBookingTime = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(bookingTime) {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              if (!(this.store.currentBookingTime !== bookingTime)) {
-                _context4.next = 4;
-                break;
-              }
-              this.store.currentBookingTime = bookingTime;
+    // public async setBookingTime(bookingTime: string | null): Promise<void> {
+    //   if (this.store.currentBookingTime !== bookingTime) {
+    //     this.store.currentBookingTime = bookingTime;
+    //
+    //     // 更新过滤后的优惠券列表
+    //     await this.updateFilteredDiscountList();
+    //   }
+    // }
 
-              // 更新过滤后的优惠券列表
-              _context4.next = 4;
-              return this.updateFilteredDiscountList();
-            case 4:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function setBookingTime(_x3) {
-        return _setBookingTime.apply(this, arguments);
-      }
-      return setBookingTime;
-    }() // 获取当前预约时间
+    // 获取当前预约时间
   }, {
     key: "getCurrentBookingTime",
     value: function getCurrentBookingTime() {
@@ -259,61 +241,47 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     }
 
     // 更新过滤后的优惠券列表
-  }, {
-    key: "updateFilteredDiscountList",
-    value: function () {
-      var _updateFilteredDiscountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$store$productLi;
-        var originalList, filteredList, _result;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              originalList = this.store.originalDiscountList;
-              filteredList = this.filterDiscountListByBookingTime(originalList, this.store.currentBookingTime);
-              this.store.filteredDiscountList = filteredList;
+    // 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,
+    //     );
+    //   }
+    // }
 
-              // 更新 DiscountModule 中的优惠券列表
-              this.setDiscountList(filteredList);
-              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context5.next = 8;
-                break;
-              }
-              _result = this.calcDiscount(this.store.productList);
-              _context5.next = 8;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, _result);
-            case 8:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this);
-      }));
-      function updateFilteredDiscountList() {
-        return _updateFilteredDiscountList.apply(this, arguments);
-      }
-      return updateFilteredDiscountList;
-    }() // 设置客户
+    // 设置客户
   }, {
     key: "setCustomer",
     value: function () {
-      var _setCustomer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(customer) {
+      var _setCustomer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(customer) {
         var _this$store$customer;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!(((_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 ? void 0 : _this$store$customer.id) !== customer.id)) {
-                _context6.next = 4;
+                _context4.next = 4;
                 break;
               }
               this.store.customer = customer;
-              _context6.next = 4;
+              _context4.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onCustomerChange"), customer);
             case 4:
             case "end":
-              return _context6.stop();
+              return _context4.stop();
           }
-        }, _callee6, this);
+        }, _callee4, this);
       }));
-      function setCustomer(_x4) {
+      function setCustomer(_x3) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
@@ -403,29 +371,29 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "scanCode",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
+      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
         var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context7.prev = 0;
-              _context7.next = 3;
+              _context5.prev = 0;
+              _context5.next = 3;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, customerId);
             case 3:
-              _context7.t0 = _context7.sent;
-              if (_context7.t0) {
-                _context7.next = 6;
+              _context5.t0 = _context5.sent;
+              if (_context5.t0) {
+                _context5.next = 6;
                 break;
               }
-              _context7.t0 = [];
+              _context5.t0 = [];
             case 6:
-              resultDiscountList = _context7.t0;
+              resultDiscountList = _context5.t0;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context7.next = 10;
+                _context5.next = 10;
                 break;
               }
-              return _context7.abrupt("return", {
+              return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -433,10 +401,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
               if (resultDiscountList.length) {
-                _context7.next = 12;
+                _context5.next = 12;
                 break;
               }
-              return _context7.abrupt("return", {
+              return _context5.abrupt("return", {
                 type: "server",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -456,10 +424,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context7.next = 16;
+                _context5.next = 16;
                 break;
               }
-              return _context7.abrupt("return", {
+              return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: true,
                 productList: this.store.productList || [],
@@ -476,30 +444,30 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
               if (!isAvailable) {
-                _context7.next = 24;
+                _context5.next = 24;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context7.next = 24;
+                _context5.next = 24;
                 break;
               }
-              _context7.next = 24;
+              _context5.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
             case 24:
-              return _context7.abrupt("return", {
+              return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
             case 27:
-              _context7.prev = 27;
-              _context7.t1 = _context7["catch"](0);
-              console.error('[ShopDiscount] 扫码出错:', _context7.t1);
-              return _context7.abrupt("return", {
+              _context5.prev = 27;
+              _context5.t1 = _context5["catch"](0);
+              console.error('[ShopDiscount] 扫码出错:', _context5.t1);
+              return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -507,11 +475,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 31:
             case "end":
-              return _context7.stop();
+              return _context5.stop();
           }
-        }, _callee7, this, [[0, 27]]);
+        }, _callee5, this, [[0, 27]]);
       }));
-      function scanCode(_x5, _x6) {
+      function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);
       }
       return scanCode;
@@ -544,19 +512,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "emitDiscountListChange",
     value: function () {
-      var _emitDiscountListChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(discountList) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _emitDiscountListChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(discountList) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context8.next = 2;
+              _context6.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onDiscountListChange"), discountList);
             case 2:
             case "end":
-              return _context8.stop();
+              return _context6.stop();
           }
-        }, _callee8, this);
+        }, _callee6, this);
       }));
-      function emitDiscountListChange(_x7) {
+      function emitDiscountListChange(_x6) {
         return _emitDiscountListChange.apply(this, arguments);
       }
       return emitDiscountListChange;
@@ -663,40 +631,40 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCustomerWallet",
     value: function () {
-      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(id) {
-        var _result2, customer;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
+        var _result, customer;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context9.prev = 0;
-              _context9.next = 3;
+              _context7.prev = 0;
+              _context7.next = 3;
               return this.request.get("/customer/info/".concat(id), {
                 with_trashed: 1
               });
             case 3:
-              _result2 = _context9.sent;
-              if (!(_result2 !== null && _result2 !== void 0 && _result2.data)) {
-                _context9.next = 9;
+              _result = _context7.sent;
+              if (!(_result !== null && _result !== void 0 && _result.data)) {
+                _context7.next = 9;
                 break;
               }
-              customer = Object.assign({}, (_objectDestructuringEmpty(_result2.data), _result2.data));
+              customer = Object.assign({}, (_objectDestructuringEmpty(_result.data), _result.data));
               this.setCustomer(customer);
-              _context9.next = 9;
+              _context7.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onScanCustomerChange"), customer);
             case 9:
-              _context9.next = 14;
+              _context7.next = 14;
               break;
             case 11:
-              _context9.prev = 11;
-              _context9.t0 = _context9["catch"](0);
-              console.error('[ShopDiscount] 获取客户钱包信息出错:', _context9.t0);
+              _context7.prev = 11;
+              _context7.t0 = _context7["catch"](0);
+              console.error('[ShopDiscount] 获取客户钱包信息出错:', _context7.t0);
             case 14:
             case "end":
-              return _context9.stop();
+              return _context7.stop();
           }
-        }, _callee9, this, [[0, 11]]);
+        }, _callee7, this, [[0, 11]]);
       }));
-      function getCustomerWallet(_x8) {
+      function getCustomerWallet(_x7) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
@@ -704,32 +672,32 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "bestDiscount",
     value: function () {
-      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(cb) {
-        var _this$store$productLi2;
-        var newDiscountList, _result3;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(cb) {
+        var _this$store$productLi;
+        var newDiscountList, _result2;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               newDiscountList = this.store.originalDiscountList;
               this.setDiscountList(newDiscountList);
-              if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context10.next = 7;
+              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
+                _context8.next = 7;
                 break;
               }
-              _result3 = this.calcDiscount(this.store.productList);
-              cb === null || cb === void 0 || cb(_result3);
-              _context10.next = 7;
-              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
+              _result2 = this.calcDiscount(this.store.productList);
+              cb === null || cb === void 0 || cb(_result2);
+              _context8.next = 7;
+              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result2);
             case 7:
-              _context10.next = 9;
+              _context8.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 9:
             case "end":
-              return _context10.stop();
+              return _context8.stop();
           }
-        }, _callee10, this);
+        }, _callee8, this);
       }));
-      function bestDiscount(_x9) {
+      function bestDiscount(_x8) {
         return _bestDiscount.apply(this, arguments);
       }
       return bestDiscount;
@@ -737,16 +705,16 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadPrepareConfig",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi3, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result4;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context11.prev = 0;
+              _context9.prev = 0;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context11.next = 4;
+              _context9.next = 4;
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
@@ -754,7 +722,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 with_discount_card: 1
               });
             case 4:
-              goodPassList = _context11.sent;
+              goodPassList = _context9.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -766,37 +734,37 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context11.next = 12;
+              _context9.next = 12;
               return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
             case 12:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
-              if (!((_this$store$productLi3 = this.store.productList) !== null && _this$store$productLi3 !== void 0 && _this$store$productLi3.length)) {
-                _context11.next = 19;
+              if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
+                _context9.next = 19;
                 break;
               }
-              _result4 = this.calcDiscount(this.store.productList);
-              _context11.next = 19;
-              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result4);
+              _result3 = this.calcDiscount(this.store.productList);
+              _context9.next = 19;
+              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 19:
-              _context11.next = 21;
+              _context9.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
             case 21:
-              _context11.next = 26;
+              _context9.next = 26;
               break;
             case 23:
-              _context11.prev = 23;
-              _context11.t0 = _context11["catch"](0);
-              console.error('[ShopDiscount] 加载准备配置出错:', _context11.t0);
+              _context9.prev = 23;
+              _context9.t0 = _context9["catch"](0);
+              console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
             case 26:
             case "end":
-              return _context11.stop();
+              return _context9.stop();
           }
-        }, _callee11, this, [[0, 23]]);
+        }, _callee9, this, [[0, 23]]);
       }));
-      function loadPrepareConfig(_x10) {
+      function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

package/dist/solution/ShopDiscount/utils.js

@@ -139,33 +139,22 @@ var isInTimeSlotsSchedule = function isInTimeSlotsSchedule(targetDate, targetDat
   if (!schedule.start_time) {
     return false;
   }
-  var scheduleDate = schedule.start_time.split(' ')[0];
 
-  // 检查日期是否匹配
-  if (targetDateString !== scheduleDate) {
-    return false;
-  }
+  // 如果不重复，使用原有逻辑
+  if (schedule.repeat_type === 'none') {
+    var scheduleDate = schedule.start_time.split(' ')[0];
 
-  // 检查是否在任一时间段内
-  var _iterator2 = _createForOfIteratorHelper(schedule.time_slot),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var timeSlot = _step2.value;
-      var slotStart = "".concat(scheduleDate, " ").concat(timeSlot.start_time, ":00");
-      var slotEnd = "".concat(scheduleDate, " ").concat(timeSlot.end_time, ":00");
-      var slotStartDate = dayjs(slotStart);
-      var slotEndDate = dayjs(slotEnd);
-      if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
-        return true;
-      }
+    // 检查日期是否匹配
+    if (targetDateString !== scheduleDate) {
+      return false;
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
+
+    // 检查是否在任一时间段内
+    return checkTimeSlotsForDate(targetDate, targetDateString, schedule.time_slot);
   }
-  return false;
+
+  // 处理重复日程
+  return isInTimeSlotsRepeatingSchedule(targetDate, targetDateString, targetTimeString, schedule);
 };
 
 // 处理指定类型日程
@@ -173,11 +162,11 @@ var isInDesignationSchedule = function isInDesignationSchedule(targetDate, targe
   if (!schedule.designation) {
     return false;
   }
-  var _iterator3 = _createForOfIteratorHelper(schedule.designation),
-    _step3;
+  var _iterator2 = _createForOfIteratorHelper(schedule.designation),
+    _step2;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var designation = _step3.value;
+    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);
@@ -187,9 +176,9 @@ var isInDesignationSchedule = function isInDesignationSchedule(targetDate, targe
       }
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator3.f();
+    _iterator2.f();
   }
   return false;
 };
@@ -205,11 +194,11 @@ var isInRepeatingSchedule = function isInRepeatingSchedule(targetDate, targetDat
 
   // 首先检查是否在包含日期中（包含日期是额外增加的有效日期）
   if (repeat_rule.included_date && repeat_rule.included_date.length > 0) {
-    var _iterator4 = _createForOfIteratorHelper(repeat_rule.included_date),
-      _step4;
+    var _iterator3 = _createForOfIteratorHelper(repeat_rule.included_date),
+      _step3;
     try {
-      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        var includedDate = _step4.value;
+      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')) {
@@ -218,18 +207,18 @@ var isInRepeatingSchedule = function isInRepeatingSchedule(targetDate, targetDat
         }
       }
     } catch (err) {
-      _iterator4.e(err);
+      _iterator3.e(err);
     } finally {
-      _iterator4.f();
+      _iterator3.f();
     }
   }
 
   // 检查是否在排除日期中
-  var _iterator5 = _createForOfIteratorHelper(repeat_rule.excluded_date),
-    _step5;
+  var _iterator4 = _createForOfIteratorHelper(repeat_rule.excluded_date),
+    _step4;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var excludedDate = _step5.value;
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var excludedDate = _step4.value;
       var excludeStartDate = dayjs(excludedDate.start);
       var excludeEndDate = dayjs(excludedDate.end);
       // 检查目标日期是否在排除范围内（包含边界）
@@ -240,9 +229,9 @@ var isInRepeatingSchedule = function isInRepeatingSchedule(targetDate, targetDat
 
     // 检查重复规则的结束条件
   } catch (err) {
-    _iterator5.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator5.f();
+    _iterator4.f();
   }
   if (repeat_rule.end.type === 'date' && repeat_rule.end.end_date) {
     var ruleEndDate = dayjs(repeat_rule.end.end_date);
@@ -312,6 +301,136 @@ var isInWeeklyRepeat = function isInWeeklyRepeat(targetDate, startDate, endDate,
   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 优惠券列表
@@ -324,7 +443,6 @@ export var filterDiscountListByBookingTime = function filterDiscountListByBookin
   }
   return discountList.filter(function (discount) {
     var _discount$metadata2, _discount$metadata3, _discount$custom_sche;
-    debugger;
     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;
     }

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Rules/index.js

@@ -37,6 +37,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);
@@ -266,9 +267,11 @@ 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));
-        if (isAvailableProduct && isLimitedProduct) {
+        if (isAvailableProduct && isLimitedProduct && 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;
@@ -340,6 +343,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;

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.d.ts

@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -1622,6 +1622,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);
@@ -2199,7 +2203,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     account
   }) {
     var _a, _b;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((item) => !(0, import_utils5.isNormalProduct)(item._productOrigin));
     const currentCartItem = this.convertProductToCartItem({ product, date, account });
     cartItems.push(currentCartItem);
     if (cartItems.length === 0)

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/ShopDiscount/index.d.ts

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

package/lib/solution/ShopDiscount/index.js

@@ -34,7 +34,6 @@ __export(ShopDiscount_exports, {
 });
 module.exports = __toCommonJS(ShopDiscount_exports);
 var import_BaseModule = require("../../modules/BaseModule");
-var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 var import_utils = require("./utils");
@@ -144,12 +143,14 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // =========== 公共 API ===========
   // 设置预约时间
-  async setBookingTime(bookingTime) {
-    if (this.store.currentBookingTime !== bookingTime) {
-      this.store.currentBookingTime = bookingTime;
-      await this.updateFilteredDiscountList();
-    }
-  }
+  // 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;
@@ -162,20 +163,23 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     return (0, import_utils.filterDiscountListByBookingTime)(discountList, bookingTime);
   }
   // 更新过滤后的优惠券列表
-  async updateFilteredDiscountList() {
-    var _a;
-    const originalList = this.store.originalDiscountList;
-    const filteredList = this.filterDiscountListByBookingTime(originalList, this.store.currentBookingTime);
-    this.store.filteredDiscountList = filteredList;
-    this.setDiscountList(filteredList);
-    if ((_a = this.store.productList) == null ? void 0 : _a.length) {
-      const result = this.calcDiscount(this.store.productList);
-      await this.core.effects.emit(
-        import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
-        result
-      );
-    }
-  }
+  // 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;

package/lib/solution/ShopDiscount/utils.js

@@ -119,20 +119,14 @@ var isInTimeSlotsSchedule = (targetDate, targetDateString, targetTimeString, sch
   if (!schedule.start_time) {
     return false;
   }
-  const scheduleDate = schedule.start_time.split(" ")[0];
-  if (targetDateString !== scheduleDate) {
-    return false;
-  }
-  for (const timeSlot of schedule.time_slot) {
-    const slotStart = `${scheduleDate} ${timeSlot.start_time}:00`;
-    const slotEnd = `${scheduleDate} ${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;
+  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 false;
+  return isInTimeSlotsRepeatingSchedule(targetDate, targetDateString, targetTimeString, schedule);
 };
 var isInDesignationSchedule = (targetDate, targetDateString, targetTimeString, schedule) => {
   if (!schedule.designation) {
@@ -216,13 +210,87 @@ var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   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 discountList.filter((discount) => {
     var _a, _b, _c;
-    debugger;
     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;
     }

package/package.json

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