@pisell/pisellos 0.0.568 → 0.0.570

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

@@ -1,5 +1,5 @@
-export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
-export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
+export declare type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
+export declare type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
     errorHook?: string;

package/dist/modules/Schedule/getDateIsInSchedule.d.ts

@@ -1,7 +1,7 @@
 import dayjs from "dayjs";
 import { ScheduleItem } from "./types";
 export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
-export type ScheduleTimeSlot = {
+export declare type ScheduleTimeSlot = {
     /** 开始时间 HH:mm */
     start_time: string;
     /** 结束时间 HH:mm */

package/dist/modules/Schedule/getDateIsInSchedule.js

@@ -81,17 +81,23 @@ var isInTimeSlotsSchedule = function isInTimeSlotsSchedule(targetDate, targetDat
     return false;
   }
   var scheduleStartDate = dayjs(schedule.start_time.split(' ')[0]);
+
+  // 检查日期是否在日程的有效范围内（包含 daily / weekly 重复规则）
   if (!isDateInTimeSlotsSchedule(targetDate, schedule, scheduleStartDate)) {
     return false;
   }
+
+  // 检查是否在任一时间段内
   var _iterator2 = _createForOfIteratorHelper(schedule.time_slot),
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var timeSlot = _step2.value;
-      var slotStart = dayjs("".concat(targetDateString, " ").concat(timeSlot.start_time, ":00"));
-      var slotEnd = dayjs("".concat(targetDateString, " ").concat(timeSlot.end_time, ":00"));
-      if (targetDate.isSameOrAfter(slotStart) && targetDate.isBefore(slotEnd)) {
+      var slotStart = "".concat(targetDateString, " ").concat(timeSlot.start_time, ":00");
+      var slotEnd = "".concat(targetDateString, " ").concat(timeSlot.end_time, ":00");
+      var slotStartDate = dayjs(slotStart);
+      var slotEndDate = dayjs(slotEnd);
+      if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
         return true;
       }
     }
@@ -119,7 +125,7 @@ var isInDesignationSchedule = function isInDesignationSchedule(targetDate, targe
       var endDateTime = "".concat(designation.end_date, " ").concat(designation.end_time, ":00");
       var startDate = dayjs(startDateTime);
       var endDate = dayjs(endDateTime);
-      if (targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate)) {
+      if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
         return true;
       }
     }
@@ -217,8 +223,9 @@ var isInDailyRepeat = function isInDailyRepeat(targetDate, startDate, endDate, r
   var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   var 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;
 };
 
 // 每周重复逻辑
