@pisell/pisellos 0.0.58 → 0.0.60

package/dist/solution/BookingByStep/index.js

@@ -192,12 +192,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, productsData;
+        var _schedule_ids;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, schedule_ids_data, productsData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$schedule_ids = _ref.schedule_ids, schedule_ids = _ref$schedule_ids === void 0 ? [] : _ref$schedule_ids;
-              _context2.next = 3;
+              // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
+              if (!((_schedule_ids = schedule_ids) !== null && _schedule_ids !== void 0 && _schedule_ids.length)) {
+                schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map(function (n) {
+                  return n.id;
+                });
+                if (schedule_ids_data.length) {
+                  schedule_ids = schedule_ids_data;
+                }
+              }
+              _context2.next = 4;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 1,
@@ -214,11 +224,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }, {
                 useCache: true
               });
-            case 3:
+            case 4:
               productsData = _context2.sent;
               this.store.products.addProduct(productsData.data.list);
               return _context2.abrupt("return", productsData.data.list);
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -890,7 +900,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   capacity: (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.capacity,
                   product_bundle: item._origin.product.product_bundle
                 });
+                var currentCapacity = getSumCapacity({
+                  capacity: formatCapacity
+                });
                 item._origin.metadata.capacity = formatCapacity;
+                item._origin.number = currentCapacity;
               });
               return _context20.abrupt("return", this.store.order.submitOrder({
                 query: {
@@ -1115,7 +1129,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       var arr = [];
       var capacityMap = {};
       cartItems.forEach(function (cartItem) {
@@ -1193,7 +1207,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getResourcesListByCartItem",
     value: function getResourcesListByCartItem(id) {
       var _targetCartItem$_prod2, _targetCartItem$_prod3;
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       var dateRange = this.store.date.getDateRange();
       var resources = [];
       dateRange.forEach(function (n) {
@@ -1265,7 +1279,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         countMap = _ref8.countMap,
         capacity = _ref8.capacity;
       var dateRange = this.store.date.getDateRange();
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
       var accountCartItems = cartItems.filter(function (n) {
         return n.holder_id === holder_id;
@@ -1323,7 +1337,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 time: item,
                 resource: n,
                 currentCount: recordCount + (capacity || 0),
-                resourcesUseableMap: {}
+                resourcesUseableMap: resourcesUseableMap
               });
               if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false) {
                 resourcesUseableMap[n.id] = res.usable;
@@ -1459,7 +1473,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           } else {
             var _item$_productOrigin8, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
-            var allCartItems = _this7.store.cart.getItems();
+            var allCartItems = cloneDeep(_this7.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
             if (item.holder_id) {
@@ -1497,7 +1511,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       };
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
 
       // 如果购物车里没有 holderid数据，证明不按 holder 类流程预约走，给所有购物车一次性分派即可，不做账号下资源互斥逻辑
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
@@ -1516,11 +1530,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
-      var _this8 = this;
+      var _this8 = this,
+        _cartItems$,
+        _cartItems$2;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       // if (cartItems?.[0].start_date) return [];
       var resourceIds = [];
       cartItems.forEach(function (item) {
@@ -1559,15 +1575,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       } else {
         checkDuration(cartItems);
       }
+      // 如果 cartItem 上既没有时间，也没有资源，认为外部属于异常调用，直接丢一个空数组出去
+      // 同时 session 类商品的流程也不应该调用这个方法
+      if (!(cartItems !== null && cartItems !== void 0 && (_cartItems$ = cartItems[0]) !== null && _cartItems$ !== void 0 && _cartItems$.start_date) && !(cartItems !== null && cartItems !== void 0 && (_cartItems$2 = cartItems[0]) !== null && _cartItems$2 !== void 0 && _cartItems$2.resource_id) || !(cartItems !== null && cartItems !== void 0 && cartItems[0].duration)) {
+        return [];
+      }
       if (cartItems !== null && cartItems !== void 0 && cartItems[0].start_date && !dateRange) {
-        var _cartItems$, _cartItems$2;
+        var _cartItems$3, _cartItems$4;
         dateRange = [{
           date: cartItems === null || cartItems === void 0 ? void 0 : cartItems[0].start_date,
           status: 'available',
           week: '',
           weekNum: 0
         }, {
-          date: (cartItems === null || cartItems === void 0 || (_cartItems$ = cartItems[0]) === null || _cartItems$ === void 0 ? void 0 : _cartItems$.end_date) || (cartItems === null || cartItems === void 0 || (_cartItems$2 = cartItems[0]) === null || _cartItems$2 === void 0 ? void 0 : _cartItems$2.start_date) || '',
+          date: (cartItems === null || cartItems === void 0 || (_cartItems$3 = cartItems[0]) === null || _cartItems$3 === void 0 ? void 0 : _cartItems$3.end_date) || (cartItems === null || cartItems === void 0 || (_cartItems$4 = cartItems[0]) === null || _cartItems$4 === void 0 ? void 0 : _cartItems$4.start_date) || '',
           status: 'available',
           week: '',
           weekNum: 0
@@ -1591,7 +1612,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function submitTimeSlot(timeSlots) {
       var _this9 = this;
       // 以账号为维度处理数据。购物车里每一项的 startTime应该是前一个商品的 endTime，如果是第一个商品则用 timeSlots.start_at
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
 
       // 按账号分组
       var itemsByAccount = cartItems.reduce(function (acc, item) {
@@ -1711,7 +1732,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var targetResourceDate = resourcesDates.find(function (n) {
         return n.date === date;
       });
-      var cartItems = this.store.cart.getItems();
+      var cartItems = cloneDeep(this.store.cart.getItems());
       var resourcesMap = getResourcesMap((targetResourceDate === null || targetResourceDate === void 0 ? void 0 : targetResourceDate.resource) || []);
       var selectedResources = getOthersSelectedResources(cartItems, '', resourcesMap);
       var productResources = getResourcesByProduct(resourcesMap, resources || ((_this$store$currentPr2 = this.store.currentProduct) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.getData()) === null || _this$store$currentPr2 === void 0 || (_this$store$currentPr2 = _this$store$currentPr2.product_resource) === null || _this$store$currentPr2 === void 0 ? void 0 : _this$store$currentPr2.resources) || [], selectedResources, 1);
@@ -1803,7 +1824,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       // 检测，有传递 date，检查购物车里其他商品的 date 是否在同一天，如果不在，清空那些不在同一天的商品
       if (date) {
-        var cartItems = this.store.cart.getItems();
+        var cartItems = cloneDeep(this.store.cart.getItems());
         var cartItemsByDate = cartItems.filter(function (n) {
           return !dayjs(n.start_date).isSame(dayjs(date.startTime), 'day');
         });

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -27,7 +27,7 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;

package/dist/solution/BookingByStep/utils/resources.js

@@ -231,7 +231,7 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         return item.default_resource.indexOf(d) == -1;
       });
       var optional_resource = item.optional_resource.reduce(function (childAcc, d) {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -253,7 +253,7 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         return childAcc;
       }, []);
       var default_resource = item.default_resource.reduce(function (childAcc, d) {
-        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+        if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
           // 拼装组合资源的数据
           var combiningResources = [];
           if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
@@ -475,6 +475,15 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
     resourcesUseableMap = _ref5.resourcesUseableMap;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
+  // 资源排下序，把单个资源靠前，组合资源排在后面
+  resources.sort(function (a, b) {
+    var _a$metadata, _b$metadata;
+    var aIsCombined = ((_a$metadata = a.metadata) === null || _a$metadata === void 0 || (_a$metadata = _a$metadata.combined_resource) === null || _a$metadata === void 0 ? void 0 : _a$metadata.status) === 1;
+    var bIsCombined = ((_b$metadata = b.metadata) === null || _b$metadata === void 0 || (_b$metadata = _b$metadata.combined_resource) === null || _b$metadata === void 0 ? void 0 : _b$metadata.status) === 1;
+    if (aIsCombined && !bIsCombined) return 1;
+    if (!aIsCombined && bIsCombined) return -1;
+    return 0;
+  });
 
   // 获取资源列表中所有的时间切片
   var timeSliceList = resources.reduce(function (acc, item) {

package/lib/solution/BookingByStep/index.js

@@ -153,6 +153,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_ids = []
   }) {
+    if (!(schedule_ids == null ? void 0 : schedule_ids.length)) {
+      const schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map((n) => n.id);
+      if (schedule_ids_data.length) {
+        schedule_ids = schedule_ids_data;
+      }
+    }
     const productsData = await this.request.post(
       `/product/query`,
       {
@@ -442,7 +448,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         capacity: (_a = item._productOrigin) == null ? void 0 : _a.capacity,
         product_bundle: item._origin.product.product_bundle
       });
+      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
       item._origin.metadata.capacity = formatCapacity;
+      item._origin.number = currentCapacity;
     });
     return this.store.order.submitOrder({ query: { cartItems: newCartItems } });
   }
@@ -563,7 +571,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems();
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const arr = [];
     const capacityMap = {};
     cartItems.forEach((cartItem) => {
@@ -653,7 +661,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 给单个购物车里的商品获取资源列表
   getResourcesListByCartItem(id) {
     var _a, _b, _c;
-    const cartItems = this.store.cart.getItems();
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     dateRange.forEach((n) => {
@@ -727,7 +735,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     capacity
   }) {
     const dateRange = this.store.date.getDateRange();
-    const cartItems = this.store.cart.getItems();
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     let accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
     if (!accountCartItems.length) {
       accountCartItems = cartItems;
@@ -766,7 +774,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             time: item,
             resource: n,
             currentCount: recordCount + (capacity || 0),
-            resourcesUseableMap: {}
+            resourcesUseableMap
           });
           if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false) {
             resourcesUseableMap[n.id] = res.usable;
@@ -880,7 +888,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             errorList.push(item._id);
           }
         } else {
-          const allCartItems = this.store.cart.getItems();
+          const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           if (item.holder_id) {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
@@ -928,7 +936,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     };
-    const cartItems = this.store.cart.getItems();
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
       accountList.forEach((account) => {
         const cartItems2 = this.store.cart.getCartByAccount(account.getId());
@@ -941,14 +949,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
   getTimeSlotByAllResources(resources_code) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
-    const cartItems = this.store.cart.getItems();
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const resourceIds = [];
     cartItems.forEach((item) => {
-      var _a2, _b2, _c;
-      (_c = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c.forEach((n) => {
+      var _a2, _b2, _c2;
+      (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
         }
@@ -978,6 +986,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     } else {
       checkDuration(cartItems);
     }
+    if (!((_a = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _a.start_date) && !((_b = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _b.resource_id) || !(cartItems == null ? void 0 : cartItems[0].duration)) {
+      return [];
+    }
     if ((cartItems == null ? void 0 : cartItems[0].start_date) && !dateRange) {
       dateRange = [
         {
@@ -987,7 +998,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           weekNum: 0
         },
         {
-          date: ((_a = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _a.end_date) || ((_b = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _b.start_date) || "",
+          date: ((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.end_date) || ((_d = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _d.start_date) || "",
           status: "available",
           week: "",
           weekNum: 0
@@ -1007,7 +1018,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
-    const cartItems = this.store.cart.getItems();
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const itemsByAccount = cartItems.reduce(
       (acc, item) => {
         const holderId = item.holder_id;
@@ -1101,7 +1112,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const resourcesDates = this.store.date.getDateList();
     const targetResourceDate = resourcesDates.find((n) => n.date === date);
-    const cartItems = this.store.cart.getItems();
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const resourcesMap = (0, import_utils.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []);
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       cartItems,
@@ -1190,7 +1201,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       options
     });
     if (date) {
-      const cartItems = this.store.cart.getItems();
+      const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
       const cartItemsByDate = cartItems.filter(
         (n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day")
       );

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -27,7 +27,7 @@ interface BookingItem {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap }: {
+export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, currentCount, resourcesUseableMap, }: {
     timeSlice: TimeSliceItem;
     time: any;
     resource: ResourceItem;

package/lib/solution/BookingByStep/utils/resources.js

@@ -171,7 +171,7 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       );
       let optional_resource = item.optional_resource.reduce(
         (childAcc, d) => {
-          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
             const combiningResources = [];
             if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
               resourcesMap[d].combined_resource.resource_ids.forEach(
@@ -200,7 +200,7 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       );
       let default_resource = item.default_resource.reduce(
         (childAcc, d) => {
-          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id) && capacity <= resourcesMap[d].capacity) {
+          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
             const combiningResources = [];
             if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
               resourcesMap[d].combined_resource.resource_ids.forEach(
@@ -345,6 +345,16 @@ var getTimeSlicesByResources = ({
   resourcesUseableMap
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
+  resources.sort((a, b) => {
+    var _a, _b, _c, _d;
+    const aIsCombined = ((_b = (_a = a.metadata) == null ? void 0 : _a.combined_resource) == null ? void 0 : _b.status) === 1;
+    const bIsCombined = ((_d = (_c = b.metadata) == null ? void 0 : _c.combined_resource) == null ? void 0 : _d.status) === 1;
+    if (aIsCombined && !bIsCombined)
+      return 1;
+    if (!aIsCombined && bIsCombined)
+      return -1;
+    return 0;
+  });
   let timeSliceList = resources.reduce(
     (acc, item) => {
       return acc.concat(

package/package.json

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