@pisell/pisellos 3.0.77 → 3.0.78

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

@@ -320,7 +320,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || resource.onlyComputed && dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
           });
           if (availableTimes.length > 0) {
             // 简化逻辑：如果资源在时间段内有可用时间，就计算其容量

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

@@ -444,6 +444,10 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     // 解析开始和结束时间
     var startTime = dayjs("".concat(time.start_at));
     var endTime = dayjs("".concat(time.end_at));
+    // 结束时间要做修复，如果time.end_at 是超过了 currentDate 的那一天，则把 end_at 设置为 currentDate 那一天的 23:59:59
+    if (endTime.isAfter(dayjs(currentDate).endOf('day'))) {
+      endTime = dayjs(currentDate).endOf('day');
+    }
 
     // 当前切片的开始时间
     var currentStart = startTime;

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

@@ -2,6 +2,7 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { Customer } from './types';
 import { Discount } from '../../modules/Discount/types';
+import { UnavailableReason } from '../../modules/Rules/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -48,6 +49,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
+        unavailableReason?: UnavailableReason;
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/dist/solution/ShopDiscount/index.js

@@ -29,6 +29,7 @@ import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
 import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
+import { UnavailableReason } from "../../modules/Rules/types";
 import Decimal from 'decimal.js';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
@@ -375,7 +376,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref3, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -400,7 +401,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                unavailableReason: UnavailableReason.Unknown
               });
             case 10:
               if (resultDiscountList.length) {
@@ -447,7 +449,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
-              }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
+              }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable, unavailableReason = _ref3.unavailableReason;
               if (!isAvailable) {
                 _context5.next = 23;
                 break;
@@ -465,7 +467,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
-                discountList: newDiscountList || this.getDiscountList()
+                discountList: newDiscountList || this.getDiscountList(),
+                unavailableReason: unavailableReason
               });
             case 26:
               _context5.prev = 26;
@@ -475,7 +478,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList()
+                discountList: this.getDiscountList(),
+                unavailableReason: UnavailableReason.Unknown
               });
             case 30:
             case "end":

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

@@ -20,7 +20,9 @@ export interface ITime {
     date: string;
     week: string;
     weekNum: number;
-    status: 'unavailable' | 'available';
+    status: 'unavailable' | 'available' | 'lots_of_space' | 'filling_up_fast' | 'sold_out';
+    summaryCount?: number;
+    availableCount?: number;
     resource?: any[];
     color?: string[];
 }

package/lib/modules/ProductList/index.js

@@ -95,13 +95,6 @@ var ProductList = class extends import_BaseModule.BaseModule {
       { useCache: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-    if (sortedList.length) {
-      sortedList.forEach((n) => {
-        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
-          n.is_eject = 1;
-        }
-      });
-    }
     this.addProduct(sortedList);
     return sortedList;
   }

package/lib/modules/Rules/index.d.ts

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
 import { Discount } from "../Discount/types";
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -24,7 +24,9 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
+        unavailableReason?: UnavailableReason;
     };
+    private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];

package/lib/modules/Rules/index.js

@@ -94,7 +94,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return {
         isAvailable: false,
         discountList: oldDiscountList,
-        productList
+        productList,
+        unavailableReason: import_types.UnavailableReason.AlreadyUsed
       };
     }
     const filteredOldDiscountList = oldDiscountList.filter(
@@ -132,12 +133,49 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       }
     });
+    let unavailableReason;
+    if (!hasApplicableDiscount) {
+      unavailableReason = this.getUnavailableReason(newDiscountList, productList);
+    }
     return {
       isAvailable: hasApplicableDiscount,
       discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
-      productList: hasApplicableDiscount ? result.productList : productList
+      productList: hasApplicableDiscount ? result.productList : productList,
+      unavailableReason
     };
   }
+  // 获取券不可用的原因
+  getUnavailableReason(discountList, productList) {
+    var _a;
+    for (const discount of discountList) {
+      for (const item of productList) {
+        const product = this.hooks.getProduct(item);
+        const bookingTime = ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss");
+        const filteredList = (0, import_utils.filterDiscountListByBookingTime)([discount], bookingTime);
+        if (filteredList.length === 0) {
+          return import_types.UnavailableReason.TimeLimit;
+        }
+      }
+    }
+    for (const discount of discountList) {
+      const limitedData = discount.limited_relation_product_data;
+      let hasApplicableProduct = false;
+      for (const item of productList) {
+        const product = this.hooks.getProduct(item);
+        if (limitedData.type === "product_all") {
+          hasApplicableProduct = true;
+          break;
+        } else if ((_a = limitedData.product_ids) == null ? void 0 : _a.includes(product.id)) {
+          hasApplicableProduct = true;
+          break;
+        }
+      }
+      if (!hasApplicableProduct) {
+        return import_types.UnavailableReason.ProductNotApplicable;
+      }
+    }
+    return import_types.UnavailableReason.Unknown;
+  }
   calcDiscount({
     discountList,
     productList,

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

@@ -1,4 +1,10 @@
 import { Discount } from '../Discount/types';
+export declare enum UnavailableReason {
+    TimeLimit = "time_limit",
+    ProductNotApplicable = "product_not_applicable",
+    AlreadyUsed = "already_used",
+    Unknown = "unknown"
+}
 export declare enum RulesHooks {
     OnRulesListChange = "rules:onRulesListChange",
     OnDestroy = "rules:onDestroy"

package/lib/modules/Rules/types.js

@@ -19,9 +19,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Rules/types.ts
 var types_exports = {};
 __export(types_exports, {
-  RulesHooks: () => RulesHooks
+  RulesHooks: () => RulesHooks,
+  UnavailableReason: () => UnavailableReason
 });
 module.exports = __toCommonJS(types_exports);
+var UnavailableReason = /* @__PURE__ */ ((UnavailableReason2) => {
+  UnavailableReason2["TimeLimit"] = "time_limit";
+  UnavailableReason2["ProductNotApplicable"] = "product_not_applicable";
+  UnavailableReason2["AlreadyUsed"] = "already_used";
+  UnavailableReason2["Unknown"] = "unknown";
+  return UnavailableReason2;
+})(UnavailableReason || {});
 var RulesHooks = /* @__PURE__ */ ((RulesHooks2) => {
   RulesHooks2["OnRulesListChange"] = "rules:onRulesListChange";
   RulesHooks2["OnDestroy"] = "rules:onDestroy";
@@ -29,5 +37,6 @@ var RulesHooks = /* @__PURE__ */ ((RulesHooks2) => {
 })(RulesHooks || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RulesHooks
+  RulesHooks,
+  UnavailableReason
 });

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

@@ -299,6 +299,16 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         errorList: any[];
     };
     getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
+        resources_code: string;
+        startDate: string;
+        endDate: string;
+    }): Promise<{
+        date: string;
+        status: string;
+        week: string;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
@@ -316,6 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
+        status: keyof TimeStatusMap;
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -380,3 +391,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     */
     getContactInfo(params: any): Promise<any>;
 }
+interface TimeStatusMap {
+    lots_of_space: true;
+    filling_up_fast: true;
+    sold_out: true;
+}
+export {};