@pisell/pisellos 0.0.462 → 0.0.464

package/dist/modules/Rules/index.js

@@ -1453,19 +1453,239 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
 
-            // 生成无折扣的商品（剩余数量）
-            if (normalNum > 0) {
-              processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                // 🔥 为剩余商品生成唯一的 _id
-                _id: "".concat(flatItem._id, "_split_rest"),
-                num: normalNum,
-                quantity: normalNum,
-                discount_list: [],
-                processed: true
-              }));
+            // 🔥 对拆分后的剩余商品继续匹配其他可用折扣（而不是等到下次执行才应用）
+            var remainingNum = normalNum;
+            var continueSplitIndex = discountNum;
+            while (remainingNum > 0) {
+              var _nextSelectedDiscount;
+              // 重新查找适用于剩余商品的可用折扣（已使用的会被自动过滤掉）
+              var nextApplicableDiscounts = sortedDiscountList.filter(function (nextDiscount) {
+                var _product$discount_lis10;
+                var nextDiscountType = nextDiscount.tag || nextDiscount.type;
+                // 检查策略可用性
+                if (['good_pass', 'discount_card', 'product_discount_card'].includes(nextDiscountType)) {
+                  var _nextDiscount$config;
+                  if (nextDiscount.config === undefined || !(nextDiscount !== null && nextDiscount !== void 0 && (_nextDiscount$config = nextDiscount.config) !== null && _nextDiscount$config !== void 0 && _nextDiscount$config.isAvailable)) {
+                    return false;
+                  }
+                }
+                // 折扣卡时总价为0时不可用
+                if ((Number(product.total) <= 0 || !product.total) && !((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.find(function (n) {
+                  var _n$discount2;
+                  return ((_n$discount2 = n.discount) === null || _n$discount2 === void 0 ? void 0 : _n$discount2.resource_id) === nextDiscount.id;
+                })) && nextDiscountType !== 'good_pass') return false;
+
+                // 商品券已被使用则跳过
+                if (usedDiscounts.get(nextDiscount.id) && nextDiscountType === 'good_pass') return false;
+
+                // 检查 maxUsagePerOrder 限制
+                if (nextDiscountType === 'good_pass') {
+                  var _nextDiscount$config2;
+                  var maxUsagePerOrder = (_nextDiscount$config2 = nextDiscount.config) === null || _nextDiscount$config2 === void 0 ? void 0 : _nextDiscount$config2.maxUsagePerOrder;
+                  if (maxUsagePerOrder && maxUsagePerOrder > 0) {
+                    var currentUsedCount = usedProductIdCounts.get(nextDiscount.product_id) || 0;
+                    if (currentUsedCount >= maxUsagePerOrder) {
+                      return false;
+                    }
+                  }
+                }
+
+                // 检查折扣卡的 applicableProductLimit 限制
+                if (['discount_card', 'product_discount_card'].includes(nextDiscountType)) {
+                  var _nextDiscount$config3;
+                  var limitConfig = ((_nextDiscount$config3 = nextDiscount.config) === null || _nextDiscount$config3 === void 0 ? void 0 : _nextDiscount$config3.applicableProductLimit) || 0;
+                  if (limitConfig > 0) {
+                    var currentUsedLimitCount = usedDiscountCardLimitCounts.get(nextDiscount.id) || 0;
+                    if (currentUsedLimitCount >= limitConfig) {
+                      return false;
+                    }
+                  }
+                }
+                var limitedData = nextDiscount.limited_relation_product_data;
+                if (limitedData.type === 'product_all') {
+                  if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
+                    return false;
+                  }
+                  if (!_this3.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
+                    return false;
+                  }
+                  return true;
+                } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
+                  if (!_this3.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
+                    return false;
+                  }
+                  return true;
+                }
+                return false;
+              });
+
+              // 没有更多可用折扣，剩余商品无折扣存储
+              if (nextApplicableDiscounts.length === 0) {
+                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
+                  _id: "".concat(flatItem._id, "_split_rest"),
+                  num: remainingNum,
+                  quantity: remainingNum,
+                  discount_list: [],
+                  processed: true
+                }));
+                break;
+              }
+
+              // 选择最优折扣
+              var nextSelectedDiscountCard = nextApplicableDiscounts.find(function (n) {
+                return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
+              });
+              var nextSelectedDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
+
+              // 判断新折扣是否需要拆分
+              var nextDiscType = nextSelectedDiscount.tag || nextSelectedDiscount.type;
+              var nextIsGoodPass = nextDiscType === 'good_pass';
+              var nextIsDiscountCard = ['discount_card', 'product_discount_card'].includes(nextDiscType);
+              var nextApplicableProductLimit = ((_nextSelectedDiscount = nextSelectedDiscount.config) === null || _nextSelectedDiscount === void 0 ? void 0 : _nextSelectedDiscount.applicableProductLimit) || 0;
+              var nextIsNeedSplit = nextIsGoodPass || nextIsDiscountCard && nextApplicableProductLimit > 0;
+              if (!nextIsNeedSplit) {
+                var _nextBundleDiscount$m, _flatItem$parentProdu9;
+                // 🔥 不需要拆分：直接应用折扣到所有剩余商品
+                var nextBundleDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
+                usedDiscounts.set(nextBundleDiscount.id, true);
+                if ((nextBundleDiscount.tag || nextBundleDiscount.type) === 'good_pass') {
+                  var curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
+                  usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
+                }
+                var nextNoSplitType = nextBundleDiscount.tag || nextBundleDiscount.type;
+                if (['discount_card', 'product_discount_card'].includes(nextNoSplitType)) {
+                  var _curCount = usedDiscountCardLimitCounts.get(nextBundleDiscount.id) || 0;
+                  usedDiscountCardLimitCounts.set(nextBundleDiscount.id, _curCount + remainingNum);
+                }
+                var nextOriginTotal = product.original_price || product.price || 0;
+                var nextTargetTotal = getDiscountAmount(nextBundleDiscount, nextOriginTotal, nextOriginTotal);
+                var nextDiscountAmount = new Decimal(nextOriginTotal).minus(nextTargetTotal).toNumber();
+                var nextUniqueId = "".concat(flatItem._id, "_split_").concat(continueSplitIndex);
+                var nextBundleDiscType = nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : nextBundleDiscount.tag;
+                var nextDiscountDetail = {
+                  amount: nextDiscountAmount * remainingNum,
+                  type: nextBundleDiscType,
+                  discount: {
+                    discount_card_type: nextBundleDiscount === null || nextBundleDiscount === void 0 || (_nextBundleDiscount$m = nextBundleDiscount.metadata) === null || _nextBundleDiscount$m === void 0 ? void 0 : _nextBundleDiscount$m.discount_card_type,
+                    fixed_amount: nextDiscountAmount,
+                    resource_id: nextBundleDiscount.id,
+                    title: nextBundleDiscount.format_title,
+                    original_amount: product.original_price,
+                    product_id: product.id,
+                    percent: nextBundleDiscount.par_value,
+                    discount_product_id: nextBundleDiscount.product_id
+                  },
+                  metadata: {
+                    custom_product_bundle_map_id: nextUniqueId,
+                    num: remainingNum
+                  },
+                  config: nextBundleDiscount === null || nextBundleDiscount === void 0 ? void 0 : nextBundleDiscount.config,
+                  _num: remainingNum * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
+                };
+                var nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
+                nextAppliedProducts.push(nextDiscountDetail);
+                appliedDiscountProducts.set(nextBundleDiscount.id, nextAppliedProducts);
+                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
+                  _id: nextUniqueId,
+                  num: remainingNum,
+                  quantity: remainingNum,
+                  total: nextTargetTotal,
+                  price: new Decimal(nextOriginTotal || 0).minus(nextDiscountDetail.discount.fixed_amount).toNumber(),
+                  discount_list: [nextDiscountDetail],
+                  processed: true
+                }));
+                remainingNum = 0;
+                break;
+              }
+
+              // 🔥 需要拆分：计算最大使用次数
+              var nextMaxUsageLimit = void 0;
+              if (nextIsGoodPass) {
+                var _nextSelectedDiscount2;
+                var nextGoodPassCount = nextApplicableDiscounts.filter(function (item) {
+                  return (item.tag || item.type) === 'good_pass';
+                }).length;
+                nextMaxUsageLimit = nextGoodPassCount;
+                if ((_nextSelectedDiscount2 = nextSelectedDiscount.config) !== null && _nextSelectedDiscount2 !== void 0 && _nextSelectedDiscount2.maxUsagePerOrder) {
+                  var usedCount = usedProductIdCounts.get(nextSelectedDiscount.product_id) || 0;
+                  nextMaxUsageLimit = Math.min(nextGoodPassCount, Math.max(0, nextSelectedDiscount.config.maxUsagePerOrder - usedCount));
+                }
+              } else if (nextIsDiscountCard && nextApplicableProductLimit > 0) {
+                var _usedLimitCount = usedDiscountCardLimitCounts.get(nextSelectedDiscount.id) || 0;
+                nextMaxUsageLimit = Math.max(0, nextApplicableProductLimit - _usedLimitCount);
+              } else {
+                nextMaxUsageLimit = 1;
+              }
+              var nextSplitCount = Math.min(remainingNum, nextMaxUsageLimit);
+              if (nextSplitCount === 0) {
+                // 已达使用上限，剩余商品无折扣存储
+                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
+                  _id: "".concat(flatItem._id, "_split_rest"),
+                  num: remainingNum,
+                  quantity: remainingNum,
+                  discount_list: [],
+                  processed: true
+                }));
+                break;
+              }
+
+              // 生成有折扣的商品
+              for (var j = 0; j < nextSplitCount; j++) {
+                var _nextBundleDiscount$m2;
+                var _nextBundleDiscount = nextIsGoodPass ? nextSelectedDiscountCard || nextApplicableDiscounts[j] : nextSelectedDiscountCard || nextApplicableDiscounts[0];
+                usedDiscounts.set(_nextBundleDiscount.id, true);
+                if ((_nextBundleDiscount.tag || _nextBundleDiscount.type) === 'good_pass') {
+                  var _curCount2 = usedProductIdCounts.get(_nextBundleDiscount.product_id) || 0;
+                  usedProductIdCounts.set(_nextBundleDiscount.product_id, _curCount2 + 1);
+                }
+                var nextBundleDiscTypeForCount = _nextBundleDiscount.tag || _nextBundleDiscount.type;
+                if (['discount_card', 'product_discount_card'].includes(nextBundleDiscTypeForCount)) {
+                  var curLimitCount = usedDiscountCardLimitCounts.get(_nextBundleDiscount.id) || 0;
+                  usedDiscountCardLimitCounts.set(_nextBundleDiscount.id, curLimitCount + 1);
+                }
+                var _nextUniqueId = "".concat(flatItem._id, "_split_").concat(continueSplitIndex);
+                var nextDiscountedPrice = getDiscountAmount(_nextBundleDiscount, product.origin_total, product.origin_total);
+                var nextBundleDiscAmount = new Decimal(product.origin_total || 0).minus(nextDiscountedPrice).toNumber();
+                var nextBundleDiscTypeStr = _nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : _nextBundleDiscount.tag;
+                var _nextDiscountDetail = {
+                  amount: nextBundleDiscAmount,
+                  type: nextBundleDiscTypeStr,
+                  discount: {
+                    discount_card_type: _nextBundleDiscount === null || _nextBundleDiscount === void 0 || (_nextBundleDiscount$m2 = _nextBundleDiscount.metadata) === null || _nextBundleDiscount$m2 === void 0 ? void 0 : _nextBundleDiscount$m2.discount_card_type,
+                    fixed_amount: nextBundleDiscAmount,
+                    resource_id: _nextBundleDiscount.id,
+                    title: _nextBundleDiscount.format_title,
+                    original_amount: product.origin_total,
+                    product_id: product.id,
+                    percent: _nextBundleDiscount.par_value,
+                    discount_product_id: _nextBundleDiscount.product_id
+                  },
+                  metadata: {
+                    custom_product_bundle_map_id: _nextUniqueId,
+                    num: 1
+                  },
+                  _num: 1,
+                  config: _nextBundleDiscount === null || _nextBundleDiscount === void 0 ? void 0 : _nextBundleDiscount.config
+                };
+                var _nextAppliedProducts = appliedDiscountProducts.get(_nextBundleDiscount.id) || [];
+                _nextAppliedProducts.push(_nextDiscountDetail);
+                appliedDiscountProducts.set(_nextBundleDiscount.id, _nextAppliedProducts);
+                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
+                  _id: _nextUniqueId,
+                  num: 1,
+                  quantity: 1,
+                  price: nextDiscountedPrice,
+                  total: nextDiscountedPrice,
+                  discount_list: [_nextDiscountDetail],
+                  processed: true,
+                  _discountId: _nextBundleDiscount.id
+                }));
+                continueSplitIndex++;
+              }
+              remainingNum -= nextSplitCount;
             }
           } else {
-            var _currentBundleDiscoun3, _currentBundleDiscoun4, _flatItem$parentProdu9;
+            var _currentBundleDiscoun3, _currentBundleDiscoun4, _flatItem$parentProdu10;
             // 不拆分：直接应用折扣
             var _currentBundleDiscount = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_currentBundleDiscount.id, true);
