@pisell/pisellos 0.0.50 → 0.0.51

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

@@ -44,7 +44,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
-    loadProductByScheduleDate(date: string): Promise<any>;
+    loadProductByScheduleDate({ date, product_ids, }: {
+        date: string;
+        product_ids?: number[];
+    }): Promise<any>;
     loadAllSchedule(): Promise<void>;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
         startDate: string;

package/dist/solution/BookingByStep/index.js

@@ -113,8 +113,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.core.effects.emit(BookingByStepHooks.onInited, {});
-              this.loadAllSchedule();
-            case 16:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -211,7 +210,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 ids: product_ids,
                 collection: collection,
                 front_end_cache_id: this.cacheId,
-                schedule_ids: schedule_ids
+                client_schedule_ids: schedule_ids
               }, {
                 useCache: true
               });
@@ -233,24 +232,32 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadProductByScheduleDate",
     value: function () {
-      var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(date) {
-        var scheduleList, scheduleIds;
+      var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
+        var date, product_ids, scheduleList, scheduleIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
+              date = _ref2.date, product_ids = _ref2.product_ids;
+              scheduleList = this.store.schedule.getAvailabilityScheduleDateList(); // 缓存下这次选择的结果，如果是先选日期再选 duration 类商品，后面用得到
+              this.setDateRange([{
+                date: date,
+                status: 'available',
+                week: '',
+                weekNum: 0
+              }]);
               scheduleIds = scheduleList.filter(function (n) {
                 return n.date === date;
               }).flatMap(function (n) {
                 return n.schedule_id;
               });
-              _context3.next = 4;
+              _context3.next = 6;
               return this.loadProducts({
-                schedule_ids: scheduleIds
+                schedule_ids: scheduleIds,
+                product_ids: product_ids
               });
-            case 4:
+            case 6:
               return _context3.abrupt("return", _context3.sent);
-            case 5:
+            case 7:
             case "end":
               return _context3.stop();
           }
@@ -289,13 +296,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadScheduleAvailableDate",
     value: function () {
-      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref2) {
+      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref3) {
         var _res$data$date_list;
         var startDate, endDate, custom_page_id, dates, res;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              startDate = _ref2.startDate, endDate = _ref2.endDate, custom_page_id = _ref2.custom_page_id;
+              startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id;
               // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs())) {
                 startDate = dayjs().format('YYYY-MM-DD');
@@ -353,13 +360,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "storeProduct",
     value: function () {
       var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productData) {
-        var activeAccount, _ref3, bundle, options, origin, product_variant_id, product, addCartItem;
+        var activeAccount, _ref4, bundle, options, origin, product_variant_id, product, addCartItem;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
               activeAccount = this.getActiveAccount();
-              _ref3 = productData || {}, bundle = _ref3.bundle, options = _ref3.options, origin = _ref3.origin, product_variant_id = _ref3.product_variant_id;
+              _ref4 = productData || {}, bundle = _ref4.bundle, options = _ref4.options, origin = _ref4.origin, product_variant_id = _ref4.product_variant_id;
               product = _objectSpread(_objectSpread({}, origin), {}, {
                 product_variant_id: product_variant_id
               });
@@ -607,18 +614,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getAvailableDate",
     value: function () {
       var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        var _this3 = this,
-          _this$otherParams3,
-          _this$otherParams4;
+        var _this3 = this;
         var params,
           products,
           startDate,
           endDate,
           type,
           tempProducts,
+          dateRange,
           tempStartDate,
           tempEndDate,
-          _ref4,
+          _ref5,
           resourceIds,
           rules,
           resourcesMap,
@@ -650,18 +656,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   _schedule: this.store.currentProduct.getOtherParams()['schedule']
                 })];
               }
-              tempStartDate = startDate || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 || (_this$otherParams3 = _this$otherParams3.dateRange) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3[0]);
-              tempEndDate = endDate || ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 || (_this$otherParams4 = _this$otherParams4.dateRange) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4[1]);
+              _context13.next = 8;
+              return this.getDateRange();
+            case 8:
+              dateRange = _context13.sent;
+              tempStartDate = startDate || (dateRange === null || dateRange === void 0 ? void 0 : dateRange[0].date);
+              tempEndDate = endDate || (dateRange === null || dateRange === void 0 ? void 0 : dateRange[0].date);
               if (tempProducts.length) {
-                _context13.next = 10;
+                _context13.next = 13;
                 break;
               }
               return _context13.abrupt("return", []);