@@ -245,7 +252,7 @@ var isInWeeklyRepeat = function isInWeeklyRepeat(targetDate, startDate, endDate,
   var targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   var startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   var endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 
 // 日程时间段类型

package/dist/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/dist/modules/Schedule/index.js

@@ -44,6 +44,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
+    _defineProperty(_assertThisInitialized(_this), "hasLoadedScheduleList", false);
     return _this;
   }
   _createClass(ScheduleModule, [{
@@ -70,10 +71,14 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               this.store = options === null || options === void 0 ? void 0 : 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 = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
                 this.openCache = options.otherParams.openCache;
@@ -93,6 +98,22 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+     *
+     * @example
+     * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+     */
+  }, {
+    key: "updateOtherParams",
+    value: function updateOtherParams(params) {
+      var _otherParams$openCach;
+      var otherParams = params || {};
+      this.openCache = (_otherParams$openCach = otherParams.openCache) !== null && _otherParams$openCach !== void 0 ? _otherParams$openCach : false;
+      this.cacheId = otherParams.cacheId;
+      this.fatherModule = otherParams.fatherModule;
+    }
+
     /**
      * 加载当前店铺下所有 schedule
      *
@@ -102,21 +123,24 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadAllSchedule",
     value: (function () {
       var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _scheduleList$data;
-        var scheduleList;
+        var _options$useCache, _scheduleList$data;
+        var options,
+          scheduleList,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              options = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+              _context2.next = 3;
               return this.request.get("/schedule", {
                 num: 999
               }, {
-                useCache: true
+                useCache: (_options$useCache = options.useCache) !== null && _options$useCache !== void 0 ? _options$useCache : true
               });
-            case 2:
+            case 3:
               scheduleList = _context2.sent;
               this.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -131,13 +155,31 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "setScheduleList",
     value: function setScheduleList(list) {
       this.store.scheduleList = list;
+      this.syncScheduleMap();
+      this.hasLoadedScheduleList = true;
+    }
+  }, {
+    key: "syncScheduleMap",
+    value: function syncScheduleMap() {
+      this.store.map = new Map((this.store.scheduleList || []).map(function (schedule) {
+        return [Number(schedule.id), schedule];
+      }));
+    }
+  }, {
+    key: "getScheduleList",
+    value: function getScheduleList() {
+      return this.store.scheduleList || [];
+    }
+  }, {
+    key: "isScheduleListLoaded",
+    value: function isScheduleListLoaded() {
+      return this.hasLoadedScheduleList;
     }
   }, {
     key: "loadScheduleAvailableDate",
     value: function () {
       var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _res$data$date_list, _res$data$other_produ, _res$data$other_produ2;
-        var startDate, endDate, custom_page_id, channel, dates, res;
+        var startDate, endDate, custom_page_id, channel, dates, res, responseData, dateList, otherProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -165,22 +207,25 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 8:
               res = _context3.sent;
-              this.setAvailabilityScheduleDateList(res.data.date_list);
-              this.setOtherProductsIds(res.data.other_product_ids || []);
+              responseData = res.data || {};
+              dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
+              otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
+              this.setAvailabilityScheduleDateList(dateList);
+              this.setOtherProductsIds(otherProductIds);
               // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
-              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) && !((_res$data$other_produ = res.data.other_product_ids) !== null && _res$data$other_produ !== void 0 && _res$data$other_produ.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
-                _context3.next = 13;
+              if (!(!dateList.length && !otherProductIds.length || dayjs(endDate).isBefore(dayjs(), 'day'))) {
+                _context3.next = 16;
                 break;
               }
               return _context3.abrupt("return", dates);
-            case 13:
-              if ((_res$data$other_produ2 = res.data.other_product_ids) !== null && _res$data$other_produ2 !== void 0 && _res$data$other_produ2.length) {
+            case 16:
+              if (otherProductIds.length) {
                 // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
                 dates.forEach(function (n) {
                   n.status = 'available';
                 });
               } else {
-                res.data.date_list.forEach(function (n) {
+                dateList.forEach(function (n) {
                   var index = dates.findIndex(function (m) {
                     return m.date === n.date;
                   });
@@ -191,7 +236,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               }
               dates = disableDatesBeforeOneDay(dates);
               return _context3.abrupt("return", dates);
-            case 16:
+            case 19:
             case "end":
               return _context3.stop();
           }
@@ -205,9 +250,20 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      return (this.store.scheduleList || []).filter(function (n) {
-        return ids.includes(n.id);
+      var _this2 = this,
+        _this$store$scheduleL;
+      var idSet = new Set(ids.map(function (id) {
+        return String(id);
+      }));
+      if (this.store.map instanceof Map && this.store.map.size > 0) {
+        return ids.map(function (id) {
+          return _this2.store.map.get(Number(id));
+        }).filter(Boolean);
+      }
+      var list = (_this$store$scheduleL = this.store.scheduleList) === null || _this$store$scheduleL === void 0 ? void 0 : _this$store$scheduleL.filter(function (n) {
+        return idSet.has(String(n.id));
       });
+      return list;
     }
   }, {
     key: "setAvailabilityScheduleDateList",
@@ -243,7 +299,6 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
     }
-
     /**
      * 传入一个时间, 判断改时间是否在schedule 内
      * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
@@ -256,12 +311,11 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
         schedule = _ref2.schedule;
       return 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
+    */
   }], [{
     key: "isInScheduleByDate",
     value: function isInScheduleByDate(_ref3) {

package/dist/modules/Schedule/type.d.ts

@@ -1,4 +1,4 @@
-export type ScheduleItem = {
+export declare type ScheduleItem = {
     /** 颜色 */
     color: string;
     /** 创建时间 */
@@ -65,7 +65,7 @@ export type ScheduleItem = {
         schedule_id: number;
     }[];
 };
-export type ScheduleFormOtherValue = {
+export declare type ScheduleFormOtherValue = {
     /** 截止模式
      * 1: 永不截止
      * 2: 按日期截止
@@ -79,11 +79,11 @@ export type ScheduleFormOtherValue = {
     includeStatus: boolean;
     type: 'standard' | 'time-slots' | 'designation';
 };
-export type ExcIncDate = {
+export declare type ExcIncDate = {
     start: string;
     end: string;
 };
-export type ScheduleFormData = {
+export declare type ScheduleFormData = {
     /** 颜色 */
     color: string;
     /** 日程名称 */
@@ -131,20 +131,20 @@ export type ScheduleFormData = {
     start_time: any;
     end_time: any;
 };
-export type CalendarDataItem = {
+export declare type CalendarDataItem = {
     date: string;
     color: string[];
     isExcluded: boolean;
     schedule_ids?: number[];
     [key: string]: any;
 };
-export type RequestData<Data> = {
+export declare type RequestData<Data> = {
     data: Data;
     status: boolean;
     message: string;
     code: number;
 };
-export type ResponseListData<Data> = {
+export declare type ResponseListData<Data> = {
     status: boolean;
     message: string;
     code: number;

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

@@ -6,7 +6,7 @@ export interface ScheduleState {
     availabilityDateList: ScheduleAvailabilityDateItem[];
     otherProductsIds: number[];
 }
-export type ScheduleAvailabilityDateItem = {
+export declare type ScheduleAvailabilityDateItem = {
     date: string;
     schedule_id: number[];
     product_ids: number[];
@@ -25,8 +25,10 @@ export interface LoadScheduleAvailableDateParams {
     channel?: string;
 }
 export interface ScheduleModuleAPI {
+    getScheduleList: () => ScheduleItem[];
+    isScheduleListLoaded: () => boolean;
 }
-export type ScheduleItem = {
+export declare type ScheduleItem = {
     /** 颜色 */
     color: string;
     /** 创建时间 */
@@ -93,7 +95,7 @@ export type ScheduleItem = {
         schedule_id: number;
     }[];
 };
-export type ScheduleFormOtherValue = {
+export declare type ScheduleFormOtherValue = {
     /** 截止模式
      * 1: 永不截止
      * 2: 按日期截止
@@ -107,11 +109,11 @@ export type ScheduleFormOtherValue = {
     includeStatus: boolean;
     type: 'standard' | 'time-slots' | 'designation';
 };
-export type ExcIncDate = {
+export declare type ExcIncDate = {
     start: string;
     end: string;
 };
-export type ScheduleFormData = {
+export declare type ScheduleFormData = {
     /** 颜色 */
     color: string;
     /** 日程名称 */
@@ -159,20 +161,20 @@ export type ScheduleFormData = {
     start_time: any;
     end_time: any;
 };
-export type CalendarDataItem = {
+export declare type CalendarDataItem = {
     date: string;
     color: string[];
     isExcluded: boolean;
     schedule_ids?: number[];
     [key: string]: any;
 };
-export type RequestData<Data> = {
+export declare type RequestData<Data> = {
     data: Data;
     status: boolean;
     message: string;
     code: number;
 };
-export type ResponseListData<Data> = {
+export declare type ResponseListData<Data> = {
     status: boolean;
     message: string;
     code: number;
@@ -183,7 +185,7 @@ export type ResponseListData<Data> = {
         skip: number;
     };
 };
-export type ScheduleAllMap = Record<string, {
+export declare type ScheduleAllMap = Record<string, {
     minTime: dayjs.Dayjs | null;
     maxTime: dayjs.Dayjs | null;
     minTimeStr: string | null;

package/dist/modules/Summary/index.js

@@ -113,14 +113,14 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     key: "getSummary",
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(cartItems) {
-        var _this$shopStore$get;
+        var _this$shopStore$get, _this$store$surcharge;
         var shopInfo, scheduleModule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               shopInfo = ((_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.shop) || {};
               scheduleModule = this.core.getModule('appointmentBooking_schedule');
-              needScheduleIds = (this.store.surchargeList || []).map(function (item) {
+              needScheduleIds = (_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.map(function (item) {
                 return item.available_schedule_ids;
               }).flat();
               scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
@@ -208,9 +208,10 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSurchargeforUtils",
     value: function getSurchargeforUtils(items) {
+      var _this$store$surcharge2;
       // const surchargeList = this.store.surchargeList;
       var scheduleModule = this.core.getModule('appointmentBooking_schedule');
-      var needScheduleIds = (this.store.surchargeList || []).map(function (item) {
+      var needScheduleIds = (_this$store$surcharge2 = this.store.surchargeList) === null || _this$store$surcharge2 === void 0 ? void 0 : _this$store$surcharge2.map(function (item) {
         return item.available_schedule_ids;
       }).flat();
       var scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);

package/dist/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;
+}