@@ -1529,7 +1749,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 product_discount_difference: _productDiscountDifference
               }),
               config: _currentBundleDiscount === null || _currentBundleDiscount === void 0 ? void 0 : _currentBundleDiscount.config,
-              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
+              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.num) || 1)
             };
 
             // 记录实际应用的折扣

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingByStep/index.js

@@ -2568,8 +2568,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   _step3;
                 try {
                   for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var _time$event_list;
                     var time = _step3.value;
-                    var _iterator4 = _createForOfIteratorHelper(time.event_list || []),
+                    var blockedTimes = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.filter(function (event) {
+                      return event.type !== 'schedule_event';
+                    });
+                    var _iterator4 = _createForOfIteratorHelper(blockedTimes || []),
                       _step4;
                     try {
                       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {

package/lib/modules/Rules/index.js

@@ -634,7 +634,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -1103,16 +1103,222 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               _discountId: currentBundleDiscount.id
             });
           }
-          if (normalNum > 0) {
-            processedItems.push({
-              ...flatItem,
-              // 🔥 为剩余商品生成唯一的 _id
-              _id: `${flatItem._id}_split_rest`,
-              num: normalNum,
-              quantity: normalNum,
-              discount_list: [],
-              processed: true
+          let remainingNum = normalNum;
+          let continueSplitIndex = discountNum;
+          while (remainingNum > 0) {
+            const nextApplicableDiscounts = sortedDiscountList.filter((nextDiscount) => {
+              var _a2, _b2, _c2, _d2;
+              const nextDiscountType = nextDiscount.tag || nextDiscount.type;
+              if (["good_pass", "discount_card", "product_discount_card"].includes(nextDiscountType)) {
+                if (nextDiscount.config === void 0 || !((_a2 = nextDiscount == null ? void 0 : nextDiscount.config) == null ? void 0 : _a2.isAvailable)) {
+                  return false;
+                }
+              }
+              if ((Number(product.total) <= 0 || !product.total) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find(
+                (n) => {
+                  var _a3;
+                  return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === nextDiscount.id;
+                }
+              )) && nextDiscountType !== "good_pass")
+                return false;
+              if (usedDiscounts.get(nextDiscount.id) && nextDiscountType === "good_pass")
+                return false;
+              if (nextDiscountType === "good_pass") {
+                const maxUsagePerOrder = (_c2 = nextDiscount.config) == null ? void 0 : _c2.maxUsagePerOrder;
+                if (maxUsagePerOrder && maxUsagePerOrder > 0) {
+                  const currentUsedCount = usedProductIdCounts.get(nextDiscount.product_id) || 0;
+                  if (currentUsedCount >= maxUsagePerOrder) {
+                    return false;
+                  }
+                }
+              }
+              if (["discount_card", "product_discount_card"].includes(nextDiscountType)) {
+                const limitConfig = ((_d2 = nextDiscount.config) == null ? void 0 : _d2.applicableProductLimit) || 0;
+                if (limitConfig > 0) {
+                  const currentUsedLimitCount = usedDiscountCardLimitCounts.get(nextDiscount.id) || 0;
+                  if (currentUsedLimitCount >= limitConfig) {
+                    return false;
+                  }
+                }
+              }
+              const limitedData = nextDiscount.limited_relation_product_data;
+              if (limitedData.type === "product_all") {
+                if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
+                  return false;
+                }
+                if (!this.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
+                  return false;
+                }
+                return true;
+              } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
+                if (!this.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
+                  return false;
+                }
+                return true;
+              }
+              return false;
             });
+            if (nextApplicableDiscounts.length === 0) {
+              processedItems.push({
+                ...flatItem,
+                _id: `${flatItem._id}_split_rest`,
+                num: remainingNum,
+                quantity: remainingNum,
+                discount_list: [],
+                processed: true
+              });
+              break;
+            }
+            const nextSelectedDiscountCard = nextApplicableDiscounts.find(
+              (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
+            );
+            const nextSelectedDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
+            const nextDiscType = nextSelectedDiscount.tag || nextSelectedDiscount.type;
+            const nextIsGoodPass = nextDiscType === "good_pass";
+            const nextIsDiscountCard = ["discount_card", "product_discount_card"].includes(nextDiscType);
+            const nextApplicableProductLimit = ((_C = nextSelectedDiscount.config) == null ? void 0 : _C.applicableProductLimit) || 0;
+            const nextIsNeedSplit = nextIsGoodPass || nextIsDiscountCard && nextApplicableProductLimit > 0;
+            if (!nextIsNeedSplit) {
+              const nextBundleDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
+              usedDiscounts.set(nextBundleDiscount.id, true);
+              if ((nextBundleDiscount.tag || nextBundleDiscount.type) === "good_pass") {
+                const curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
+                usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
+              }
+              const nextNoSplitType = nextBundleDiscount.tag || nextBundleDiscount.type;
+              if (["discount_card", "product_discount_card"].includes(nextNoSplitType)) {
+                const curCount = usedDiscountCardLimitCounts.get(nextBundleDiscount.id) || 0;
+                usedDiscountCardLimitCounts.set(nextBundleDiscount.id, curCount + remainingNum);
+              }
+              const nextOriginTotal = product.original_price || product.price || 0;
+              const nextTargetTotal = (0, import_utils.getDiscountAmount)(nextBundleDiscount, nextOriginTotal, nextOriginTotal);
+              const nextDiscountAmount = new import_decimal.default(nextOriginTotal).minus(nextTargetTotal).toNumber();
+              const nextUniqueId = `${flatItem._id}_split_${continueSplitIndex}`;
+              const nextBundleDiscType = nextBundleDiscount.tag === "product_discount_card" ? "discount_card" : nextBundleDiscount.tag;
+              const nextDiscountDetail = {
+                amount: nextDiscountAmount * remainingNum,
+                type: nextBundleDiscType,
+                discount: {
+                  discount_card_type: (_D = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _D.discount_card_type,
+                  fixed_amount: nextDiscountAmount,
+                  resource_id: nextBundleDiscount.id,
+                  title: nextBundleDiscount.format_title,
+                  original_amount: product.original_price,
+                  product_id: product.id,
+                  percent: nextBundleDiscount.par_value,
+                  discount_product_id: nextBundleDiscount.product_id
+                },
+                metadata: {
+                  custom_product_bundle_map_id: nextUniqueId,
+                  num: remainingNum
+                },
+                config: nextBundleDiscount == null ? void 0 : nextBundleDiscount.config,
+                _num: remainingNum * (((_E = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _E.num) || 1)
+              };
+              const nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
+              nextAppliedProducts.push(nextDiscountDetail);
+              appliedDiscountProducts.set(nextBundleDiscount.id, nextAppliedProducts);
+              processedItems.push({
+                ...flatItem,
+                _id: nextUniqueId,
+                num: remainingNum,
+                quantity: remainingNum,
+                total: nextTargetTotal,
+                price: new import_decimal.default(nextOriginTotal || 0).minus(nextDiscountDetail.discount.fixed_amount).toNumber(),
+                discount_list: [nextDiscountDetail],
+                processed: true
+              });
+              remainingNum = 0;
+              break;
+            }
+            let nextMaxUsageLimit;
+            if (nextIsGoodPass) {
+              const nextGoodPassCount = nextApplicableDiscounts.filter(
+                (item) => (item.tag || item.type) === "good_pass"
+              ).length;
+              nextMaxUsageLimit = nextGoodPassCount;
+              if ((_F = nextSelectedDiscount.config) == null ? void 0 : _F.maxUsagePerOrder) {
+                const usedCount = usedProductIdCounts.get(nextSelectedDiscount.product_id) || 0;
+                nextMaxUsageLimit = Math.min(
+                  nextGoodPassCount,
+                  Math.max(0, nextSelectedDiscount.config.maxUsagePerOrder - usedCount)
+                );
+              }
+            } else if (nextIsDiscountCard && nextApplicableProductLimit > 0) {
+              const usedLimitCount = usedDiscountCardLimitCounts.get(nextSelectedDiscount.id) || 0;
+              nextMaxUsageLimit = Math.max(0, nextApplicableProductLimit - usedLimitCount);
+            } else {
+              nextMaxUsageLimit = 1;
+            }
+            const nextSplitCount = Math.min(remainingNum, nextMaxUsageLimit);
+            if (nextSplitCount === 0) {
+              processedItems.push({
+                ...flatItem,
+                _id: `${flatItem._id}_split_rest`,
+                num: remainingNum,
+                quantity: remainingNum,
+                discount_list: [],
+                processed: true
+              });
+              break;
+            }
+            for (let j = 0; j < nextSplitCount; j++) {
+              const nextBundleDiscount = nextIsGoodPass ? nextSelectedDiscountCard || nextApplicableDiscounts[j] : nextSelectedDiscountCard || nextApplicableDiscounts[0];
+              usedDiscounts.set(nextBundleDiscount.id, true);
+              if ((nextBundleDiscount.tag || nextBundleDiscount.type) === "good_pass") {
+                const curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
+                usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
+              }
+              const nextBundleDiscTypeForCount = nextBundleDiscount.tag || nextBundleDiscount.type;
+              if (["discount_card", "product_discount_card"].includes(nextBundleDiscTypeForCount)) {
+                const curLimitCount = usedDiscountCardLimitCounts.get(nextBundleDiscount.id) || 0;
+                usedDiscountCardLimitCounts.set(nextBundleDiscount.id, curLimitCount + 1);
+              }
+              const nextUniqueId = `${flatItem._id}_split_${continueSplitIndex}`;
+              const nextDiscountedPrice = (0, import_utils.getDiscountAmount)(
+                nextBundleDiscount,
+                product.origin_total,
+                product.origin_total
+              );
+              const nextBundleDiscAmount = new import_decimal.default(product.origin_total || 0).minus(nextDiscountedPrice).toNumber();
+              const nextBundleDiscTypeStr = nextBundleDiscount.tag === "product_discount_card" ? "discount_card" : nextBundleDiscount.tag;
+              const nextDiscountDetail = {
+                amount: nextBundleDiscAmount,
+                type: nextBundleDiscTypeStr,
+                discount: {
+                  discount_card_type: (_G = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _G.discount_card_type,
+                  fixed_amount: nextBundleDiscAmount,
+                  resource_id: nextBundleDiscount.id,
+                  title: nextBundleDiscount.format_title,
+                  original_amount: product.origin_total,
+                  product_id: product.id,
+                  percent: nextBundleDiscount.par_value,
+                  discount_product_id: nextBundleDiscount.product_id
+                },
+                metadata: {
+                  custom_product_bundle_map_id: nextUniqueId,
+                  num: 1
+                },
+                _num: 1,
+                config: nextBundleDiscount == null ? void 0 : nextBundleDiscount.config
+              };
+              const nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
+              nextAppliedProducts.push(nextDiscountDetail);
+              appliedDiscountProducts.set(nextBundleDiscount.id, nextAppliedProducts);
+              processedItems.push({
+                ...flatItem,
+                _id: nextUniqueId,
+                num: 1,
+                quantity: 1,
+                price: nextDiscountedPrice,
+                total: nextDiscountedPrice,
+                discount_list: [nextDiscountDetail],
+                processed: true,
+                _discountId: nextBundleDiscount.id
+              });
+              continueSplitIndex++;
+            }
+            remainingNum -= nextSplitCount;
           }
         } else {
           const currentBundleDiscount = selectedDiscountCard || applicableDiscounts[0];
@@ -1152,9 +1358,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: bundleActualDiscountAmount * (product.num || 1),
             type: currentBundleDiscount.tag === "product_discount_card" ? "discount_card" : currentBundleDiscount.tag,
             discount: {
-              discount_card_type: (_C = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _C.discount_card_type,
+              discount_card_type: (_H = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _H.discount_card_type,
               fixed_amount: bundleActualDiscountAmount,
-              discount_calculation_mode: (_D = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _D.discount_calculation_mode,
+              discount_calculation_mode: (_I = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _I.discount_calculation_mode,
               resource_id: currentBundleDiscount.id,
               title: currentBundleDiscount.format_title,
               original_amount: product.original_price,
@@ -1171,7 +1377,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: currentBundleDiscount == null ? void 0 : currentBundleDiscount.config,
-            _num: (product.num || 1) * (((_E = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _E.num) || 1)
+            _num: (product.num || 1) * (((_J = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _J.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(currentBundleDiscount.id) || [];
           appliedProducts.push(discountDetail);

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -1776,10 +1776,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentStartTime: currentStartTime2,
               times
             }) {
+              var _a4;
               const currentStart = (0, import_dayjs.default)(currentStartTime2);
               let earliestBlockStart;
               for (const time of times || []) {
-                for (const event of time.event_list || []) {
+                const blockedTimes = (_a4 = time.event_list) == null ? void 0 : _a4.filter((event) => event.type !== "schedule_event");
+                for (const event of blockedTimes || []) {
                   const eventStart = (0, import_dayjs.default)(event.start_at);
                   const eventEnd = (0, import_dayjs.default)(event.end_at);
                   if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {

package/package.json

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