@pisell/pisellos 0.0.434 → 0.0.436

package/dist/modules/Date/index.js

@@ -85,6 +85,14 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDateRange",
     value: function setDateRange(dateRange) {
+      var _this2 = this;
+      // 如果 dateRange 传入的日期里没有 resource，但是本地有的，要尝试补充下
+      dateRange.forEach(function (item) {
+        var _item$resource;
+        if (!((_item$resource = item.resource) !== null && _item$resource !== void 0 && _item$resource.length)) {
+          item.resource = _this2.getResourcesListByDate(item.date);
+        }
+      });
       this.store.dateRange = dateRange;
     }
   }, {
@@ -157,10 +165,10 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           return n.date === item.date;
         });
         if (currentItemIndex !== -1) {
-          var _item$resource, _currentItem$resource3;
+          var _item$resource2, _currentItem$resource3;
           var currentItem = currentDateList[currentItemIndex];
           // 看那一天的数据有没有相同的，把不同的资源合并进去即可
-          var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
+          var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.filter(function (n) {
             var _currentItem$resource2;
             return !((_currentItem$resource2 = currentItem.resource) !== null && _currentItem$resource2 !== void 0 && _currentItem$resource2.some(function (m) {
               return m.id === n.id;
@@ -168,8 +176,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           });
           // 如果有相同的资源，则使用 item 中的新的resource.times，而不是 currentItem 中的
           (_currentItem$resource3 = currentItem.resource) === null || _currentItem$resource3 === void 0 || _currentItem$resource3.forEach(function (n) {
-            var _item$resource2;
-            var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.find(function (m) {
+            var _item$resource3;
+            var newResource = (_item$resource3 = item.resource) === null || _item$resource3 === void 0 ? void 0 : _item$resource3.find(function (m) {
               return m.id === n.id;
             });
             if (newResource) {
@@ -261,7 +269,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "correctResourceTimeSlots",
     value: function correctResourceTimeSlots(resourcesData) {
-      var _this2 = this;
+      var _this3 = this;
       return resourcesData.map(function (resource) {
         // 检查资源是否有 times 数组和 start_time
         if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
@@ -284,7 +292,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           // 如果 start_at 早于资源的 start_time，需要修正
           if (startAt.isBefore(resourceStartTime)) {
             // 将 start_time 向上取整到下一个10分钟整数
-            var roundedStartTime = _this2.roundUpToNext10Minutes(resourceStartTime);
+            var roundedStartTime = _this3.roundUpToNext10Minutes(resourceStartTime);
             var roundedStartTimeDayjs = dayjs(roundedStartTime);
             console.log("[DateModule] \u4FEE\u6B63\u65F6\u95F4\u6BB5\u5F00\u59CB\u65F6\u95F4: ".concat(timeSlot.start_at, " -> ").concat(roundedStartTime, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u539F\u59CBstart_time: ").concat(resource.start_time, ")"));
 

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -29,7 +29,9 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
+        unavailableReason?: UnavailableReason;
     };
+    private getUnavailableReason;
     calcDiscount({ discountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];

package/dist/modules/Rules/index.js

@@ -1,6 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 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); }
@@ -24,6 +25,7 @@ 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 { UnavailableReason } from "./types";
 import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime, isOrderLevelFixedAmountDiscount, calculateOrderLevelDiscountAllocation } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
@@ -150,7 +152,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return {
           isAvailable: false,
           discountList: oldDiscountList,
-          productList: productList
+          productList: productList,
+          unavailableReason: UnavailableReason.AlreadyUsed
         };
       }
 
@@ -196,12 +199,93 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       });
+
+      // 如果券不可用，判断不可用原因
+      var unavailableReason;
+      if (!hasApplicableDiscount) {
+        unavailableReason = this.getUnavailableReason(newDiscountList, productList);
+      }
       return {
         isAvailable: hasApplicableDiscount,
         discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
-        productList: hasApplicableDiscount ? result.productList : productList
+        productList: hasApplicableDiscount ? result.productList : productList,
+        unavailableReason: unavailableReason
       };
     }
+
+    // 获取券不可用的原因
+  }, {
+    key: "getUnavailableReason",
+    value: function getUnavailableReason(discountList, productList) {
+      // 检查时间限制
+      var _iterator = _createForOfIteratorHelper(discountList),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var discount = _step.value;
+          var _iterator3 = _createForOfIteratorHelper(productList),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var item = _step3.value;
+              var product = this.hooks.getProduct(item);
+              var bookingTime = ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss');
+              var filteredList = filterDiscountListByBookingTime([discount], bookingTime);
+              if (filteredList.length === 0) {
+                return UnavailableReason.TimeLimit;
+              }
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+        }
+
+        // 检查商品适用性
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      var _iterator2 = _createForOfIteratorHelper(discountList),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _discount = _step2.value;
+          var limitedData = _discount.limited_relation_product_data;
+          var hasApplicableProduct = false;
+          var _iterator4 = _createForOfIteratorHelper(productList),
+            _step4;
+          try {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var _limitedData$product_;
+              var _item = _step4.value;
+              var _product = this.hooks.getProduct(_item);
+              if (limitedData.type === 'product_all') {
+                hasApplicableProduct = true;
+                break;
+              } else if ((_limitedData$product_ = limitedData.product_ids) !== null && _limitedData$product_ !== void 0 && _limitedData$product_.includes(_product.id)) {
+                hasApplicableProduct = true;
+                break;
+              }
+            }
+          } catch (err) {
+            _iterator4.e(err);
+          } finally {
+            _iterator4.f();
+          }
+          if (!hasApplicableProduct) {
+            return UnavailableReason.ProductNotApplicable;
+          }
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      return UnavailableReason.Unknown;
+    }
   }, {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
@@ -555,7 +639,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 辅助函数：检查商品是否对某个折扣卡可用
       var checkItemApplicableForDiscount = function checkItemApplicableForDiscount(flatItem, discount) {
-        var _product, _product2, _product3, _flatItem$bundleItem, _flatItem$bundleItem2, _product4;
+        var _product2, _product3, _product4, _flatItem$bundleItem, _flatItem$bundleItem2, _product5;
         var product;
         if (flatItem.type === 'main') {
           product = flatItem.product;
@@ -574,7 +658,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 编辑的商品使用了优惠券不可用
-        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 (d) {
+        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 (d) {
           return d.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.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.discount_list) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem2 = flatItem.bundleItem) !== null && _flatItem$bundleItem2 !== void 0 && (_flatItem$bundleItem2 = _flatItem$bundleItem2.discount_list) !== null && _flatItem$bundleItem2 !== void 0 && _flatItem$bundleItem2.every(function (d) {
           return d.id;
@@ -595,7 +679,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var limitedData = discount.limited_relation_product_data;
 
         // 时间限制检查
-        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product4 = product) === null || _product4 === void 0 ? void 0 : _product4.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
         if (!timeLimit) {
           return false;
         }
@@ -760,7 +844,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           originProduct = flatItem.originProduct;
         }
         addModeDiscount.forEach(function (discount) {
-          var _product5, _product6, _product7, _product8, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
+          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
@@ -769,12 +853,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
-          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
           var isLimitedProduct = (limitedData.type === 'product_all' && limitedData.filter !== 1 || limitedData.type === 'product_all' && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
-          var isAvailableProduct = flatItem.type === 'main' ? !((_product6 = product) !== null && _product6 !== void 0 && _product6.booking_id && (_product7 = product) !== null && _product7 !== void 0 && (_product7 = _product7.discount_list) !== null && _product7 !== void 0 && _product7.length && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.every(function (discount) {
+          var isAvailableProduct = flatItem.type === 'main' ? !((_product7 = product) !== null && _product7 !== void 0 && _product7.booking_id && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.length && (_product9 = product) !== null && _product9 !== void 0 && (_product9 = _product9.discount_list) !== null && _product9 !== void 0 && _product9.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$bundleItem3 = flatItem.bundleItem) !== null && _flatItem$bundleItem3 !== void 0 && (_flatItem$bundleItem3 = _flatItem$bundleItem3.discount_list) !== null && _flatItem$bundleItem3 !== void 0 && _flatItem$bundleItem3.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem4 = flatItem.bundleItem) !== null && _flatItem$bundleItem4 !== void 0 && (_flatItem$bundleItem4 = _flatItem$bundleItem4.discount_list) !== null && _flatItem$bundleItem4 !== void 0 && _flatItem$bundleItem4.every(function (discount) {
             return discount.id;
@@ -827,7 +911,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product9, _product$discount_lis2, _product10;
+        var _product10, _product$discount_lis2, _product11;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -853,7 +937,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 已有优惠的商品跳过
-        if ((_product9 = product) !== null && _product9 !== void 0 && _product9.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product10 = product) !== null && _product10 !== void 0 && (_product10 = _product10.discount_list) !== null && _product10 !== void 0 && _product10.every(function (discount) {
+        if ((_product10 = product) !== null && _product10 !== void 0 && _product10.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product11 = product) !== null && _product11 !== void 0 && (_product11 = _product11.discount_list) !== null && _product11 !== void 0 && _product11.every(function (discount) {
           return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
         })) {
           if (flatItem.type === 'main') {
@@ -949,12 +1033,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis5, _product11, _product11$every;
+          var _product$discount_lis5, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
             var _ref6;
             return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
-          }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
+          }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
         } else {

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

@@ -1,4 +1,10 @@
 import { Discount } from '../Discount/types';
+export declare enum UnavailableReason {
+    TimeLimit = "time_limit",
+    ProductNotApplicable = "product_not_applicable",
+    AlreadyUsed = "already_used",
+    Unknown = "unknown"
+}
 export declare enum RulesHooks {
     OnRulesListChange = "rules:onRulesListChange",
     OnDestroy = "rules:onDestroy"

package/dist/modules/Rules/types.js

@@ -1,3 +1,11 @@
+// 券不可用原因枚举
+export var UnavailableReason = /*#__PURE__*/function (UnavailableReason) {
+  UnavailableReason["TimeLimit"] = "time_limit";
+  UnavailableReason["ProductNotApplicable"] = "product_not_applicable";
+  UnavailableReason["AlreadyUsed"] = "already_used";
+  UnavailableReason["Unknown"] = "unknown";
+  return UnavailableReason;
+}({});
 export var RulesHooks = /*#__PURE__*/function (RulesHooks) {
   RulesHooks["OnRulesListChange"] = "rules:onRulesListChange";
   RulesHooks["OnDestroy"] = "rules:onDestroy";

package/dist/modules/Summary/utils.js

@@ -336,7 +336,6 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
       var bundlePreciseTax = new Decimal(0);
       var bundleRoundedOriginTax = new Decimal(0);
       var bundleRoundedTax = new Decimal(0);
-      debugger;
       if (Array.isArray(item === null || item === void 0 ? void 0 : item.bundle)) {
         var _iterator3 = _createForOfIteratorHelper(item === null || item === void 0 ? void 0 : item.bundle),
           _step3;
@@ -346,7 +345,7 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
             // 只处理原价的子商品
             if (getBundleItemIsOriginalPrice(bundleItem)) {
               var _ref3, _bundleItem$bundle_se;
-              var bundleQuantity = new Decimal(bundleItem.quantity || 1);
+              var bundleQuantity = new Decimal(bundleItem.num || bundleItem.quantity || 1);
               var bundleUnitPrice = new Decimal((_ref3 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
 
               // 计算原始税费（折扣前）- 单个商品（精确值）
@@ -474,14 +473,18 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
  * @returns 精确的税费值（Decimal类型）
  */
 var getProductItemTax = function getProductItemTax(item, state, options) {
-  var _bookingDetail$tax_ra, _ref4, _bookingDetail$is_pri;
+  var _ref4, _item$quantity, _bookingDetail$tax_ra, _ref5, _bookingDetail$is_pri;
   var bookingDetail = state.bookingDetail;
   var tax_rate = options.tax_rate,
     is_price_include_tax = options.is_price_include_tax;
 
   // 折扣后的金额 = 商品金额 - 商品折扣
   var productDiscountPrice = new Decimal(item.total || 0);
-  var quantity = new Decimal(item.num || 1);
+  /**
+   * 注意：该函数被多处以“单件税费”方式调用（调用方会显式传入 quantity: 1），
+   * 因此这里必须优先使用 `item.quantity`，否则会出现数量被重复相乘（外层再乘一次 num）的情况。
+   */
+  var quantity = new Decimal((_ref4 = (_item$quantity = item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : item.num) !== null && _ref4 !== void 0 ? _ref4 : 1);
 
   // 如果商品金额小于或等于0，不计算税费
   if (productDiscountPrice.lte(0)) {
@@ -491,7 +494,7 @@ var getProductItemTax = function getProductItemTax(item, state, options) {
   // 优先从 bookingDetail 取税率和是否含税设置，取不到则从 options 中取（兼容新增模式）
   // 注意：bookingDetail中的tax_rate不需要除以100，options 中的tax_rate需要除以100
   var currentTaxRate = new Decimal((_bookingDetail$tax_ra = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.tax_rate) !== null && _bookingDetail$tax_ra !== void 0 ? _bookingDetail$tax_ra : tax_rate ? tax_rate / 100 : 0);
-  var currentIsPriceIncludeTax = (_ref4 = (_bookingDetail$is_pri = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.is_price_include_tax) !== null && _bookingDetail$is_pri !== void 0 ? _bookingDetail$is_pri : is_price_include_tax) !== null && _ref4 !== void 0 ? _ref4 : 0;
+  var currentIsPriceIncludeTax = (_ref5 = (_bookingDetail$is_pri = bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.is_price_include_tax) !== null && _bookingDetail$is_pri !== void 0 ? _bookingDetail$is_pri : is_price_include_tax) !== null && _ref5 !== void 0 ? _ref5 : 0;
   var singleItemTax = new Decimal(0);
 
   // 计算单个商品税费, 一次性商品 is_charge_tax 可能为空
@@ -567,9 +570,9 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
   if (!(items !== null && items !== void 0 && items.length)) {
     return '0.00';
   }
-  var _ref5 = shopInfo || {},
-    is_price_include_tax = _ref5.is_price_include_tax,
-    tax_rate = _ref5.tax_rate;
+  var _ref6 = shopInfo || {},
+    is_price_include_tax = _ref6.is_price_include_tax,
+    tax_rate = _ref6.tax_rate;
   var totalTaxFee = items.reduce(function (sum, item) {
     var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
@@ -631,9 +634,9 @@ export var calculateDeposit = function calculateDeposit(items) {
  * @param options.isEdit 是否处于“编辑中”。`false` 时会优先走后端金额直取逻辑（若存在）
  * @returns 订单附加费金额（number，金额单位与商品价格一致）
  */
-export var getSurchargeAmount = function getSurchargeAmount(_ref6, surcharge, options) {
-  var bookingDetail = _ref6.bookingDetail,
-    bookingId = _ref6.bookingId;
+export var getSurchargeAmount = function getSurchargeAmount(_ref7, surcharge, options) {
+  var bookingDetail = _ref7.bookingDetail,
+    bookingId = _ref7.bookingId;
   var isEdit = options.isEdit;
   // 订单未变更过
   if (!isEdit) {
@@ -678,9 +681,13 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref7, _ref8, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData$pro;
-  var total = new Decimal((_ref7 = (_ref8 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : 0);
-  var mainProductDiscountAmount = getDiscountAmount((item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData$pro = item._originData.product) === null || _item$_originData$pro === void 0 ? void 0 : _item$_originData$pro.discount_list) || []);
+  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData;
+  var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item.price) !== null && _ref8 !== void 0 ? _ref8 : 0);
+  var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.discount_list) === null || _item$_originData === void 0 ? void 0 : _item$_originData.filter(function (item) {
+    var _item$metadata2;
+    return !(item !== null && item !== void 0 && (_item$metadata2 = item.metadata) !== null && _item$metadata2 !== void 0 && _item$metadata2.custom_product_bundle_map_id);
+  })) || [];
+  var mainProductDiscountAmount = getDiscountAmount(discount);
   total = total.minus(mainProductDiscountAmount);
 
   // 单规格
@@ -695,11 +702,11 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref9, _bundleItem$bundle_se2;
+        var _ref10, _bundleItem$bundle_se2;
         // 子商品折扣金额
         var discountAmount = getDiscountAmount(bundleItem.discount_list);
         // 子商品价格
-        var bundleItemPrice = new Decimal((_ref9 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref9 !== void 0 ? _ref9 : 0);
+        var bundleItemPrice = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
         // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
         var bundleItemTotal = bundleItemPrice.minus(discountAmount);
         total = total.add(bundleItemTotal);
@@ -822,11 +829,11 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param options.scheduleById schedule 映射表：`{ [scheduleId]: schedule }`（用于根据配置的 `available_schedule_ids` 做日程匹配）
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
-export var getSurcharge = function getSurcharge(_ref10, options) {
-  var service = _ref10.service,
-    addons = _ref10.addons,
-    bookingDetail = _ref10.bookingDetail,
-    bookingId = _ref10.bookingId;
+export var getSurcharge = function getSurcharge(_ref11, options) {
+  var service = _ref11.service,
+    addons = _ref11.addons,
+    bookingDetail = _ref11.bookingDetail,
+    bookingId = _ref11.bookingId;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -938,11 +945,11 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
                 scheduleById: scheduleById || {},
                 isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref11, _bundleItem$bundle_se3;
+                var _ref12, _bundleItem$bundle_se3;
                 var _mainQuantity = item.num || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref11 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref11 !== void 0 ? _ref11 : 0),
+                  total: Number((_ref12 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -1156,9 +1163,9 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
   }
   return surchargeWithAmount;
 };
-function resetItemsSurchargeSideEffects(_ref12) {
-  var service = _ref12.service,
-    addons = _ref12.addons;
+function resetItemsSurchargeSideEffects(_ref13) {
+  var service = _ref13.service,
+    addons = _ref13.addons;
   var resetItem = function resetItem(item) {
     if (!item) return;
     item.surcharge_fee = 0;

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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,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

@@ -1163,7 +1163,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
-      debugger;
       // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
       if (isSessionProduct(productData)) {
         if (!date || !date.startTime || !date.endTime) {
@@ -2138,6 +2137,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
+
+      // 如果依然 resources 空的，则证明他是切换日期了，此时直接从 date 模块里取
+      if (resources.length === 0) {
+        resources.push.apply(resources, _toConsumableArray(this.store.date.getResourcesListByDate(dateRange[0].date) || []));
+      }
       var resourcesMap = getResourcesMap(resources);
       var duration = 0;
       // duration = 不同账号的最长时间

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -2,6 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Customer, SetDiscountSelectedParams } from './types';
 import { Discount } from '../../modules/Discount/types';
+import { UnavailableReason } from '../../modules/Rules/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -43,6 +44,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
+        unavailableReason?: UnavailableReason;
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/dist/solution/ShopDiscount/index.js

@@ -28,6 +28,7 @@ import { BaseModule } from "../../modules/BaseModule";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
 import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
+import { UnavailableReason } from "../../modules/Rules/types";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
@@ -398,7 +399,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -423,7 +424,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                unavailableReason: UnavailableReason.Unknown
               });
             case 10:
               if (resultDiscountList.length) {
@@ -471,7 +473,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
-              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
+              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
               if (!isAvailable) {
                 _context5.next = 24;
                 break;
@@ -490,7 +492,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
-                discountList: newDiscountList || this.getDiscountList()
+                discountList: newDiscountList || this.getDiscountList(),
+                unavailableReason: unavailableReason
               });
             case 27:
               _context5.prev = 27;
@@ -500,7 +503,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                unavailableReason: UnavailableReason.Unknown
               });
             case 31:
             case "end":

package/lib/modules/Date/index.js

@@ -64,6 +64,12 @@ var DateModule = class extends import_BaseModule.BaseModule {
     }
   }
   setDateRange(dateRange) {
+    dateRange.forEach((item) => {
+      var _a;
+      if (!((_a = item.resource) == null ? void 0 : _a.length)) {
+        item.resource = this.getResourcesListByDate(item.date);
+      }
+    });
     this.store.dateRange = dateRange;
   }
   getDateRange() {

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -29,7 +29,9 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
+        unavailableReason?: UnavailableReason;
     };
+    private getUnavailableReason;
     calcDiscount({ discountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];

package/lib/modules/Rules/index.js

@@ -33,6 +33,7 @@ __export(Rules_exports, {
 });
 module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
+var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
@@ -99,7 +100,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return {
         isAvailable: false,
         discountList: oldDiscountList,
-        productList
+        productList,
+        unavailableReason: import_types.UnavailableReason.AlreadyUsed
       };
     }
     const filteredOldDiscountList = oldDiscountList.filter(
@@ -141,12 +143,49 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       }
     });
+    let unavailableReason;
+    if (!hasApplicableDiscount) {
+      unavailableReason = this.getUnavailableReason(newDiscountList, productList);
+    }
     return {
       isAvailable: hasApplicableDiscount,
       discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
-      productList: hasApplicableDiscount ? result.productList : productList
+      productList: hasApplicableDiscount ? result.productList : productList,
+      unavailableReason
     };
   }
+  // 获取券不可用的原因
+  getUnavailableReason(discountList, productList) {
+    var _a;
+    for (const discount of discountList) {
+      for (const item of productList) {
+        const product = this.hooks.getProduct(item);
+        const bookingTime = ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss");
+        const filteredList = (0, import_utils.filterDiscountListByBookingTime)([discount], bookingTime);
+        if (filteredList.length === 0) {
+          return import_types.UnavailableReason.TimeLimit;
+        }
+      }
+    }
+    for (const discount of discountList) {
+      const limitedData = discount.limited_relation_product_data;
+      let hasApplicableProduct = false;
+      for (const item of productList) {
+        const product = this.hooks.getProduct(item);
+        if (limitedData.type === "product_all") {
+          hasApplicableProduct = true;
+          break;
+        } else if ((_a = limitedData.product_ids) == null ? void 0 : _a.includes(product.id)) {
+          hasApplicableProduct = true;
+          break;
+        }
+      }
+      if (!hasApplicableProduct) {
+        return import_types.UnavailableReason.ProductNotApplicable;
+      }
+    }
+    return import_types.UnavailableReason.Unknown;
+  }
   calcDiscount({
     discountList,
     productList,

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

@@ -1,4 +1,10 @@
 import { Discount } from '../Discount/types';
+export declare enum UnavailableReason {
+    TimeLimit = "time_limit",
+    ProductNotApplicable = "product_not_applicable",
+    AlreadyUsed = "already_used",
+    Unknown = "unknown"
+}
 export declare enum RulesHooks {
     OnRulesListChange = "rules:onRulesListChange",
     OnDestroy = "rules:onDestroy"

package/lib/modules/Rules/types.js

@@ -19,9 +19,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Rules/types.ts
 var types_exports = {};
 __export(types_exports, {
-  RulesHooks: () => RulesHooks
+  RulesHooks: () => RulesHooks,
+  UnavailableReason: () => UnavailableReason
 });
 module.exports = __toCommonJS(types_exports);
+var UnavailableReason = /* @__PURE__ */ ((UnavailableReason2) => {
+  UnavailableReason2["TimeLimit"] = "time_limit";
+  UnavailableReason2["ProductNotApplicable"] = "product_not_applicable";
+  UnavailableReason2["AlreadyUsed"] = "already_used";
+  UnavailableReason2["Unknown"] = "unknown";
+  return UnavailableReason2;
+})(UnavailableReason || {});
 var RulesHooks = /* @__PURE__ */ ((RulesHooks2) => {
   RulesHooks2["OnRulesListChange"] = "rules:onRulesListChange";
   RulesHooks2["OnDestroy"] = "rules:onDestroy";
@@ -29,5 +37,6 @@ var RulesHooks = /* @__PURE__ */ ((RulesHooks2) => {
 })(RulesHooks || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RulesHooks
+  RulesHooks,
+  UnavailableReason
 });

package/lib/modules/Summary/utils.js

@@ -212,11 +212,10 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
     let bundlePreciseTax = new import_decimal.default(0);
     let bundleRoundedOriginTax = new import_decimal.default(0);
     let bundleRoundedTax = new import_decimal.default(0);
-    debugger;
     if (Array.isArray(item == null ? void 0 : item.bundle)) {
       for (let bundleItem of item == null ? void 0 : item.bundle) {
         if (getBundleItemIsOriginalPrice(bundleItem)) {
-          const bundleQuantity = new import_decimal.default(bundleItem.quantity || 1);
+          const bundleQuantity = new import_decimal.default(bundleItem.num || bundleItem.quantity || 1);
           const bundleUnitPrice = new import_decimal.default(
             bundleItem.bundle_selling_price ?? bundleItem.price ?? 0
           );
@@ -294,7 +293,7 @@ var getProductItemTax = (item, state, options) => {
   const { bookingDetail } = state;
   const { tax_rate, is_price_include_tax } = options;
   const productDiscountPrice = new import_decimal.default(item.total || 0);
-  const quantity = new import_decimal.default(item.num || 1);
+  const quantity = new import_decimal.default(item.quantity ?? item.num ?? 1);
   if (productDiscountPrice.lte(0)) {
     return new import_decimal.default(0);
   }
@@ -409,9 +408,13 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
-  const mainProductDiscountAmount = getDiscountAmount(((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_d = item == null ? void 0 : item._originData.product) == null ? void 0 : _d.discount_list) || []);
+  const discount = ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_f = (_e = (_d = item == null ? void 0 : item._originData) == null ? void 0 : _d.product) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.filter((item2) => {
+    var _a2;
+    return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+  })) || [];
+  const mainProductDiscountAmount = getDiscountAmount(discount);
   total = total.minus(mainProductDiscountAmount);
   if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
     total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {

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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -358,7 +358,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

@@ -608,7 +608,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
-    debugger;
     if ((0, import_products.isSessionProduct)(productData)) {
       if (!date || !date.startTime || !date.endTime) {
         return { success: false, errorCode: "date_or_time_required" };
@@ -1464,6 +1463,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     }
+    if (resources.length === 0) {
+      resources.push(...this.store.date.getResourcesListByDate(dateRange[0].date) || []);
+    }
     const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     let duration = 0;
     const accountList = this.store.accountList.getAccounts();

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -2,6 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Customer, SetDiscountSelectedParams } from './types';
 import { Discount } from '../../modules/Discount/types';
+import { UnavailableReason } from '../../modules/Rules/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -43,6 +44,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
+        unavailableReason?: UnavailableReason;
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/lib/solution/ShopDiscount/index.js

@@ -37,6 +37,7 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 var import_utils = require("./utils");
+var import_types = require("../../modules/Rules/types");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
@@ -274,7 +275,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           type: "clientCalc",
           isAvailable: false,
           productList: this.store.productList || [],
-          discountList: this.getDiscountList()
+          discountList: this.getDiscountList(),
+          unavailableReason: import_types.UnavailableReason.Unknown
         };
       }
       if (!resultDiscountList.length) {
@@ -303,7 +305,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const {
         productList: newProductList,
         discountList: newDiscountList,
-        isAvailable
+        isAvailable,
+        unavailableReason
       } = rulesModule.isDiscountListAvailable({
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
@@ -330,7 +333,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: isAvailable || false,
         productList: newProductList || this.store.productList || [],
-        discountList: newDiscountList || this.getDiscountList()
+        discountList: newDiscountList || this.getDiscountList(),
+        unavailableReason
       };
     } catch (error) {
       console.error("[ShopDiscount] 扫码出错:", error);
@@ -338,7 +342,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: false,
         productList: this.store.productList || [],
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        unavailableReason: import_types.UnavailableReason.Unknown
       };
     }
   }

package/package.json

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