@pisell/pisellos 1.0.73 → 1.0.75

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

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

package/dist/solution/BookingByStep/index.js

@@ -2690,41 +2690,35 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 与其他资源的时间段求交集
       var _loop2 = function _loop2() {
-          var currentResourceSlots = allTimeSlots[i];
-          var intersections = [];
-
-          // 计算当前公共时间段与下一个资源时间段的交集
-          commonSlots.forEach(function (commonSlot) {
-            currentResourceSlots.forEach(function (currentSlot) {
-              var overlapStart = commonSlot.start.isAfter(currentSlot.start) ? commonSlot.start : currentSlot.start;
-              var overlapEnd = commonSlot.end.isBefore(currentSlot.end) ? commonSlot.end : currentSlot.end;
-
-              // 如果有重叠时间且重叠时间大于0
-              if (overlapStart.isBefore(overlapEnd)) {
-                intersections.push({
-                  start: overlapStart,
-                  end: overlapEnd
-                });
-              }
-            });
+        var currentResourceSlots = allTimeSlots[i];
+        var intersections = [];
+
+        // 计算当前公共时间段与下一个资源时间段的交集
+        commonSlots.forEach(function (commonSlot) {
+          currentResourceSlots.forEach(function (currentSlot) {
+            var overlapStart = commonSlot.start.isAfter(currentSlot.start) ? commonSlot.start : currentSlot.start;
+            var overlapEnd = commonSlot.end.isBefore(currentSlot.end) ? commonSlot.end : currentSlot.end;
+
+            // 如果有重叠时间且重叠时间大于0
+            if (overlapStart.isBefore(overlapEnd)) {
+              intersections.push({
+                start: overlapStart,
+                end: overlapEnd
+              });
+            }
           });
-          commonSlots = intersections;
-          console.log("\u4E0E\u8D44\u6E90".concat(i, "\u6C42\u4EA4\u96C6\u540E\u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonSlots.map(function (slot) {
-            return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
-          }));
-
-          // 如果没有公共时间段，直接返回
-          if (commonSlots.length === 0) {
-            console.log('没有找到公共时间段');
-            return {
-              v: []
-            };
-          }
-        },
-        _ret2;
+        });
+        if (intersections.length === 0) {
+          console.log("\u8D44\u6E90".concat(i, "\u4E0E\u5F53\u524D\u516C\u5171\u65F6\u95F4\u6BB5\u65E0\u4EA4\u96C6\uFF0C\u8DF3\u8FC7\u8BE5\u8D44\u6E90"));
+          return 1; // continue
+        }
+        commonSlots = intersections;
+        console.log("\u4E0E\u8D44\u6E90".concat(i, "\u6C42\u4EA4\u96C6\u540E\u7684\u516C\u5171\u65F6\u95F4\u6BB5:"), commonSlots.map(function (slot) {
+          return "".concat(slot.start.format('HH:mm'), "-").concat(slot.end.format('HH:mm'));
+        }));
+      };
       for (var i = 1; i < allTimeSlots.length; i++) {
-        _ret2 = _loop2();
-        if (_ret2) return _ret2.v;
+        if (_loop2()) continue;
       }
 
       // 格式化返回结果
@@ -2973,10 +2967,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             });
           },
-          _ret3;
+          _ret2;
         for (var _i = 0, _Object$entries = Object.entries(itemsByResourceType); _i < _Object$entries.length; _i++) {
-          _ret3 = _loop3();
-          if (_ret3) return _ret3.v;
+          _ret2 = _loop3();
+          if (_ret2) return _ret2.v;
         }
 
         // 如果有容量问题，找出限制最严格的资源类型，返回其总容量
@@ -3073,11 +3067,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             };
           }
         },
-        _ret4;
+        _ret3;
       for (var _i2 = 0, _Object$entries2 = Object.entries(cartItemsByTimeSlot); _i2 < _Object$entries2.length; _i2++) {
-        _ret4 = _loop4();
-        if (_ret4 === 0) continue;
-        if (_ret4) return _ret4.v;
+        _ret3 = _loop4();
+        if (_ret3 === 0) continue;
+        if (_ret3) return _ret3.v;
       }
 
       // 全部通过检测，返回成功和最小可用数量
@@ -3404,10 +3398,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             });
           },
-          _ret5;
+          _ret4;
         for (var _i3 = 0, _Object$entries3 = Object.entries(itemsByResourceType); _i3 < _Object$entries3.length; _i3++) {
-          _ret5 = _loop5();
-          if (_ret5) return _ret5.v;
+          _ret4 = _loop5();
+          if (_ret4) return _ret4.v;
         }
 
         // 如果有容量问题，找出限制最严格的资源类型，返回其总容量
@@ -3504,11 +3498,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             };
           }
         },
-        _ret6;
+        _ret5;
       for (var _i4 = 0, _Object$entries4 = Object.entries(cartItemsByTimeSlot); _i4 < _Object$entries4.length; _i4++) {
-        _ret6 = _loop6();
-        if (_ret6 === 0) continue;
-        if (_ret6) return _ret6.v;
+        _ret5 = _loop6();
+        if (_ret5 === 0) continue;
+        if (_ret5) return _ret5.v;
       }
 
       // 全部通过检测，返回成功和最小可用数量

package/dist/solution/ShopDiscount/index.js

@@ -320,7 +320,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, resultDiscountList, rulesModule, withScanList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -363,7 +363,25 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
                 });
+              }); // 如果扫回来的券当前有选中的，则不进行计算
+              currentSelectedDiscountList = this.getDiscountList().filter(function (n) {
+                return n.isSelected;
               });
+              if (!(currentSelectedDiscountList.length && currentSelectedDiscountList.some(function (n) {
+                return withScanList.some(function (m) {
+                  return m.id === n.id;
+                });
+              }))) {
+                _context5.next = 16;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: "clientCalc",
+                isAvailable: true,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 16:
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
@@ -374,27 +392,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
               if (!isAvailable) {
-                _context5.next = 21;
+                _context5.next = 24;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 21;
+                _context5.next = 24;
                 break;
               }
-              _context5.next = 21;
+              _context5.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 21:
+            case 24:
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 24:
-              _context5.prev = 24;
+            case 27:
+              _context5.prev = 27;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
@@ -403,11 +421,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 28:
+            case 31:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 24]]);
+        }, _callee5, this, [[0, 27]]);
       }));
       function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);

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

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

package/lib/solution/BookingByStep/index.js

@@ -1908,12 +1908,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
         });
       });
+      if (intersections.length === 0) {
+        console.log(`资源${i}与当前公共时间段无交集，跳过该资源`);
+        continue;
+      }
       commonSlots = intersections;
       console.log(`与资源${i}求交集后的公共时间段:`, commonSlots.map((slot) => `${slot.start.format("HH:mm")}-${slot.end.format("HH:mm")}`));
-      if (commonSlots.length === 0) {
-        console.log("没有找到公共时间段");
-        return [];
-      }
     }
     const result = commonSlots.map((slot) => ({
       startTime: slot.start.format("HH:mm"),

package/lib/solution/ShopDiscount/index.js

@@ -233,6 +233,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isScan: true
         };
       });
+      const currentSelectedDiscountList = this.getDiscountList().filter((n) => n.isSelected);
+      if (currentSelectedDiscountList.length && currentSelectedDiscountList.some((n) => withScanList.some((m) => m.id === n.id))) {
+        return {
+          type: "clientCalc",
+          isAvailable: true,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
       const {
         productList: newProductList,
         discountList: newDiscountList,

package/package.json

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