-            case 10:
+            case 13:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
-              _ref4 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref4.resourceIds, rules = _ref4.rules, resourcesMap = _ref4.resourcesMap;
+              _ref5 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref5.resourceIds, rules = _ref5.rules, resourcesMap = _ref5.resourcesMap;
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context13.next = 14;
+              _context13.next = 17;
               return this.store.date.getResourceDates({
                 url: params.url,
                 query: {
@@ -672,10 +682,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 rules: rules,
                 type: type
               });
-            case 14:
+            case 17:
               res = _context13.sent;
               return _context13.abrupt("return", res);
-            case 16:
+            case 19:
             case "end":
               return _context13.stop();
           }
@@ -928,14 +938,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
-        var _ref5,
-          _ref5$cover,
+        var _ref6,
+          _ref6$cover,
           cover,
           _args23 = arguments;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _ref5 = _args23.length > 1 && _args23[1] !== undefined ? _args23[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
+              _ref6 = _args23.length > 1 && _args23[1] !== undefined ? _args23[1] : {}, _ref6$cover = _ref6.cover, cover = _ref6$cover === void 0 ? false : _ref6$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -1198,10 +1208,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 通过资源列表和指定的资源 id，获取指定资源的时间切片
   }, {
     key: "getResourceTimeSlot",
-    value: function getResourceTimeSlot(_ref6) {
-      var product = _ref6.product,
-        resources = _ref6.resources,
-        currentResourceId = _ref6.currentResourceId;
+    value: function getResourceTimeSlot(_ref7) {
+      var product = _ref7.product,
+        resources = _ref7.resources,
+        currentResourceId = _ref7.currentResourceId;
       var dateRange = this.store.date.getDateRange();
       var timeSlots = getTimeSlicesByResource({
         resource: resources.find(function (n) {
@@ -1217,10 +1227,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 自动分派可用的资源-单种资源类型——此方法目前未使用，未经验证
   }, {
     key: "autoSelectResource",
-    value: function autoSelectResource(_ref7) {
-      var resourceProductData = _ref7.resourceProductData,
-        resources = _ref7.resources,
-        timeSlots = _ref7.timeSlots;
+    value: function autoSelectResource(_ref8) {
+      var resourceProductData = _ref8.resourceProductData,
+        resources = _ref8.resources,
+        timeSlots = _ref8.timeSlots;
       var dateRange = this.store.date.getDateRange();
       if (timeSlots) {
         // 如果 start_time 存在，则直接根据 start_time 算出商品总共需要的时长，然后根据时长去匹配资源
@@ -1289,12 +1299,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 自动分派可用资源-pro 版，ui 传递某个账号，自动给某个账号下所有商品分配第一种资源
   }, {
     key: "autoSelectAccountResources",
-    value: function autoSelectAccountResources(_ref8) {
-      var holder_id = _ref8.holder_id,
-        resources_code = _ref8.resources_code,
-        timeSlots = _ref8.timeSlots,
-        countMap = _ref8.countMap,
-        capacity = _ref8.capacity;
+    value: function autoSelectAccountResources(_ref9) {
+      var holder_id = _ref9.holder_id,
+        resources_code = _ref9.resources_code,
+        timeSlots = _ref9.timeSlots,
+        countMap = _ref9.countMap,
+        capacity = _ref9.capacity;
       var dateRange = this.store.date.getDateRange();
       var cartItems = this.store.cart.getItems();
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
@@ -1421,9 +1431,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           });
           if (timeSlots) {
             if (index !== 0 && recordTimeSlots) {
-              var _item$_productOrigin$, _item$_productOrigin3, _ref9, _item$_productOrigin4, _item$_productOrigin$2, _item$_productOrigin5, _ref10, _item$_productOrigin6;
-              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
-              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
+              var _item$_productOrigin$, _item$_productOrigin3, _ref10, _item$_productOrigin4, _item$_productOrigin$2, _item$_productOrigin5, _ref11, _item$_productOrigin6;
+              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref10 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
+              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref11 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes');
               recordTimeSlots = {
                 start_time: start_at.format('HH:mm'),
                 end_time: end_at.format('HH:mm'),
@@ -1580,9 +1590,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         accountItems.forEach(function (item, index) {
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin10, _ref11, _item$_productOrigin11;
+            var _item$_productOrigin$4, _item$_productOrigin10, _ref12, _item$_productOrigin11;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref12 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.type) !== null && _ref12 !== void 0 ? _ref12 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
           _this9.store.cart.updateItem({
@@ -1664,11 +1674,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "getTimeslotBySchedule",
-    value: function getTimeslotBySchedule(_ref12) {
+    value: function getTimeslotBySchedule(_ref13) {
       var _this$store$currentPr2;
-      var date = _ref12.date,
-        scheduleIds = _ref12.scheduleIds,
-        resources = _ref12.resources;
+      var date = _ref13.date,
+        scheduleIds = _ref13.scheduleIds,
+        resources = _ref13.resources;
       var targetProduct = this.store.currentProduct;
       var targetProductData = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData();
       var targetSchedules = [];
@@ -1732,15 +1742,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "addProductToCart",
-    value: function addProductToCart(_ref13) {
-      var product = _ref13.product,
-        date = _ref13.date,
-        account = _ref13.account;
-      var _ref14 = product || {},
-        bundle = _ref14.bundle,
-        options = _ref14.options,
-        origin = _ref14.origin,
-        product_variant_id = _ref14.product_variant_id;
+    value: function addProductToCart(_ref14) {
+      var _this10 = this;
+      var product = _ref14.product,
+        date = _ref14.date,
+        account = _ref14.account;
+      var _ref15 = product || {},
+        bundle = _ref15.bundle,
+        options = _ref15.options,
+        origin = _ref15.origin,
+        product_variant_id = _ref15.product_variant_id;
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
@@ -1751,6 +1762,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         bundle: bundle,
         options: options
       });
+      // 检测，有传递 date，检查购物车里其他商品的 date 是否在同一天，如果不在，清空那些不在同一天的商品
+      if (date) {
+        var cartItems = this.store.cart.getItems();
+        var cartItemsByDate = cartItems.filter(function (n) {
+          return !dayjs(n.start_date).isSame(dayjs(date.startTime), 'day');
+        });
+        if (cartItemsByDate.length) {
+          cartItemsByDate.forEach(function (n) {
+            _this10.store.cart.removeItem(n._id);
+          });
+        }
+      }
     }
   }, {
     key: "setOtherData",

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

@@ -44,7 +44,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
-    loadProductByScheduleDate(date: string): Promise<any>;
+    loadProductByScheduleDate({ date, product_ids, }: {
+        date: string;
+        product_ids?: number[];
+    }): Promise<any>;
     loadAllSchedule(): Promise<void>;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
         startDate: string;

package/lib/solution/BookingByStep/index.js

@@ -103,7 +103,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.core.effects.emit(import_types.BookingByStepHooks.onInited, {});
-    this.loadAllSchedule();
   }
   // 初始化step
   initStep(stepList) {
@@ -173,17 +172,21 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         ids: product_ids,
         collection,
         front_end_cache_id: this.cacheId,
-        schedule_ids
+        client_schedule_ids: schedule_ids
       },
       { useCache: true }
     );
     this.store.products.addProduct(productsData.data.list);
     return productsData.data.list;
   }
-  async loadProductByScheduleDate(date) {
+  async loadProductByScheduleDate({
+    date,
+    product_ids
+  }) {
     const scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
+    this.setDateRange([{ 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 });
+    return await this.loadProducts({ schedule_ids: scheduleIds, product_ids });
   }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
@@ -321,7 +324,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
-    var _a, _b, _c, _d;
     let { products, startDate, endDate, type } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)()) && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)()) || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)()))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -343,8 +345,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       ];
     }
-    const tempStartDate = startDate || ((_b = (_a = this.otherParams) == null ? void 0 : _a.dateRange) == null ? void 0 : _b[0]);
-    const tempEndDate = endDate || ((_d = (_c = this.otherParams) == null ? void 0 : _c.dateRange) == null ? void 0 : _d[1]);
+    const dateRange = await this.getDateRange();
+    const tempStartDate = startDate || (dateRange == null ? void 0 : dateRange[0].date);
+    const tempEndDate = endDate || (dateRange == null ? void 0 : dateRange[0].date);
     if (!tempProducts.length) {
       return [];
     }
@@ -1118,6 +1121,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       bundle,
       options
     });
+    if (date) {
+      const cartItems = this.store.cart.getItems();
+      const cartItemsByDate = cartItems.filter((n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day"));
+      if (cartItemsByDate.length) {
+        cartItemsByDate.forEach((n) => {
+          this.store.cart.removeItem(n._id);
+        });
+      }
+    }
   }
   setOtherData(key, value) {
     this.otherData[key] = value;

package/package.json

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