@pisell/pisellos 2.0.21 → 2.0.23

package/dist/solution/BookingByStep/index.js

@@ -232,8 +232,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _context2.next = 7;
               return this.request.post("/product/query", {
                 open_quotation: 1,
-                open_bundle: 1,
-                extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
+                open_bundle: 0,
+                extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket', 'normal'],
                 with: ['category', 'collection', 'resourceRelation'],
                 status: 'published',
                 num: 500,
@@ -313,64 +313,62 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateQuotationPriceAndCart",
     value: function () {
       var _updateQuotationPriceAndCart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(date) {
-        var _this$otherParams3,
-          _this3 = this;
-        var dateRange, scheduleList, scheduleIds, cartItems, _iterator, _step, _loop;
+        var _this3 = this;
+        var cartItems, userPlugin, customer_id, _userPlugin$get2, res, _iterator, _step, _loop;
         return _regeneratorRuntime().wrap(function _callee4$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              dateRange = this.store.date.getDateRange();
-              scheduleList = this.store.schedule.getAvailabilityScheduleDateList() || [];
-              scheduleIds = [];
-              if (dateRange && dateRange.length) {
-                scheduleIds = scheduleList.filter(function (n) {
-                  return n.date === dateRange[0].date;
-                }).flatMap(function (n) {
-                  return n.schedule_id;
-                });
-              } else {
-                scheduleIds = scheduleList.filter(function (n) {
-                  return n.date === date;
-                }).flatMap(function (n) {
-                  return n.schedule_id;
-                });
-              }
-              _context5.next = 6;
-              return this.loadProducts(_objectSpread(_objectSpread({}, (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.productModuleParams), {}, {
-                scheduleIds: scheduleIds,
-                schedule_date: date
-              }));
-            case 6:
               // 更新完商品数据以后，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
               cartItems = this.store.cart.getItems();
               if (!cartItems.length) {
                 _context5.next = 25;
                 break;
               }
+              userPlugin = this.core.getPlugin('user');
+              customer_id = undefined;
+              try {
+                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get2 = userPlugin.get()) === null || _userPlugin$get2 === void 0 ? void 0 : _userPlugin$get2.id;
+              } catch (error) {
+                console.error(error);
+              }
+              _context5.next = 7;
+              return this.store.products.loadProductsPrice({
+                ids: cartItems.map(function (n) {
+                  return n.id;
+                }),
+                schedule_date: date,
+                customer_id: customer_id
+              });
+            case 7:
+              res = _context5.sent;
               _iterator = _createForOfIteratorHelper(cartItems);
               _context5.prev = 9;
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
                 var _bundle;
-                var item, targetProduct, productInfo, bundle;
+                var item, targetProduct, cartProduct, productInfo, bundle;
                 return _regeneratorRuntime().wrap(function _loop$(_context4) {
                   while (1) switch (_context4.prev = _context4.next) {
                     case 0:
                       item = _step.value;
-                      _context4.next = 3;
+                      targetProduct = res.find(function (n) {
+                        return n.id === item.id;
+                      });
+                      _context4.next = 4;
                       return _this3.store.products.getProduct(item.id);
-                    case 3:
-                      targetProduct = _context4.sent;
-                      productInfo = cloneDeep(targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
+                    case 4:
+                      cartProduct = _context4.sent;
+                      productInfo = cartProduct === null || cartProduct === void 0 ? void 0 : cartProduct.getData();
                       bundle = item._bundleOrigin;
+                      productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
+                      productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
                       bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
-                        var _productInfo$bundle;
-                        // 尝试到新的 productInfo 里找对应的 bundleitem
-                        // 然后更新 bundle 的价格
-                        var targetBundle = productInfo === null || productInfo === void 0 || (_productInfo$bundle = productInfo.bundle) === null || _productInfo$bundle === void 0 ? void 0 : _productInfo$bundle.find(function (m) {
-                          return m.group_id === n.id;
+                        var _targetProduct$bundle;
+                        // 更新 bundle 的价格
+                        var targetBundle = targetProduct === null || targetProduct === void 0 || (_targetProduct$bundle = targetProduct.bundle_group) === null || _targetProduct$bundle === void 0 ? void 0 : _targetProduct$bundle.find(function (m) {
+                          return m.id === n.group_id;
                         });
                         if (targetBundle) {
-                          var targetBundleItem = targetBundle.items.find(function (m) {
+                          var targetBundleItem = targetBundle.bundle_item.find(function (m) {
                             return m.id === n.id;
                           });
                           if (targetBundleItem) {
@@ -387,7 +385,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                         product: productInfo,
                         bundle: bundle
                       });
-                    case 8:
+                    case 11:
                     case "end":
                       return _context4.stop();
                   }
@@ -1062,40 +1060,44 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitOrder",
     value: function () {
       var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var cartItems, newCartItems;
+        var cartItems, newCartItems, type;
         return _regeneratorRuntime().wrap(function _callee21$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
               newCartItems.forEach(function (item) {
-                var _item$_productOrigin, _item$_origin;
-                item._origin.resources = item._origin.resources.map(function (n) {
-                  var newResourcesItem = cloneDeep(n);
-                  delete newResourcesItem.id;
-                  delete newResourcesItem.main_field;
-                  delete newResourcesItem.resourceType;
-                  return _objectSpread({}, newResourcesItem);
-                });
-                var formatCapacity = formatDefaultCapacitys({
-                  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
-                });
-                if (!((_item$_origin = item._origin) !== null && _item$_origin !== void 0 && _item$_origin.metadata)) {
-                  item._origin.metadata = {};
+                if (item._origin.resources && item._origin.resources.length) {
+                  var _item$_productOrigin, _item$_origin;
+                  item._origin.resources = item._origin.resources.map(function (n) {
+                    var newResourcesItem = cloneDeep(n);
+                    delete newResourcesItem.id;
+                    delete newResourcesItem.main_field;
+                    delete newResourcesItem.resourceType;
+                    return _objectSpread({}, newResourcesItem);
+                  });
+                  var formatCapacity = formatDefaultCapacitys({
+                    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
+                  });
+                  if (!((_item$_origin = item._origin) !== null && _item$_origin !== void 0 && _item$_origin.metadata)) {
+                    item._origin.metadata = {};
+                  }
+                  item._origin.metadata.capacity = formatCapacity;
+                  item._origin.number = currentCapacity;
                 }
-                item._origin.metadata.capacity = formatCapacity;
-                item._origin.number = currentCapacity;
               });
+              type = this.otherParams.isRetailTemplate ? 'virtual' : 'appointment_booking';
               return _context22.abrupt("return", this.store.order.submitOrder({
                 query: {
-                  cartItems: newCartItems
+                  cartItems: newCartItems,
+                  type: type
                 }
               }));
-            case 4:
+            case 5:
             case "end":
               return _context22.stop();
           }
@@ -1213,6 +1215,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       this.store.cart.updateItem(params);
+      if (this.otherParams.isRetailTemplate) {
+        return;
+      }
       var allOriginResources = [];
       var dateRange = this.store.date.getDateRange();
       if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
@@ -1798,7 +1803,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               //   resourcesUseableMap[n.id] = false;
               //   continue
               // }
-              var recordCount = countMap[n.id] || 0;
+              // const recordCount = countMap[n.id] || 0;
               // n.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
               // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
               // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
@@ -1809,13 +1814,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               if (mTimes.length === 0) {
                 return 0; // continue
               }
+              // 计算在时间片内有交集的预约容量总和
+              var totalCapacity = (countMap[n.id] || []).reduce(function (sum, item) {
+                var hasOverlap = !dayjs(item.time.start_at).isAfter(dayjs(timeSlots.start_at)) && !dayjs(item.time.end_at).isBefore(dayjs(timeSlots.end_at));
+                return hasOverlap ? sum + item.pax : sum;
+              }, 0);
               var canUseTime = mTimes.find(function (item) {
                 var _cartItem$_productOri10;
                 var res = getIsUsableByTimeItem({
                   timeSlice: timeSlots,
                   time: item,
                   resource: n,
-                  currentCount: recordCount + (capacity || 0),
+                  currentCount: totalCapacity + (capacity || 0),
                   resourcesUseableMap: resourcesUseableMap,
                   cut_off_time: (_cartItem$_productOri10 = cartItem._productOrigin) === null || _cartItem$_productOri10 === void 0 ? void 0 : _cartItem$_productOri10.cut_off_time
                 });
@@ -1886,6 +1896,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 一个账号一个账号处理
       var errorList = [];
       var selectResourcesMap = {};
+      var selectResourcesWithTimeSlots = {};
       var accountList = this.store.accountList.getAccounts();
       var selectForCartResources = function selectForCartResources(cartItems) {
         var recordTimeSlots = cloneDeep(timeSlots);
@@ -1918,8 +1929,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var currentResourceConfig = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.product_resource) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.resources) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.find(function (n) {
               return n.code === resources_code;
             });
+            var resourceBookingType = (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) || 'single';
             // 只有 duration 类商品需要这个操作
-            if (index !== 0 && recordTimeSlots && (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) === 'single' && (_item$_productOrigin5 = item._productOrigin) !== null && _item$_productOrigin5 !== void 0 && _item$_productOrigin5.duration) {
+            if (index !== 0 && recordTimeSlots && resourceBookingType === 'single' && (_item$_productOrigin5 = item._productOrigin) !== null && _item$_productOrigin5 !== void 0 && _item$_productOrigin5.duration) {
               var _item$_productOrigin$, _item$_productOrigin6, _ref9, _item$_productOrigin7, _item$_productOrigin$2, _item$_productOrigin8, _ref10, _item$_productOrigin9;
               var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
               var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.duration) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.duration) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
@@ -1936,7 +1948,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               holder_id: item.holder_id,
               resources_code: resources_code,
               timeSlots: recordTimeSlots,
-              countMap: selectResourcesMap,
+              countMap: selectResourcesWithTimeSlots,
               capacity: currentCapacity
             });
             // // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
@@ -1944,10 +1956,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             //   return
             // }
             if (res !== null && res !== void 0 && res.selectedResource) {
-              if (!selectResourcesMap[res.selectedResource.id]) {
-                selectResourcesMap[res.selectedResource.id] = currentCapacity;
+              if (!selectResourcesWithTimeSlots[res.selectedResource.id]) {
+                selectResourcesWithTimeSlots[res.selectedResource.id] = [{
+                  pax: currentCapacity,
+                  time: recordTimeSlots
+                }];
               } else {
-                selectResourcesMap[res.selectedResource.id] += currentCapacity;
+                selectResourcesWithTimeSlots[res.selectedResource.id].push({
+                  pax: currentCapacity,
+                  time: recordTimeSlots
+                });
               }
               res.selectedResource.capacity = currentCapacity;
               checkSubResourcesCapacity(res.selectedResource);
@@ -2069,9 +2087,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceIds = [];
       var resourcesTypeId = undefined;
       var isSingleResource = false;
+
+      // 找出购物车里最大的 cut_off_time
+      var maxCutOffTime = undefined;
+      var maxCutOffTimeValue = dayjs();
       cartItems.forEach(function (item) {
-        var _item$_productOrigin11, _item$_productOrigin12;
+        var _item$_productOrigin11, _item$_productOrigin12, _item$_productOrigin13, _item$_productOrigin14;
         (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.product_resource) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.resources) === null || _item$_productOrigin11 === void 0 || _item$_productOrigin11.forEach(function (n) {
+          // TODO： 少了个 status 的判断
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
             isSingleResource = n.type === 'single';
@@ -2086,6 +2109,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.product_resource) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.resources) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.find(function (n) {
           return n.code === resources_code;
         })) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.id;
+        if ((_item$_productOrigin13 = item._productOrigin) !== null && _item$_productOrigin13 !== void 0 && _item$_productOrigin13.cut_off_time && ((_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.cut_off_time.type) === 'advance') {
+          var currentCutOffTime = dayjs().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
+          if (currentCutOffTime.isAfter(maxCutOffTimeValue, 'minute')) {
+            maxCutOffTimeValue = currentCutOffTime;
+            maxCutOffTime = item._productOrigin.cut_off_time;
+          }
+        }
       });
       // 保险起见，在这里如果 dateRange 里也有 resources 的话，也 push 进去
       if ((_dateRange = dateRange) !== null && _dateRange !== void 0 && (_dateRange = _dateRange[0]) !== null && _dateRange !== void 0 && (_dateRange = _dateRange.resource) !== null && _dateRange !== void 0 && _dateRange.length) {
@@ -2107,13 +2137,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItems.forEach(function (item) {
           // 单个预约累加账号 多个预约取最大值
           if (isSingleResource) {
-            var _item$_productOrigin$3, _item$_productOrigin13;
-            accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
+            var _item$_productOrigin$3, _item$_productOrigin15;
+            accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
           } else {
-            var _item$_productOrigin$4, _item$_productOrigin14;
-            if (accountDuration < ((_item$_productOrigin$4 = (_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 || (_item$_productOrigin14 = _item$_productOrigin14.duration) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0)) {
-              var _item$_productOrigin$5, _item$_productOrigin15;
-              accountDuration = (_item$_productOrigin$5 = (_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.value) !== null && _item$_productOrigin$5 !== void 0 ? _item$_productOrigin$5 : 0;
+            var _item$_productOrigin$4, _item$_productOrigin16;
+            if (accountDuration < ((_item$_productOrigin$4 = (_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0)) {
+              var _item$_productOrigin$5, _item$_productOrigin17;
+              accountDuration = (_item$_productOrigin$5 = (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.value) !== null && _item$_productOrigin$5 !== void 0 ? _item$_productOrigin$5 : 0;
             }
           }
         });
@@ -2155,7 +2185,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         duration: duration,
         currentDate: dateRange[0].date,
         split: 10,
-        resourcesUseableMap: resourcesUseableMap
+        resourcesUseableMap: resourcesUseableMap,
+        cut_off_time: maxCutOffTime
       });
       return timeSlots;
     }
@@ -2185,9 +2216,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var _newResources$;
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$6, _item$_productOrigin16, _ref11, _item$_productOrigin17;
+            var _item$_productOrigin$6, _item$_productOrigin18, _ref11, _item$_productOrigin19;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$6 = (_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.value) !== null && _item$_productOrigin$6 !== void 0 ? _item$_productOrigin$6 : 0, (_ref11 = (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$6 = (_item$_productOrigin18 = item._productOrigin) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.duration) === null || _item$_productOrigin18 === void 0 ? void 0 : _item$_productOrigin18.value) !== null && _item$_productOrigin$6 !== void 0 ? _item$_productOrigin$6 : 0, (_ref11 = (_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.duration) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
           _this11.store.cart.updateItem({
@@ -2277,9 +2308,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$store$currentPr2;
       var date = _ref12.date,
         scheduleIds = _ref12.scheduleIds,
-        resources = _ref12.resources;
+        resources = _ref12.resources,
+        product = _ref12.product;
       var targetProduct = this.store.currentProduct;
-      var targetProductData = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData();
+      // 如果外面传递了product 优先用外面的
+      var targetProductData = product || (targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
       var targetSchedules = [];
       // 如果外面传递了 scheduleIds,优先取入参
       if (scheduleIds !== null && scheduleIds !== void 0 && scheduleIds.length) {
@@ -2326,7 +2359,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
           // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
           var mTimes = m.times.filter(function (n) {
-            return !dayjs(n.start_at).isAfter(dayjs(item.start)) && !dayjs(n.end_at).isBefore(dayjs(item.end));
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {
@@ -2463,6 +2496,173 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return getProductTypeById;
     }()
+    /**
+     * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
+     *
+     * @param {string} cartItemId
+     * @param {string} resourceCode
+     * @return {*} 
+     * @memberof BookingByStepImpl
+     */
+  }, {
+    key: "getResourcesByCartItemAndCode",
+    value: function getResourcesByCartItemAndCode(cartItemId, resourceCode) {
+      var _cartItem$_productOri11, _cartItem$_productOri12;
+      var dateRange = this.store.date.getDateRange();
+      var resources = [];
+      if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
+        dateRange.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
+      if (!resources.length) {
+        var dateList = this.store.date.getDateList();
+        dateList.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
+      var resourcesMap = getResourcesMap(cloneDeep(resources));
+      var cartItems = this.store.cart.getItems();
+      var cartItem = cartItems.find(function (item) {
+        return item._id === cartItemId;
+      });
+      if (!cartItem) return [];
+      var selectedResources = [];
+      var formatCapacity = formatDefaultCapacitys({
+        capacity: (_cartItem$_productOri11 = cartItem._productOrigin) === null || _cartItem$_productOri11 === void 0 ? void 0 : _cartItem$_productOri11.capacity,
+        product_bundle: cartItem._origin.product.product_bundle
+      });
+      cartItem._origin.metadata.capacity = formatCapacity;
+      var currentCapacity = getSumCapacity({
+        capacity: formatCapacity
+      });
+      if (cartItem.holder_id) {
+        selectedResources = getOthersSelectedResources(cartItems, cartItem.holder_id, resourcesMap);
+      } else {
+        selectedResources = getOthersCartSelectedResources(cartItems, cartItem._id, resourcesMap);
+      }
+      var productResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri12 = cartItem._productOrigin) === null || _cartItem$_productOri12 === void 0 || (_cartItem$_productOri12 = _cartItem$_productOri12.product_resource) === null || _cartItem$_productOri12 === void 0 ? void 0 : _cartItem$_productOri12.resources) || [], selectedResources, currentCapacity);
+      var targetResource = productResources.find(function (resource) {
+        return resource.code === resourceCode;
+      });
+      if (!targetResource) return [];
+      if (cartItem._origin.start_time) {
+        var startTime = dayjs("".concat(cartItem._origin.start_date, " ").concat(cartItem._origin.start_time));
+        var endTime = dayjs("".concat(cartItem._origin.end_date, " ").concat(cartItem._origin.end_time));
+        var resourcesUseableMap = {};
+        targetResource.renderList = targetResource.renderList.sort(function (a, b) {
+          var _a$metadata5, _b$metadata5;
+          var aIsCombined = ((_a$metadata5 = a.metadata) === null || _a$metadata5 === void 0 || (_a$metadata5 = _a$metadata5.combined_resource) === null || _a$metadata5 === void 0 ? void 0 : _a$metadata5.status) === 1;
+          var bIsCombined = ((_b$metadata5 = b.metadata) === null || _b$metadata5 === void 0 || (_b$metadata5 = _b$metadata5.combined_resource) === null || _b$metadata5 === void 0 ? void 0 : _b$metadata5.status) === 1;
+          if (aIsCombined && !bIsCombined) return 1;
+          if (!aIsCombined && bIsCombined) return -1;
+          return 0;
+        });
+        targetResource.renderList = targetResource.renderList.filter(function (m) {
+          var mTimes = m.times.filter(function (n) {
+            return !dayjs(n.start_at).isAfter(dayjs(startTime)) && !dayjs(n.end_at).isBefore(dayjs(endTime));
+          });
+          if (mTimes.length === 0) return false;
+          var canUseArr = mTimes.map(function (item) {
+            var _cartItem$_productOri13;
+            var res = getIsUsableByTimeItem({
+              timeSlice: {
+                start_time: startTime.format('HH:mm'),
+                end_time: endTime.format('HH:mm'),
+                start_at: startTime,
+                end_at: endTime
+              },
+              time: item,
+              resource: m,
+              currentCount: currentCapacity || 0,
+              resourcesUseableMap: resourcesUseableMap,
+              cut_off_time: (_cartItem$_productOri13 = cartItem._productOrigin) === null || _cartItem$_productOri13 === void 0 ? void 0 : _cartItem$_productOri13.cut_off_time
+            });
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
+              resourcesUseableMap[m.id] = res.usable;
+            }
+            return res.usable;
+          });
+          if (m.onlyComputed) return false;
+          return !canUseArr.some(function (n) {
+            return n === false;
+          });
+        });
+      } else {
+        targetResource.renderList = targetResource.renderList.filter(function (n) {
+          var _cartItem$_productOri14;
+          var recordCount = n.capacity || 0;
+          if (n.onlyComputed) return false;
+          var timeSlots = getTimeSlicesByResource({
+            resource: n,
+            duration: ((_cartItem$_productOri14 = cartItem._productOrigin) === null || _cartItem$_productOri14 === void 0 || (_cartItem$_productOri14 = _cartItem$_productOri14.duration) === null || _cartItem$_productOri14 === void 0 ? void 0 : _cartItem$_productOri14.value) || 0,
+            split: 10,
+            currentDate: dateRange[0].date
+          });
+          return recordCount >= currentCapacity && timeSlots.length > 0;
+        });
+      }
+      return targetResource.renderList;
+    }
+  }, {
+    key: "getAvailableDateForSession",
+    value: function () {
+      var _getAvailableDateForSession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+        var params,
+          startDate,
+          endDate,
+          type,
+          tempProducts,
+          _ref15,
+          resourceIds,
+          rules,
+          resourcesMap,
+          res,
+          _args29 = arguments;
+        return _regeneratorRuntime().wrap(function _callee28$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
+            case 0:
+              params = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
+              // 开始日期如果小于今天，直接以今天当做开始日期
+              startDate = params.startDate, endDate = params.endDate, type = params.type; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
+              if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
+                startDate = dayjs().format('YYYY-MM-DD');
+              }
+              // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
+              endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              tempProducts = []; // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
+              if (this.store.currentProduct) {
+                tempProducts = [_objectSpread(_objectSpread({}, this.store.currentProduct.getData()), {}, {
+                  _schedule: this.store.currentProduct.getOtherParams()['schedule']
+                })];
+              }
+              // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
+              _ref15 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref15.resourceIds, rules = _ref15.rules, resourcesMap = _ref15.resourcesMap;
+              this.otherParams.currentResourcesMap = resourcesMap;
+              _context29.next = 10;
+              return this.store.date.getResourceDates({
+                query: {
+                  start_date: startDate || '',
+                  end_date: endDate || '',
+                  resource_ids: resourceIds
+                },
+                rules: rules,
+                type: type
+              });
+            case 10:
+              res = _context29.sent;
+              return _context29.abrupt("return", res);
+            case 12:
+            case "end":
+              return _context29.stop();
+          }
+        }, _callee28, this);
+      }));
+      function getAvailableDateForSession() {
+        return _getAvailableDateForSession.apply(this, arguments);
+      }
+      return getAvailableDateForSession;
+    }()
   }]);
   return BookingByStepImpl;
 }(BaseModule);

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

@@ -79,13 +79,23 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time }: {
     resource: ResourceItem;
     duration: number;
     split: number;
     currentDate: DateType | string;
     capacity?: number | undefined;
     resourcesUseableMap?: Record<string, boolean> | undefined;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -123,7 +133,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -131,6 +141,16 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
     split: number;
     capacity?: number | undefined;
     resourcesUseableMap: Record<string, boolean>;
+    cut_off_time?: {
+        future_day: number;
+        unit: number;
+        unit_type: string;
+        type: string;
+        ongoing?: {
+            type: string;
+            unit: number;
+        } | undefined;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -414,7 +414,8 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     currentDate = _ref5$currentDate === void 0 ? dayjs() : _ref5$currentDate,
     capacity = _ref5.capacity,
     _ref5$resourcesUseabl = _ref5.resourcesUseableMap,
-    resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl;
+    resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl,
+    cut_off_time = _ref5.cut_off_time;
   var times = resource.times;
 
   // 存储所有时间切片
@@ -452,7 +453,8 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
         time: time,
         resource: resource,
         currentCount: capacity || 1,
-        resourcesUseableMap: resourcesUseableMap
+        resourcesUseableMap: resourcesUseableMap,
+        cut_off_time: cut_off_time
       });
       if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[resource.id]) !== false) {
         resourcesUseableMap[resource.id] = _status.usable;
@@ -562,7 +564,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
     currentDate = _ref6.currentDate,
     split = _ref6.split,
     capacity = _ref6.capacity,
-    resourcesUseableMap = _ref6.resourcesUseableMap;
+    resourcesUseableMap = _ref6.resourcesUseableMap,
+    cut_off_time = _ref6.cut_off_time;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -584,7 +587,8 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
       split: split,
       currentDate: currentDate,
       capacity: capacity,
-      resourcesUseableMap: resourcesUseableMap
+      resourcesUseableMap: resourcesUseableMap,
+      cut_off_time: cut_off_time
     }));
   }, []);