@pisell/pisellos 0.0.568 → 0.0.569

package/lib/modules/Schedule/getDateIsInSchedule.js

@@ -73,13 +73,19 @@ const isInTimeSlotsSchedule = (targetDate, targetDateString, targetTimeString, s
     return false;
   }
   const scheduleStartDate = (0, _dayjs.default)(schedule.start_time.split(' ')[0]);
+
+  // 检查日期是否在日程的有效范围内（包含 daily / weekly 重复规则）
   if (!isDateInTimeSlotsSchedule(targetDate, schedule, scheduleStartDate)) {
     return false;
   }
+
+  // 检查是否在任一时间段内
   for (const timeSlot of schedule.time_slot) {
-    const slotStart = (0, _dayjs.default)(`${targetDateString} ${timeSlot.start_time}:00`);
-    const slotEnd = (0, _dayjs.default)(`${targetDateString} ${timeSlot.end_time}:00`);
-    if (targetDate.isSameOrAfter(slotStart) && targetDate.isBefore(slotEnd)) {
+    const slotStart = `${targetDateString} ${timeSlot.start_time}:00`;
+    const slotEnd = `${targetDateString} ${timeSlot.end_time}:00`;
+    const slotStartDate = (0, _dayjs.default)(slotStart);
+    const slotEndDate = (0, _dayjs.default)(slotEnd);
+    if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
       return true;
     }
   }
@@ -98,7 +104,7 @@ const isInDesignationSchedule = (targetDate, targetDateString, targetTimeString,
     const endDateTime = `${designation.end_date} ${designation.end_time}:00`;
     const startDate = (0, _dayjs.default)(startDateTime);
     const endDate = (0, _dayjs.default)(endDateTime);
-    if (targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate)) {
+    if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
       return true;
     }
   }
@@ -175,8 +181,9 @@ const isInDailyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
 
-  // 每日重复：每天都在相同的时间段内有效 [start, end)
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
+  // 每日重复：每天都在相同的时间段内有效
+  // 例如：01:00:00 - 16:00:00，每天都是这个时间段
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 
 // 每周重复逻辑
@@ -203,7 +210,7 @@ const isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 
 // 日程时间段类型

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

@@ -9,15 +9,28 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     private cacheId;
     private openCache;
     private fatherModule;
+    private hasLoadedScheduleList;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+     *
+     * @example
+     * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     /**
      * 加载当前店铺下所有 schedule
      *
      * @memberof ScheduleModule
      */
