@pisell/pisellos 2.1.35 → 2.1.38

package/dist/solution/BookingByStep/index.js

@@ -29,7 +29,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 "../../modules/BaseModule";
-import { createModule } from "./types";
+import { BookingByStepHooks, createModule } from "./types";
 import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
 import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
@@ -137,7 +137,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.store.schedule.loadAllSchedule();
-              this.core.effects.emit("".concat(this.name, ":onInited"), {});
+              this.core.effects.emit(BookingByStepHooks.onInited, {});
             case 19:
             case "end":
               return _context.stop();
@@ -1196,7 +1196,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         date: date
       });
       // 如果 quantity 大于 1，且是预约商品，则进入购物车拆散成多条数据
-      if (addItemParams.quantity > 1 && !isNormalProduct(productData.origin)) {
+      if (addItemParams.quantity > 1 && !isNormalProduct(productData)) {
         for (var i = 0; i < addItemParams.quantity; i++) {
           var newAddItemParams = cloneDeep(addItemParams);
           newAddItemParams.quantity = 1;
@@ -2686,41 +2686,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;
       }
 
       // 格式化返回结果
@@ -2969,10 +2963,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;
         }
 
         // 如果有容量问题，找出限制最严格的资源类型，返回其总容量
@@ -3069,11 +3063,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;
       }
 
       // 全部通过检测，返回成功和最小可用数量
@@ -3400,10 +3394,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;
         }
 
         // 如果有容量问题，找出限制最严格的资源类型，返回其总容量
@@ -3500,11 +3494,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/BookingTicket/index.d.ts

@@ -22,10 +22,6 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * @returns 商品列表
      */
     loadProducts(params?: ILoadProductsParams): Promise<any>;
