@pisell/pisellos 2.1.1 → 2.1.3

package/lib/solution/BookingByStep/index.js

@@ -390,7 +390,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let { products, startDate, endDate, type, useCache = true } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -407,14 +407,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (this.store.currentProduct) {
       tempProducts = [
         {
-          ...this.store.currentProduct.getData(),
-          _schedule: this.store.currentProduct.getOtherParams()["schedule"]
+          ...this.store.currentProduct,
+          _schedule: (_a = this.store.currentProductMeta) == null ? void 0 : _a["schedule"]
         }
       ];
     }
     let dateRange = this.store.date.getDateRange();
-    const tempStartDate = startDate || ((_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.date);
-    const tempEndDate = endDate || ((_b = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _b.date) || ((_c = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _c.date);
+    const tempStartDate = startDate || ((_b = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _b.date);
+    const tempEndDate = endDate || ((_c = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _c.date) || ((_d = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _d.date);
     if (!tempProducts.length) {
       return [];
     }
@@ -694,7 +694,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     if (!allOriginResources.length) {
       const dateList = this.store.date.getDateList();
-      dateList.forEach((n) => {
+      dateList == null ? void 0 : dateList.forEach((n) => {
         if (n.resource)
           allOriginResources.push(...n.resource);
       });
@@ -1596,15 +1596,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约
   async openProductDetail(productId) {
-    const targetProduct = await this.store.products.getProduct(productId);
-    if (targetProduct) {
-      const targetProductData = targetProduct.getData();
-      this.store.currentProduct = targetProduct;
+    const targetProductData = await this.store.products.getProduct(productId);
+    if (targetProductData) {
+      this.store.currentProduct = targetProductData;
+      this.store.currentProductMeta = {};
       if (targetProductData["schedule.ids"]) {
         const newScheduleArr = this.getScheduleDataByIds(
           targetProductData["schedule.ids"]
         );
-        targetProduct.setOtherParams("schedule", newScheduleArr);
+        if (!this.store.currentProductMeta)
+          this.store.currentProductMeta = {};
+        this.store.currentProductMeta.schedule = newScheduleArr;
       } else if (targetProductData.duration) {
         const dateRange = this.store.date.getDateRange();
         if (!(dateRange == null ? void 0 : dateRange.length))
@@ -1618,8 +1620,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
   }
   closeProductDetail() {
-    var _a;
-    (_a = this.store.currentProduct) == null ? void 0 : _a.setOtherParams("schedule", []);
+    if (this.store.currentProductMeta) {
+      this.store.currentProductMeta.schedule = [];
+    }
     this.store.currentProduct = void 0;
   }
   getTimeslotBySchedule({
@@ -1628,9 +1631,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const targetProduct = this.store.currentProduct;
-    const targetProductData = product || (targetProduct == null ? void 0 : targetProduct.getData());
+    const targetProductData = product || targetProduct;
     let targetSchedules = [];
     if (scheduleIds == null ? void 0 : scheduleIds.length) {
       targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
@@ -1650,7 +1653,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     );
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
-      resources || ((_c = (_b = (_a = this.store.currentProduct) == null ? void 0 : _a.getData()) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+      resources || ((_b = (_a = this.store.currentProduct) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [],
       selectedResources,
       1
     );
@@ -1671,9 +1674,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const firstEnabledResourceId = (_f = (_e = (_d = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.find(
+    const firstEnabledResourceId = (_e = (_d = (_c = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
       (n) => n.status === 1
-    )) == null ? void 0 : _f.id;
+    )) == null ? void 0 : _e.id;
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
@@ -1747,9 +1750,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return this.otherData[key];
   }
   async getProductTypeById(id) {
-    const product = await this.store.products.getProduct(id);
-    if (product) {
-      return product.getProductType();
+    var _a;
+    const productData = await this.store.products.getProduct(id);
+    if (productData) {
+      if (productData.duration) {
+        return "duration";
+      }
+      if ((_a = productData["schedule.ids"]) == null ? void 0 : _a.length) {
+        return "session";
+      }
+      return "normal";
     }
     return "normal";
   }
@@ -1910,7 +1920,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return results;
   }
   async getAvailableDateForSessionOptimize(params = {}) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     let { startDate, endDate } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -1926,7 +1936,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       tempEndDate = endDate || "";
     }
     endDate = tempEndDate;
-    const cache = (_a = this.store.currentProduct) == null ? void 0 : _a.getOtherParams()["timeSlotBySchedule"];
+    const cache = (_a = this.store.currentProductMeta) == null ? void 0 : _a["timeSlotBySchedule"];
     if (cache) {
       if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
         this.store.date.setDateList(cache.dateList);
@@ -1937,8 +1947,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     }
     let tempProducts;
-    tempProducts = (_b = this.store.currentProduct) == null ? void 0 : _b.getData();
-    const schedule = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["schedule"];
+    tempProducts = this.store.currentProduct;
+    const schedule = (_b = this.store.currentProductMeta) == null ? void 0 : _b["schedule"];
     const filteredSchedule = (0, import_resources.filterScheduleByDateRange)(
       schedule,
       startDate || "",
@@ -1955,7 +1965,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let dates = [];
     let currentDate = (0, import_dayjs.default)(startDate);
     let firstAvailableDate = "";
-    const openResources = ((_e = (_d = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.filter(
+    const openResources = ((_d = (_c = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.filter(
       (m) => m.status === 1
     )) || [];
     const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
@@ -2056,12 +2066,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     dates = (0, import_utils3.handleAvailableDateByResource)(res.data, dates);
     this.store.date.setDateList(dates);
-    (_f = this.store.currentProduct) == null ? void 0 : _f.setOtherParams("timeSlotBySchedule", {
+    if (!this.store.currentProductMeta)
+      this.store.currentProductMeta = {};
+    this.store.currentProductMeta.timeSlotBySchedule = {
       dateList: dates,
       firstAvailableDate,
       startDate,
       endDate: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD")
-    });
+    };
     return {
       dateList: dates,
       firstAvailableDate

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, Product, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -11,7 +11,8 @@ export interface BookingByStepState {
     accountList: AccountListModule;
     order: OrderModule;
     payment: PaymentModule;
-    currentProduct?: Product;
+    currentProduct?: ProductData;
+    currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];

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

@@ -79,78 +79,132 @@ function findFastestAvailableResource({
   currentCapacity = 1,
   countMap = {}
 }) {
-  var _a, _b;
+  var _a, _b, _c;
   const currentTime = (0, import_dayjs.default)();
   let fastestTime = null;
   let fastestResources = [];
+  console.log("[TimeslotUtils] 查找最快可用资源:", {
+    currentTime: currentTime.format("YYYY-MM-DD HH:mm:ss"),
+    resourceCount: resources.length,
+    currentCapacity,
+    countMap
+  });
   for (const resource of resources) {
     const todayTimes = resource.times.filter((time) => {
-      return (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+      return isToday && isStillWorking;
     });
-    if (todayTimes.length === 0)
+    if (todayTimes.length === 0) {
+      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
-    todayTimes.sort((a, b) => {
-      return (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at));
-    });
+    }
     for (const time of todayTimes) {
-      const startTime = (0, import_dayjs.default)(time.start_at);
-      if (startTime.isBefore(currentTime))
-        continue;
-      if (resource.resourceType === "single") {
-        const hasBooking = (_a = time.event_list) == null ? void 0 : _a.some((event) => {
-          return (0, import_dayjs.default)(event.start_at).isSame(startTime);
+      const workStartTime = (0, import_dayjs.default)(time.start_at);
+      const workEndTime = (0, import_dayjs.default)(time.end_at);
+      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+      console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
+        workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
+        checkStartTime: nextAvailableTime.format("HH:mm:ss"),
+        eventCount: ((_a = time.event_list) == null ? void 0 : _a.length) || 0
+      });
+      const relevantEvents = ((_b = time.event_list) == null ? void 0 : _b.filter((event) => {
+        const eventEnd = (0, import_dayjs.default)(event.end_at);
+        return eventEnd.isAfter(nextAvailableTime);
+      })) || [];
+      relevantEvents.sort(
+        (a, b) => (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at))
+      );
+      let finalAvailableTime = nextAvailableTime;
+      for (const event of relevantEvents) {
+        const eventStart = (0, import_dayjs.default)(event.start_at);
+        const eventEnd = (0, import_dayjs.default)(event.end_at);
+        console.log(`[TimeslotUtils] 检查事件冲突:`, {
+          resourceId: resource.id,
+          eventTime: `${eventStart.format("HH:mm")}-${eventEnd.format("HH:mm")}`,
+          checkTime: finalAvailableTime.format("HH:mm:ss"),
+          pax: event.pax || 1
         });
-        if (!hasBooking) {
-          if (!fastestTime || startTime.isSame(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources.push(resource);
-          } else if (startTime.isBefore(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources = [resource];
+        if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+            finalAvailableTime = eventEnd;
+            console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
-          break;
-        }
-      } else {
-        const totalCapacity = resource.capacity || 0;
-        const usedCapacity = ((_b = time.event_list) == null ? void 0 : _b.reduce((sum, event) => {
-          return (0, import_dayjs.default)(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
-        }, 0)) || 0;
-        const remainingCapacity = totalCapacity - usedCapacity;
-        if (remainingCapacity >= (countMap[resource.id] || 0) + currentCapacity) {
-          if (!fastestTime || startTime.isSame(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources.push(resource);
-          } else if (startTime.isBefore(fastestTime)) {
-            fastestTime = startTime;
-            fastestResources = [resource];
+        } else {
+          const totalCapacity = resource.capacity || 0;
+          const currentUsedCapacity = countMap[resource.id] || 0;
+          const eventUsedCapacity = event.pax || 1;
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+            const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
+            if (totalRequiredCapacity > totalCapacity) {
+              finalAvailableTime = eventEnd;
+              console.log(`[TimeslotUtils] 容量不足，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
+            }
           }
-          break;
         }
       }
+      if (finalAvailableTime.isAfter(workEndTime)) {
+        console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
+        continue;
+      }
+      console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 最快可用时间: ${finalAvailableTime.format("HH:mm:ss")}`);
+      if (!fastestTime || finalAvailableTime.isBefore(fastestTime)) {
+        fastestTime = finalAvailableTime;
+        fastestResources = [resource];
+        console.log(`[TimeslotUtils] 更新最快时间: ${fastestTime.format("HH:mm:ss")}, 资源: ${resource.main_field}`);
+      } else if (finalAvailableTime.isSame(fastestTime)) {
+        fastestResources.push(resource);
+        console.log(`[TimeslotUtils] 添加相同时间资源: ${resource.main_field}`);
+      }
+      break;
     }
   }
-  if (!fastestTime || fastestResources.length === 0)
+  if (!fastestTime || fastestResources.length === 0) {
+    console.log("[TimeslotUtils] 未找到可用资源");
     return null;
-  if (fastestResources.length === 1)
+  }
+  console.log(`[TimeslotUtils] 找到 ${fastestResources.length} 个最快可用资源，时间: ${fastestTime.format("HH:mm:ss")}`);
+  if (fastestResources.length === 1) {
+    console.log(`[TimeslotUtils] 返回唯一最快资源: ${fastestResources[0].main_field}`);
     return fastestResources[0];
+  }
+  let selectedResource = fastestResources[0];
   let maxIdleTime = 0;
-  let selectedResource = null;
+  console.log(`[TimeslotUtils] 比较 ${fastestResources.length} 个资源的空闲时间:`);
   for (const resource of fastestResources) {
-    const idleTime = calculateResourceAvailableTime({
-      resource,
-      timeSlots: {
-        start_time: fastestTime.format("HH:mm"),
-        end_time: fastestTime.format("HH:mm"),
-        start_at: fastestTime,
-        end_at: fastestTime
-      },
-      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
+    const workingTime = resource.times.find((time) => {
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(fastestTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(fastestTime);
+      return isToday && isStillWorking;
+    });
+    if (!workingTime)
+      continue;
+    const workEndTime = (0, import_dayjs.default)(workingTime.end_at);
+    let totalIdleTime = workEndTime.diff(fastestTime, "minute");
+    const relevantEvents = ((_c = workingTime.event_list) == null ? void 0 : _c.filter((event) => {
+      const eventStart = (0, import_dayjs.default)(event.start_at);
+      const eventEnd = (0, import_dayjs.default)(event.end_at);
+      return eventEnd.isAfter(fastestTime) && eventStart.isAfter(fastestTime);
+    })) || [];
+    for (const event of relevantEvents) {
+      const eventStart = (0, import_dayjs.default)(event.start_at);
+      const eventEnd = (0, import_dayjs.default)(event.end_at);
+      const eventDuration = eventEnd.diff(eventStart, "minute");
+      totalIdleTime -= eventDuration;
+    }
+    console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}):`, {
+      工作结束时间: workEndTime.format("HH:mm"),
+      总工作时长: workEndTime.diff(fastestTime, "minute") + "分钟",
+      预约占用时长: workEndTime.diff(fastestTime, "minute") - totalIdleTime + "分钟",
+      实际空闲时长: totalIdleTime + "分钟"
     });
-    if (idleTime > maxIdleTime) {
-      maxIdleTime = idleTime;
+    if (totalIdleTime > maxIdleTime) {
+      maxIdleTime = totalIdleTime;
       selectedResource = resource;
+      console.log(`[TimeslotUtils] 更新最佳选择: ${resource.main_field} (空闲${totalIdleTime}分钟)`);
     }
   }
+  console.log(`[TimeslotUtils] 最终选择资源: ${selectedResource.main_field} (最长空闲${maxIdleTime}分钟)`);
   return selectedResource;
 }
 function filterConditionTimeSlots(times, startTime, endTime) {

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore } from '../../types';
-import { Product, ProductData } from '../../modules/';
+import { ProductData } from '../../modules/';
 import { BaseModule } from '../../modules/BaseModule';
 export * from './types';
 export declare class BuyTicketsImpl extends BaseModule implements Module {
@@ -16,7 +16,7 @@ export declare class BuyTicketsImpl extends BaseModule implements Module {
     loadProductsByCategory(categoryId: number): Promise<void>;
     destroy(): Promise<void>;
     getProducts(): Promise<ProductData[]>;
-    getProduct(id: number): Promise<Product>;
+    getProduct(id: number): Promise<ProductData>;
     listSubmit(data: Record<string, any>): Promise<{
         status: boolean;
         data: any;

package/lib/solution/BuyTickets/index.js

@@ -98,7 +98,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       return mainProduct;
     if (otherProduct)
       return otherProduct;
-    return Promise.reject("Not fund product for id: " + id);
+    throw new Error(`Product not found: ${id}`);
   }
   // 商品列表页提交
   async listSubmit(data) {

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

@@ -34,7 +34,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
-    scanCode(code: string): Promise<{
+    scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -198,10 +198,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.store.productList = productList;
   }
   // 扫码输入code
-  async scanCode(code) {
+  async scanCode(code, customerId) {
     var _a, _b;
     try {
-      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code)) || [];
+      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {

package/package.json

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