-    loadAllSchedule(): Promise<void>;
+    loadAllSchedule(options?: {
+        useCache?: boolean;
+    }): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
+    private syncScheduleMap;
+    getScheduleList(): ScheduleItem[];
+    isScheduleListLoaded(): boolean;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<import("../Date/types").ITime[]>;
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
@@ -35,10 +48,10 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
         schedule: any;
     }): boolean;
     /**
-     * 传入一个时间, 判断改时间是否在schedule 内
-     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns
-     */
+   * 传入一个时间, 判断改时间是否在schedule 内
+   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+   * @returns
+   */
     static isInScheduleByDate({ date, schedule, }: {
         date: string;
         schedule: any;

package/lib/modules/Schedule/index.js

@@ -23,6 +23,7 @@ class ScheduleModule extends _BaseModule.BaseModule {
   cacheId;
   openCache = false;
   fatherModule;
+  hasLoadedScheduleList = false;
   constructor(name, version) {
     super(name, version);
   }
@@ -41,10 +42,14 @@ class ScheduleModule extends _BaseModule.BaseModule {
     this.store = options?.store;
     if (options.initialState) {
       this.store.scheduleList = options.initialState.scheduleList;
+      this.syncScheduleMap();
       this.store.availabilityDateList = options.initialState.availabilityDateList;
+      this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
     } else {
       this.store.scheduleList = [];
+      this.store.map = new Map();
       this.store.availabilityDateList = [];
+      this.hasLoadedScheduleList = false;
     }
     if (options.otherParams?.cacheId) {
       this.openCache = options.otherParams.openCache;
@@ -55,21 +60,45 @@ class ScheduleModule extends _BaseModule.BaseModule {
     }
   }
 
+  /**
+   * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+   *
+   * @example
+   * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+   */
+  updateOtherParams(params) {
+    const otherParams = params || {};
+    this.openCache = otherParams.openCache ?? false;
+    this.cacheId = otherParams.cacheId;
+    this.fatherModule = otherParams.fatherModule;
+  }
+
   /**
    * 加载当前店铺下所有 schedule
    *
    * @memberof ScheduleModule
    */
-  async loadAllSchedule() {
+  async loadAllSchedule(options = {}) {
     const scheduleList = await this.request.get(`/schedule`, {
       num: 999
     }, {
-      useCache: true
+      useCache: options.useCache ?? true
     });
     this.setScheduleList(scheduleList.data?.list || []);
   }
   setScheduleList(list) {
     this.store.scheduleList = list;
+    this.syncScheduleMap();
+    this.hasLoadedScheduleList = true;
+  }
+  syncScheduleMap() {
+    this.store.map = new Map((this.store.scheduleList || []).map(schedule => [Number(schedule.id), schedule]));
+  }
+  getScheduleList() {
+    return this.store.scheduleList || [];
+  }
+  isScheduleListLoaded() {
+    return this.hasLoadedScheduleList;
   }
   async loadScheduleAvailableDate({
     startDate,
@@ -94,19 +123,22 @@ class ScheduleModule extends _BaseModule.BaseModule {
       custom_page_id,
       channel
     });
-    this.setAvailabilityScheduleDateList(res.data.date_list);
-    this.setOtherProductsIds(res.data.other_product_ids || []);
+    const responseData = res.data || {};
+    const dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
+    const otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
+    this.setAvailabilityScheduleDateList(dateList);
+    this.setOtherProductsIds(otherProductIds);
     // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
-    if (!res.data.date_list?.length && !res.data.other_product_ids?.length || (0, _dayjs.default)(endDate).isBefore((0, _dayjs.default)(), 'day')) {
+    if (!dateList.length && !otherProductIds.length || (0, _dayjs.default)(endDate).isBefore((0, _dayjs.default)(), 'day')) {
       return dates;
     }
-    if (res.data.other_product_ids?.length) {
+    if (otherProductIds.length) {
       // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
       dates.forEach(n => {
         n.status = 'available';
       });
     } else {
-      res.data.date_list.forEach(n => {
+      dateList.forEach(n => {
         const index = dates.findIndex(m => m.date === n.date);
         if (index !== -1) {
           dates[index].status = 'available';
@@ -117,7 +149,12 @@ class ScheduleModule extends _BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
-    return (this.store.scheduleList || []).filter(n => ids.includes(n.id));
+    const idSet = new Set(ids.map(id => String(id)));
+    if (this.store.map instanceof Map && this.store.map.size > 0) {
+      return ids.map(id => this.store.map.get(Number(id))).filter(Boolean);
+    }
+    const list = this.store.scheduleList?.filter(n => idSet.has(String(n.id)));
+    return list;
   }
   setAvailabilityScheduleDateList(list) {
     this.store.availabilityDateList = list;
@@ -143,7 +180,6 @@ class ScheduleModule extends _BaseModule.BaseModule {
       });
     }
   }
-
   /**
    * 传入一个时间, 判断改时间是否在schedule 内
    * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
@@ -155,12 +191,11 @@ class ScheduleModule extends _BaseModule.BaseModule {
   }) {
     return (0, _getDateIsInSchedule.getDateIsInSchedule)(date, [schedule]);
   }
-
   /**
-   * 传入一个时间, 判断改时间是否在schedule 内
-   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-   * @returns
-   */
+  * 传入一个时间, 判断改时间是否在schedule 内
+  * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+  * @returns
+  */
   static isInScheduleByDate({
     date,
     schedule

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

@@ -25,6 +25,8 @@ export interface LoadScheduleAvailableDateParams {
     channel?: string;
 }
 export interface ScheduleModuleAPI {
+    getScheduleList: () => ScheduleItem[];
+    isScheduleListLoaded: () => boolean;
 }
 export type ScheduleItem = {
     /** 颜色 */

package/lib/modules/Summary/index.js

@@ -55,7 +55,7 @@ class SummaryModule extends _BaseModule.BaseModule {
   async getSummary(cartItems) {
     const shopInfo = this.shopStore.get('core')?.core?.shop || {};
     const scheduleModule = this.core.getModule('appointmentBooking_schedule');
-    const needScheduleIds = (this.store.surchargeList || []).map(item => item.available_schedule_ids).flat();
+    const needScheduleIds = this.store.surchargeList?.map(item => item.available_schedule_ids).flat();
     const scheduleList = scheduleModule?.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {
@@ -104,7 +104,7 @@ class SummaryModule extends _BaseModule.BaseModule {
   getSurchargeforUtils(items) {
     // const surchargeList = this.store.surchargeList;
     const scheduleModule = this.core.getModule('appointmentBooking_schedule');
-    const needScheduleIds = (this.store.surchargeList || []).map(item => item.available_schedule_ids).flat();
+    const needScheduleIds = this.store.surchargeList?.map(item => item.available_schedule_ids).flat();
     const scheduleList = scheduleModule?.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {

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

@@ -0,0 +1,18 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { SurchargeListItem, SurchargeListModuleAPI, SurchargeListQuery } from './types';
+export * from './types';
+export declare class SurchargeListModule extends BaseModule implements Module, SurchargeListModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private request;
+    private store;
+    private loadingPromises;
+    private requestVersion;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    private resolveChannel;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    private loadSurchargeList;
+}

package/lib/modules/SurchargeList/index.js

@@ -0,0 +1,95 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  SurchargeListModule: true
+};
+exports.SurchargeListModule = void 0;
+var _BaseModule = require("../BaseModule");
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});
+const DEFAULT_SURCHARGE_CHANNEL = 'online-store';
+class SurchargeListModule extends _BaseModule.BaseModule {
+  defaultName = 'surchargeList';
+  defaultVersion = '1.0.0';
+  request;
+  store;
+  loadingPromises = new Map();
+  requestVersion = 0;
+  constructor(name, version) {
+    super(name, version);
+  }
+  async initialize(core, options) {
+    this.core = core;
+    this.store = options.store;
+    this.request = this.core.getPlugin('request');
+    const hasInitialSurchargeList = Array.isArray(options.initialState?.surchargeList);
+    this.store.surchargeList = hasInitialSurchargeList ? options.initialState?.surchargeList : [];
+    this.store.channel = options.initialState?.channel || options.otherParams?.channel || DEFAULT_SURCHARGE_CHANNEL;
+    this.store.isLoaded = Boolean(options.initialState?.isLoaded) || hasInitialSurchargeList;
+    if (!this.request) {
+      throw new Error('SurchargeListModule 需要 request 插件支持');
+    }
+  }
+  resolveChannel(query) {
+    return query?.channel || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    if (this.store.isLoaded && this.store.channel === channel) {
+      return this.store.surchargeList;
+    }
+    const loadingPromise = this.loadingPromises.get(channel);
+    if (loadingPromise) return loadingPromise;
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
+  }
+  async refreshSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
+  }
+  async loadSurchargeList(channel) {
+    const currentRequestVersion = ++this.requestVersion;
+    try {
+      const surchargeList = await this.request.get('/order/custom-surcharge/available/v2', {
+        channel,
+        is_assemble_product_data: 1,
+        is_assemble_schedule_data: 1,
+        with: ['relationSchedule']
+      });
+      const nextSurchargeList = surchargeList?.data || [];
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = nextSurchargeList;
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return nextSurchargeList;
+    } catch (error) {
+      console.warn('[SurchargeListModule] 加载附加费配置失败', error);
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = [];
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return [];
+    } finally {
+      this.loadingPromises.delete(channel);
+    }
+  }
+}
+exports.SurchargeListModule = SurchargeListModule;

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

@@ -0,0 +1,15 @@
+export interface SurchargeListItem {
+    [key: string]: any;
+}
+export interface SurchargeListState {
+    surchargeList: SurchargeListItem[];
+    isLoaded: boolean;
+    channel?: string;
+}
+export interface SurchargeListQuery {
+    channel?: string;
+}
+export interface SurchargeListModuleAPI {
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+}

package/lib/modules/SurchargeList/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/modules/index.d.ts

@@ -12,8 +12,11 @@ export * from './Resource';
 export * from './Step';
 export * from './Summary';
 export * from './SalesSummary';
+export * from './SurchargeList';
 export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
+export * from './BookingContext';
 export * from './Holder';
+export * from './ResourcePlanner';

package/lib/modules/index.js

@@ -157,6 +157,17 @@ Object.keys(_SalesSummary).forEach(function (key) {
     }
   });
 });
+var _SurchargeList = require("./SurchargeList");
+Object.keys(_SurchargeList).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _SurchargeList[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _SurchargeList[key];
+    }
+  });
+});
 var _Schedule = require("./Schedule");
 Object.keys(_Schedule).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -201,6 +212,17 @@ Object.keys(_OpenData).forEach(function (key) {
     }
   });
 });
+var _BookingContext = require("./BookingContext");
+Object.keys(_BookingContext).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _BookingContext[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _BookingContext[key];
+    }
+  });
+});
 var _Holder = require("./Holder");
 Object.keys(_Holder).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -211,4 +233,15 @@ Object.keys(_Holder).forEach(function (key) {
       return _Holder[key];
     }
   });
+});
+var _ResourcePlanner = require("./ResourcePlanner");
+Object.keys(_ResourcePlanner).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _ResourcePlanner[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ResourcePlanner[key];
+    }
+  });
 });

package/lib/plugins/app.d.ts

@@ -1,8 +1,10 @@
 import { Plugin } from '../types';
 import App from './app-types/app';
+export type AppDataGetter = (key: string) => any;
 /**
  * AppPlugin 接口定义
  */
 export interface AppPlugin extends Plugin {
     getApp: () => App;
+    getData?: () => AppDataGetter;
 }

package/lib/plugins/request.d.ts

@@ -69,6 +69,7 @@ export interface RequestOptions {
     customToast?: () => void;
     cache?: CacheProps;
     osServer?: boolean;
+    prefix?: boolean;
     callback?: (res: any) => void;
     subscriberId?: string;
 }