-    /**
-     * 初始化外设扫码结果监听
-     */
-    initPeripheralsListener(): void;
     /**
      * 获取商品列表（不加载到模块中）
      * @returns 商品列表

package/dist/solution/BookingTicket/index.js

@@ -18,7 +18,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 "../../modules/BaseModule";
-import { createModule } from "./types";
+import { BookingTicketHooks, createModule } from "./types";
 import Scan from "./utils/scan";
 import { handleGlobalScan, handleCustomerScan, handleUniversalScan } from "./utils/scan/handleScan";
 import scanCache from "./utils/scan/scanCache";
@@ -109,7 +109,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
                   throw new Error("\u6A21\u5757 ".concat(step, " \u4E0D\u5B58\u5728"));
                 }
               });
-              this.core.effects.emit("".concat(this.name, ":onInited"), {});
+              this.core.effects.emit(BookingTicketHooks.onInited, {});
             case 19:
             case "end":
               return _context.stop();
@@ -152,7 +152,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
               }));
             case 5:
               result = _context2.sent;
-              this.core.effects.emit("".concat(this.name, ":onProductsLoaded"), result);
+              this.core.effects.emit(BookingTicketHooks.onProductsLoaded, result);
               return _context2.abrupt("return", result);
             case 10:
               _context2.prev = 10;
@@ -170,20 +170,11 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return loadProducts;
     }()
-    /**
-     * 初始化外设扫码结果监听
-     */
-    )
-  }, {
-    key: "initPeripheralsListener",
-    value: function initPeripheralsListener() {
-      this.scan.initPeripheralsListener();
-    }
-
     /**
      * 获取商品列表（不加载到模块中）
      * @returns 商品列表
      */
+    )
   }, {
     key: "getProducts",
     value: (function () {
@@ -251,7 +242,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setActiveCustomer",
     value: function setActiveCustomer(customer) {
       this.store.customer.setSelectedCustomer(customer);
-      this.core.effects.emit("".concat(this.name, ":onCustomerSelected"), {
+      this.core.effects.emit(BookingTicketHooks.onCustomerSelected, {
         customer: customer
       });
     }
@@ -276,7 +267,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
       var customer = this.store.customer.getCustomerById(customerId);
       if (customer) {
         this.store.customer.setSelectedCustomer(customer);
-        this.core.effects.emit("".concat(this.name, ":onCustomerSelected"), {
+        this.core.effects.emit(BookingTicketHooks.onCustomerSelected, {
           customer: customer
         });
       }
@@ -407,7 +398,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
               return this.store.customer.loadMoreCustomers();
             case 3:
               result = _context6.sent;
-              this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), result);
+              this.core.effects.emit(BookingTicketHooks.onCustomerListUpdate, result);
               return _context6.abrupt("return", result);
             case 8:
               _context6.prev = 8;
@@ -447,7 +438,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
               return this.store.customer.resetAndLoadCustomers(params);
             case 4:
               result = _context7.sent;
-              this.core.effects.emit("".concat(this.name, ":onCustomerListReset"), result);
+              this.core.effects.emit(BookingTicketHooks.onCustomerListReset, result);
               return _context7.abrupt("return", result);
             case 9:
               _context7.prev = 9;

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

@@ -18,10 +18,6 @@ export default class Scan {
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
-    /**
-     * 初始化外设扫码结果监听
-     */
-    initPeripheralsListener(): void;
     /**
      * 处理扫码事件
      * @param eventKey 事件key

package/dist/solution/BookingTicket/utils/scan/index.js

@@ -18,6 +18,9 @@ var ScanResultType = /*#__PURE__*/function (ScanResultType) {
 }(ScanResultType || {});
 var Scan = /*#__PURE__*/function () {
   function Scan(solution, watchKey) {
+    var _this$solution,
+      _this$solution$mountF,
+      _this = this;
     _classCallCheck(this, Scan);
     _defineProperty(this, "solution", void 0);
     _defineProperty(this, "watchKey", void 0);
@@ -25,36 +28,24 @@ var Scan = /*#__PURE__*/function () {
     this.solution = solution;
     this.watchKey = watchKey;
 
-    // 初始化扫码监听
-    this.initPeripheralsListener();
+    // 监听扫码结果
+    (_this$solution = this.solution) === null || _this$solution === void 0 || (_this$solution = _this$solution.window) === null || _this$solution === void 0 || (_this$solution = _this$solution.interaction) === null || _this$solution === void 0 || (_this$solution = _this$solution.utils) === null || _this$solution === void 0 || (_this$solution$mountF = _this$solution.mountFunction) === null || _this$solution$mountF === void 0 || _this$solution$mountF.call(_this$solution, 'global', 'peripheralsResult', function (strVal) {
+      try {
+        var _result = JSON.parse(strVal);
+        console.log('nativeScannerResult>>>>>>>', _result);
+        _this.handleScan(_result);
+      } catch (err) {
+        console.error(err);
+      }
+    });
   }
 
   /**
-   * 初始化外设扫码结果监听
+   * 处理扫码事件
+   * @param eventKey 事件key
+   * @param value 扫码结果
    */
   _createClass(Scan, [{
-    key: "initPeripheralsListener",
-    value: function initPeripheralsListener() {
-      var _this$solution,
-        _this$solution$mountF,
-        _this = this;
-      (_this$solution = this.solution) === null || _this$solution === void 0 || (_this$solution = _this$solution.window) === null || _this$solution === void 0 || (_this$solution = _this$solution.interaction) === null || _this$solution === void 0 || (_this$solution = _this$solution.utils) === null || _this$solution === void 0 || (_this$solution$mountF = _this$solution.mountFunction) === null || _this$solution$mountF === void 0 || _this$solution$mountF.call(_this$solution, 'global', 'peripheralsResult', function (strVal) {
-        try {
-          var _result = JSON.parse(strVal);
-          console.log('nativeScannerResult>>>>>>>', _result);
-          _this.handleScan(_result);
-        } catch (err) {
-          console.error(err);
-        }
-      });
-    }
-
-    /**
-     * 处理扫码事件
-     * @param eventKey 事件key
-     * @param value 扫码结果
-     */
-  }, {
     key: "handleScan",
     value: function handleScan(result) {
       var lastEnableEventKey = watch.getLastEnableEventKey(this.watchKey);

package/dist/solution/BuyTickets/index.js

@@ -24,6 +24,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 { ProductList } from "../../modules/";
+import { BuyTicketsHooks } from "./types";
 import { BaseModule } from "../../modules/BaseModule";
 export * from "./types";
 export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
@@ -71,7 +72,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               return this.loadProductsByIds(this.otherParams.prodctIds);
             case 11:
               _context.next = 13;
-              return this.core.effects.emit("".concat(this.name, ":onInited"), {});
+              return this.core.effects.emit(BuyTicketsHooks.onInited, {});
             case 13:
             case "end":
               return _context.stop();
@@ -111,7 +112,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.mainProducts = mainProducts;
               _context2.next = 8;
-              return this.core.effects.emit("".concat(this.name, ":onMainProductsLoaded"), {});
+              return this.core.effects.emit(BuyTicketsHooks.onMainProductsLoaded, {});
             case 8:
             case "end":
               return _context2.stop();
@@ -148,7 +149,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
+              return this.core.effects.emit(BuyTicketsHooks.onDestroy, {});
             case 2:
               console.log('[BuyTickets] 已销毁');
             case 3:
@@ -194,7 +195,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
             case 11:
               otherData = _context5.t1;
               _context5.next = 14;
-              return this.core.effects.emit("".concat(this.name, ":onGetProducts"), [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
+              return this.core.effects.emit(BuyTicketsHooks.OnGetProducts, [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
             case 14:
               return _context5.abrupt("return", [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
             case 15:
@@ -258,7 +259,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onListSubmit"), _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit(BuyTicketsHooks.onListSubmit, _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2:
@@ -297,7 +298,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _context8.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onCartSubmit"), _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit(BuyTicketsHooks.onCartSubmit, _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2:
@@ -319,7 +320,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onCheckoutSubmit"), _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit(BuyTicketsHooks.onCheckoutSubmit, _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2: