@pisell/pisellos 0.0.54 → 0.0.55

package/dist/modules/Date/index.js

@@ -132,7 +132,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
             case 5:
               // 1.生成当前月份的所有日期，默认都是可用的
               dates = generateMonthDates(start_date, end_date, type); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
-              if (!(!(resource_ids !== null && resource_ids !== void 0 && resource_ids.length) || dayjs(end_date).isBefore(dayjs()))) {
+              if (!(!(resource_ids !== null && resource_ids !== void 0 && resource_ids.length) || dayjs(end_date).isBefore(dayjs().startOf('day')))) {
                 _context3.next = 8;
                 break;
               }
@@ -145,8 +145,6 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 end_date: end_date,
                 resource_ids: resource_ids,
                 front_end_cache_id: this.cacheId
-              }, {
-                useCache: true
               });
             case 11:
               res = _context3.sent;

package/dist/solution/BookingByStep/index.js

@@ -244,6 +244,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 status: 'available',
                 week: '',
                 weekNum: 0
+              }, {
+                date: date,
+                status: 'available',
+                week: '',
+                weekNum: 0
               }]);
               scheduleIds = scheduleList.filter(function (n) {
                 return n.date === date;
@@ -656,22 +661,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   _schedule: this.store.currentProduct.getOtherParams()['schedule']
                 })];
               }
-              _context13.next = 8;
-              return this.getDateRange();
-            case 8:
-              dateRange = _context13.sent;
+              dateRange = this.store.date.getDateRange();
               tempStartDate = startDate || (dateRange === null || dateRange === void 0 ? void 0 : dateRange[0].date);
-              tempEndDate = endDate || (dateRange === null || dateRange === void 0 ? void 0 : dateRange[0].date);
+              tempEndDate = endDate || (dateRange === null || dateRange === void 0 ? void 0 : dateRange[1].date);
               if (tempProducts.length) {
-                _context13.next = 13;
+                _context13.next = 11;
                 break;
               }
               return _context13.abrupt("return", []);
-            case 13:
+            case 11:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
               _ref5 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref5.resourceIds, rules = _ref5.rules, resourcesMap = _ref5.resourcesMap;
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context13.next = 17;
+              _context13.next = 15;
               return this.store.date.getResourceDates({
                 url: params.url,
                 query: {
@@ -682,10 +684,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 rules: rules,
                 type: type
               });
-            case 17:
+            case 15:
               res = _context13.sent;
               return _context13.abrupt("return", res);
-            case 19:
+            case 17:
             case "end":
               return _context13.stop();
           }
@@ -1547,7 +1549,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
       var cartItems = this.store.cart.getItems();
