@pisell/pisellos 0.0.83 → 0.0.85

package/dist/modules/Discount/types.d.ts

@@ -44,6 +44,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     product: Product;
+    type: "product" | 'good_pass';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

package/dist/modules/Rules/index.js

@@ -214,7 +214,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
-            return discount.id;
+            return discount.id && discount.type === 'good_pass';
           }));
 
           // 判断优惠券是否适用于该商品
@@ -244,7 +244,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
-          return discount.id;
+          return discount.id && discount.type === 'good_pass';
         })) {
           processedProductsMap.set(product._id, originProduct);
           return;

package/dist/solution/BookingByStep/index.js

@@ -2177,7 +2177,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
           if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
             return n === false;
-          })) {
+          }) && currentResourcesCount >= count) {
             count = currentResourcesCount;
           }
         });

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

@@ -110,7 +110,10 @@ var checkCapacity = function checkCapacity(_ref) {
     resource = _ref.resource,
     _ref$currentCount = _ref.currentCount,
     currentCount = _ref$currentCount === void 0 ? 1 : _ref$currentCount;
-  if (currentCount > resource.capacity) {
+  // 单个预约：如果当前资源容量不足以满足需求的容量，且当前资源是没有被占用的，返回资源不可用标记，但在外部运算会通过 reason=capacityOnly 来处理组合资源可用
+  // 多个预约：只需判断容量是否足够
+  var isMultipleBooking = resource.resourceType === 'multiple';
+  if (currentCount > resource.capacity && (isMultipleBooking || !isMultipleBooking && event_list.length === 0)) {
     return {
       status: false,
       capacity: resource.capacity,

package/dist/solution/ShopDiscount/index.js

@@ -434,7 +434,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList.forEach(function (item) {
         if (item.booking_id) {
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id) {
+            if (discount.id && discount.type === 'good_pass') {
               var _discount$discount, _discount$discount2, _discount$discount3;
               editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
                 isEditMode: true,

package/lib/modules/Discount/types.d.ts

@@ -44,6 +44,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     product: Product;
+    type: "product" | 'good_pass';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

package/lib/modules/Rules/index.js

@@ -134,7 +134,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id)));
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && discount2.type === "good_pass")));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
@@ -154,7 +154,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       var _a, _b, _c;
       const product = this.hooks.getProduct(originProduct);
-      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id))) {
+      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && discount.type === "good_pass"))) {
         processedProductsMap.set(product._id, originProduct);
         return;
       }

package/lib/solution/BookingByStep/index.js

@@ -1516,7 +1516,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false)) {
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false) && currentResourcesCount >= count) {
           count = currentResourcesCount;
         }
       });

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

@@ -82,7 +82,8 @@ var checkCapacity = ({
   resource,
   currentCount = 1
 }) => {
-  if (currentCount > resource.capacity) {
+  const isMultipleBooking = resource.resourceType === "multiple";
+  if (currentCount > resource.capacity && (isMultipleBooking || !isMultipleBooking && event_list.length === 0)) {
     return {
       status: false,
       capacity: resource.capacity,

package/lib/solution/ShopDiscount/index.js

@@ -271,7 +271,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         (item.discount_list || []).forEach((discount) => {
           var _a2, _b, _c;
-          if (discount.id) {
+          if (discount.id && discount.type === "good_pass") {
             editModeDiscountList.push({
               ...discount,
               isEditMode: true,

package/package.json

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