@pisell/pisellos 1.0.108 → 1.0.110

package/dist/modules/Rules/index.js

@@ -431,8 +431,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
-        var priceA = new Decimal(a.price || '0');
-        var priceB = new Decimal(b.price || '0');
+        var _ref3, _a$original_price, _ref4, _b$original_price;
+        // 子商品优先使用 original_price，主商品使用 price
+        var priceA = new Decimal(a.type === 'bundle' ? (_ref3 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref3 !== void 0 ? _ref3 : '0' : a.price || '0');
+        var priceB = new Decimal(b.type === 'bundle' ? (_ref4 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : b.price || '0');
         if (priceA.equals(priceB)) {
           // 价格相同时，主商品优先
           if (a.type !== b.type) {
@@ -943,8 +945,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis5, _product11, _product11$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);
+            var _ref5;
+            return !((_ref5 = item.discount_list || []) !== null && _ref5 !== void 0 && _ref5.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) {
             return item.type === 'product';
           })));
@@ -954,8 +956,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (parentProduct) {
             var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref4;
-              return !((_ref4 = item.discount_list || []) !== null && _ref4 !== void 0 && _ref4.length);
+              var _ref6;
+              return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
             }) && (!((_parentProduct$discou = parentProduct.discount_list) !== null && _parentProduct$discou !== void 0 && _parentProduct$discou.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou2 = parentProduct.discount_list) === null || _parentProduct$discou2 === void 0 || (_parentProduct$discou3 = _parentProduct$discou2.every) === null || _parentProduct$discou3 === void 0 ? void 0 : _parentProduct$discou3.call(_parentProduct$discou2, function (item) {
               return item.type === 'product';
             })));

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

@@ -316,6 +316,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         end_at: dayjs.Dayjs;
         count: number;
         left: number;
+        summaryCount: number;
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/dist/solution/BookingByStep/index.js

@@ -2473,10 +2473,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var resourcesUseableMap = {};
         var count = 0;
         var bookingLeft = 0;
+        var summaryCount = 0;
         // 遍历所有资源
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
           // 遍历所有资源的上工时间片
           var currentResourcesCount = 0;
+          var currentResourcesSummaryCount = 0;
           var currentResourcesTimeSlotCanUsedArr = [];
           // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
           // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
@@ -2514,6 +2516,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
               currentResourcesCount = res.remainingCapacity;
             }
+            if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
+              currentResourcesSummaryCount = res.remainingCapacity;
+            }
             currentResourcesTimeSlotCanUsedArr.push(res.usable);
           });
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
@@ -2527,6 +2532,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
             if (!m.onlyComputed) {
               bookingLeft += 1;
+              summaryCount += currentResourcesSummaryCount;
             }
           }
         });
@@ -2546,6 +2552,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
               bookingLeft = 0;
               count = 0;
+              summaryCount = 0;
             }
             // 规则 2
             var otherCartItems = cartItems.filter(function (m) {
@@ -2580,6 +2587,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
               bookingLeft = 0;
               count = 0;
+              summaryCount = 0;
             }
           } else {
             // 多个预约的检测规则：
@@ -2597,6 +2605,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
               bookingLeft = 0;
               count = 0;
+              summaryCount = 0;
             }
             // 规则2、不管是不是跟我一样的商品，只需要跟我当前商品有同一种类型的资源的同一时间的，把所有购物车的 capacity 之和 和 所有当前类型资源的 capacity 之和比较，如果超过了resourcesCapacity，则不可用
             // const otherCartItems = cartItems.filter((m) => m._productOrigin?.id?.toString() !== targetProductData?.id?.toString() && m.start_time === item.start && m.end_time === item.end);
@@ -2659,6 +2668,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
               bookingLeft = 0;
               count = 0;
+              summaryCount = 0;
             }
           }
         });
@@ -2670,7 +2680,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           start_at: startDayJs,
           end_at: endDayJs,
           count: count,
-          left: bookingLeft
+          left: bookingLeft,
+          summaryCount: summaryCount
         };
       });
       return formatScheduleTimeSlots;

package/lib/modules/Rules/index.js

@@ -305,8 +305,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const flattenedList = flattenProductsWithBundle(productList);
     const sortedFlattenedList = flattenedList.sort((a, b) => {
       var _a, _b;
-      const priceA = new import_decimal.default(a.price || "0");
-      const priceB = new import_decimal.default(b.price || "0");
+      const priceA = new import_decimal.default(
+        a.type === "bundle" ? a.original_price ?? a.price ?? "0" : a.price || "0"
+      );
+      const priceB = new import_decimal.default(
+        b.type === "bundle" ? b.original_price ?? b.price ?? "0" : b.price || "0"
+      );
       if (priceA.equals(priceB)) {
         if (a.type !== b.type) {
           return a.type === "main" ? -1 : 1;

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

@@ -316,6 +316,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         end_at: dayjs.Dayjs;
         count: number;
         left: number;
+        summaryCount: number;
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/BookingByStep/index.js

@@ -1738,8 +1738,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const resourcesUseableMap = {};
       let count = 0;
       let bookingLeft = 0;
+      let summaryCount = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
         let currentResourcesCount = 0;
+        let currentResourcesSummaryCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         const mTimes = m.times.filter((n) => {
           return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
@@ -1767,6 +1769,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
             currentResourcesCount = res.remainingCapacity;
           }
+          if (res.usable && !m.onlyComputed && res.remainingCapacity >= currentResourcesSummaryCount) {
+            currentResourcesSummaryCount = res.remainingCapacity;
+          }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
         if (!currentResourcesTimeSlotCanUsedArr.some(
@@ -1778,6 +1783,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           if (!m.onlyComputed) {
             bookingLeft += 1;
+            summaryCount += currentResourcesSummaryCount;
           }
         }
       });
@@ -1792,6 +1798,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
             bookingLeft = 0;
             count = 0;
+            summaryCount = 0;
           }
           const otherCartItems = cartItems2.filter((m) => {
             var _a2, _b2, _c2;
@@ -1817,6 +1824,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
             bookingLeft = 0;
             count = 0;
+            summaryCount = 0;
           }
         } else {
           const sameCartItems = cartItems2.filter((m) => {
@@ -1828,6 +1836,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
             bookingLeft = 0;
             count = 0;
+            summaryCount = 0;
           }
           const otherSameTimesCartItems = cartItems2.filter((m) => `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end);
           const otherCartNeedCapacity = otherSameTimesCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
@@ -1872,6 +1881,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
             bookingLeft = 0;
             count = 0;
+            summaryCount = 0;
           }
         }
       });
@@ -1883,7 +1893,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         start_at: startDayJs,
         end_at: endDayJs,
         count,
-        left: bookingLeft
+        left: bookingLeft,
+        summaryCount
       };
     });
     return formatScheduleTimeSlots;

package/lib/solution/BookingTicket/index.js

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

package/package.json

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