-      if (cartItems !== null && cartItems !== void 0 && cartItems[0].start_date) return [];
+      // if (cartItems?.[0].start_date) return [];
       var resourceIds = [];
       cartItems.forEach(function (item) {
         var _item$_productOrigin8;
@@ -1566,9 +1568,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourcesMap = getResourcesMap(resources);
       var duration = 0;
       // duration = 不同账号的最长时间
-      this.store.accountList.getAccounts().forEach(function (account) {
+      var accountList = this.store.accountList.getAccounts();
+      var checkDuration = function checkDuration(cartItems) {
         var accountDuration = 0;
-        var cartItems = _this8.store.cart.getCartByAccount(account.getId());
         cartItems.forEach(function (item) {
           var _item$_productOrigin$3, _item$_productOrigin9;
           accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.duration) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
@@ -1576,6 +1578,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (accountDuration > duration) {
           duration = accountDuration;
         }
+      };
+      if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
+        accountList.forEach(function (account) {
+          var cartItems = _this8.store.cart.getCartByAccount(account.getId());
+          checkDuration(cartItems);
+        });
+      } else {
+        checkDuration(cartItems);
+      }
+      this.store.accountList.getAccounts().forEach(function (account) {
+        var cartItems = _this8.store.cart.getCartByAccount(account.getId());
       });
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
@@ -1700,6 +1713,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var date = _ref13.date,
         scheduleIds = _ref13.scheduleIds,
         resources = _ref13.resources;
+      debugger;
       var targetProduct = this.store.currentProduct;
       var targetProductData = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData();
       var targetSchedules = [];
@@ -1776,6 +1790,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
+      if (!account) {
+        var activeAccount = this.getActiveAccount();
+        if (activeAccount) {
+          account = activeAccount;
+        }
+      }
       this.store.cart.addItem({
         product: productData,
         date: date,

package/lib/modules/Date/index.js

@@ -85,7 +85,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
       return [];
     }
     let dates = (0, import_utils.generateMonthDates)(start_date, end_date, type);
-    if (!(resource_ids == null ? void 0 : resource_ids.length) || (0, import_dayjs.default)(end_date).isBefore((0, import_dayjs.default)())) {
+    if (!(resource_ids == null ? void 0 : resource_ids.length) || (0, import_dayjs.default)(end_date).isBefore((0, import_dayjs.default)().startOf("day"))) {
       return (0, import_utils.disableAllDates)(dates);
     }
     try {
@@ -96,8 +96,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
           end_date,
           resource_ids,
           front_end_cache_id: this.cacheId
-        },
-        { useCache: true }
+        }
       );
       if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
         return (0, import_utils.disableAllDates)(dates);

package/lib/solution/BookingByStep/index.js

@@ -184,7 +184,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     product_ids
   }) {
     const scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
-    this.setDateRange([{ date, status: "available", week: "", weekNum: 0 }]);
+    this.setDateRange([{ date, status: "available", week: "", weekNum: 0 }, { date, status: "available", week: "", weekNum: 0 }]);
     const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
     return await this.loadProducts({ schedule_ids: scheduleIds, product_ids });
   }
@@ -345,9 +345,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       ];
     }
-    const dateRange = await this.getDateRange();
+    let dateRange = this.store.date.getDateRange();
     const tempStartDate = startDate || (dateRange == null ? void 0 : dateRange[0].date);
-    const tempEndDate = endDate || (dateRange == null ? void 0 : dateRange[0].date);
+    const tempEndDate = endDate || (dateRange == null ? void 0 : dateRange[1].date);
     if (!tempProducts.length) {
       return [];
     }
@@ -944,8 +944,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems();
-    if (cartItems == null ? void 0 : cartItems[0].start_date)
-      return [];
     const resourceIds = [];
     cartItems.forEach((item) => {
       var _a, _b, _c;
@@ -960,9 +958,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     const resourcesMap = (0, import_utils.getResourcesMap)(resources);
     let duration = 0;
-    this.store.accountList.getAccounts().forEach((account) => {
+    const accountList = this.store.accountList.getAccounts();
+    const checkDuration = (cartItems2) => {
       let accountDuration = 0;
-      const cartItems2 = this.store.cart.getCartByAccount(account.getId());
       cartItems2.forEach((item) => {
         var _a, _b;
         accountDuration += ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0;
@@ -970,6 +968,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (accountDuration > duration) {
         duration = accountDuration;
       }
+    };
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const cartItems2 = this.store.cart.getCartByAccount(account.getId());
+        checkDuration(cartItems2);
+      });
+    } else {
+      checkDuration(cartItems);
+    }
+    this.store.accountList.getAccounts().forEach((account) => {
+      const cartItems2 = this.store.cart.getCartByAccount(account.getId());
     });
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
@@ -1061,6 +1070,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources
   }) {
     var _a, _b, _c;
+    debugger;
     const targetProduct = this.store.currentProduct;
     const targetProductData = targetProduct == null ? void 0 : targetProduct.getData();
     let targetSchedules = [];
@@ -1133,6 +1143,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }) {
     const { bundle, options, origin, product_variant_id } = product || {};
     const productData = { ...origin, product_variant_id };
+    if (!account) {
+      const activeAccount = this.getActiveAccount();
+      if (activeAccount) {
+        account = activeAccount;
+      }
+    }
     this.store.cart.addItem({
       product: productData,
       date,

package/package.json

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