@pisell/pisellos 0.0.207 → 0.0.209

package/lib/modules/Product/index.js

@@ -26,14 +26,13 @@ module.exports = __toCommonJS(Product_exports);
 var import_BaseModule = require("../BaseModule");
 __reExport(Product_exports, require("./types"), module.exports);
 var Product = class extends import_BaseModule.BaseModule {
-  defaultName = "product";
-  defaultVersion = "1.0.0";
-  store;
-  otherParams = {
-    scheduler: []
-  };
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "product";
+    this.defaultVersion = "1.0.0";
+    this.otherParams = {
+      scheduler: []
+    };
   }
   async initialize(core, options) {
     this.core = core;

package/lib/modules/ProductList/index.js

@@ -29,12 +29,10 @@ var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
 var ProductList = class extends import_BaseModule.BaseModule {
-  defaultName = "productList";
-  defaultVersion = "1.0.0";
-  store;
-  request;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "productList";
+    this.defaultVersion = "1.0.0";
   }
   async initialize(core, options) {
     var _a;
@@ -142,7 +140,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
       this.store.list
     );
     const product = this.store.productMap.get(`${id}`);
-    if (product) return product;
+    if (product)
+      return product;
     return void 0;
   }
   async addProduct(products) {

package/lib/modules/Resource/index.js

@@ -25,11 +25,10 @@ module.exports = __toCommonJS(Resource_exports);
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var ResourceListModule = class extends import_BaseModule.BaseModule {
-  defaultName = "resourceList";
-  defaultVersion = "1.0.0";
-  store;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "resourceList";
+    this.defaultVersion = "1.0.0";
   }
   async initialize(core, options) {
     this.core = core;
@@ -40,7 +39,8 @@ var ResourceListModule = class extends import_BaseModule.BaseModule {
   }
   async selectResource(resourceId) {
     const resource = this.store.list.find((r) => r.id === resourceId);
-    if (!resource) return;
+    if (!resource)
+      return;
     this.store.selectedResource = resource;
     await this.core.effects.emit(import_types.ResourceHooks.OnResourceSelect, resource);
   }
@@ -49,19 +49,22 @@ var ResourceListModule = class extends import_BaseModule.BaseModule {
   }
   async checkAvailability(resourceId, start, end) {
     const resource = this.store.list.find((r) => r.id === resourceId);
-    if (!resource) return false;
+    if (!resource)
+      return false;
     return resource.timeSlots.some(
       (slot) => slot.start.getTime() <= start.getTime() && slot.end.getTime() >= end.getTime() && slot.availableCapacity > 0
     );
   }
   async getAvailableTimeSlots(resourceId) {
     const resource = this.store.list.find((r) => r.id === resourceId);
-    if (!resource) return [];
+    if (!resource)
+      return [];
     return resource.timeSlots.filter((slot) => slot.availableCapacity > 0);
   }
   getAvailableCapacity(resourceId, timeSlot) {
     const resource = this.store.list.find((r) => r.id === resourceId);
-    if (!resource) return 0;
+    if (!resource)
+      return 0;
     const slot = resource.timeSlots.find(
       (s) => s.start.getTime() === timeSlot.start.getTime() && s.end.getTime() === timeSlot.end.getTime()
     );
@@ -69,7 +72,8 @@ var ResourceListModule = class extends import_BaseModule.BaseModule {
   }
   async updateResource(resourceId, updates) {
     const index = this.store.list.findIndex((r) => r.id === resourceId);
-    if (index === -1) return;
+    if (index === -1)
+      return;
     this.store.list[index] = {
       ...this.store.list[index],
       ...updates

package/lib/modules/Rules/index.js

@@ -38,12 +38,10 @@ var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var RulesModule = class extends import_BaseModule.BaseModule {
-  defaultName = "rules";
-  defaultVersion = "1.0.0";
-  store;
-  hooks;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "rules";
+    this.defaultVersion = "1.0.0";
     this.hooks = {};
   }
   async initialize(core, options) {
@@ -133,8 +131,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return !discount.isManualSelect;
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
-      if (a.tag === "good_pass" && b.tag !== "good_pass") return -1;
-      if (b.tag === "good_pass" && a.tag !== "good_pass") return 1;
+      if (a.tag === "good_pass" && b.tag !== "good_pass")
+        return -1;
+      if (b.tag === "good_pass" && a.tag !== "good_pass")
+        return 1;
       if (a.tag === "good_pass" && b.tag === "good_pass") {
         return compareByExpireTime(a, b);
       } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
@@ -215,13 +215,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a2;
-        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass") return false;
+        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+          return false;
         if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
-        })) && (discount.tag || discount.type) !== "good_pass") return false;
+        })) && (discount.tag || discount.type) !== "good_pass")
+          return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
-        if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass") return false;
+        if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
+          return false;
         const limitedData = discount.limited_relation_product_data;
         if (limitedData.type === "product_all") {
           return true;
@@ -299,12 +302,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         let productOriginTotal = product.origin_total || product.total || 0;
-        if (Number(((_g = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _g.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
-          productOriginTotal = product.total;
-        }
-        if (((_h = product.discount_list) == null ? void 0 : _h.length) && product.origin_total) {
+        if (((_g = product.discount_list) == null ? void 0 : _g.length) && product.origin_total) {
           productOriginTotal = product.origin_total;
         }
+        if (Number(((_h = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _h.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          productOriginTotal = product.total;
+        }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
@@ -450,7 +453,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   async destroy() {
     this.core.effects.offByModuleDestroy(this.name);
     await this.core.effects.emit(import_types.RulesHooks.OnDestroy, {});
-    console.log("[Rules] \u5DF2\u9500\u6BC1");
+    console.log("[Rules] 已销毁");
   }
   async clear() {
     console.log("[Rules] clear");

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

@@ -24,7 +24,7 @@ export interface RulesModuleAPI {
         productList: any[];
     }) => DiscountResult;
 }
-declare type ProductDetail = {
+type ProductDetail = {
     isClient?: boolean;
     isManualDiscount?: boolean;
     booking_id: any;

package/lib/modules/Schedule/index.js

@@ -41,22 +41,19 @@ var import_utils = require("../Date/utils");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
 var ScheduleModule = class extends import_BaseModule.BaseModule {
-  defaultName = "schedule";
-  defaultVersion = "1.0.0";
-  request;
-  store = {};
-  cacheId;
-  openCache = false;
-  fatherModule;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "schedule";
+    this.defaultVersion = "1.0.0";
+    this.store = {};
+    this.openCache = false;
   }
   async initialize(core, options) {
     var _a, _b;
     this.core = core;
     this.request = core.getPlugin("request");
     if (!this.request) {
-      throw new Error("ScheduleModule \u9700\u8981 request \u63D2\u4EF6\u652F\u6301");
+      throw new Error("ScheduleModule 需要 request 插件支持");
     }
     this.store = options == null ? void 0 : options.store;
     if (options.initialState) {

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

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

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

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

package/lib/modules/Schedule/utils.js

@@ -343,7 +343,8 @@ var calcCalendarDataByTimeSlots = (values, others, isGetRange) => {
     time_slot
   } = values;
   const { endRadio, excludedStatus, includeStatus } = others;
-  if (!start_time) return [];
+  if (!start_time)
+    return [];
   const start = (0, import_dayjs.default)(start_time);
   const end = (0, import_dayjs.default)(start_time);
   return processDateRange(
@@ -577,7 +578,8 @@ function getAllSortedDateRanges(schedules) {
   }
   let sortedDateRanges = allDateRanges.sort((a, b) => {
     const startTimeCompare = (0, import_dayjs.default)(a.start).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
-    if (startTimeCompare !== 0) return startTimeCompare;
+    if (startTimeCompare !== 0)
+      return startTimeCompare;
     const durationA = (0, import_dayjs.default)(a.end).valueOf() - (0, import_dayjs.default)(a.start).valueOf();
     const durationB = (0, import_dayjs.default)(b.end).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
     return durationA - durationB;

package/lib/modules/Step/index.js

@@ -24,14 +24,11 @@ __export(Step_exports, {
 module.exports = __toCommonJS(Step_exports);
 var import_BaseModule = require("../BaseModule");
 var StepModule = class extends import_BaseModule.BaseModule {
-  defaultName = "step";
-  defaultVersion = "1.0.0";
-  store;
-  cacheId;
-  openCache = false;
-  fatherModule;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "step";
+    this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
     var _a, _b;
@@ -116,7 +113,7 @@ var StepModule = class extends import_BaseModule.BaseModule {
     let stepList = this.store.stepList;
     const index = stepList.findIndex((n) => n.key === step.key);
     if (index !== -1) {
-      console.log("[StepModule] \u6B65\u9AA4\u5DF2\u5B58\u5728\uFF0C\u6DFB\u52A0\u5931\u8D25");
+      console.log("[StepModule] 步骤已存在，添加失败");
       return;
     }
     if (key) {

package/lib/modules/Summary/index.js

@@ -25,16 +25,11 @@ module.exports = __toCommonJS(Summary_exports);
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var SummaryModule = class extends import_BaseModule.BaseModule {
-  defaultName = "summary";
-  defaultVersion = "1.0.0";
-  shopStore;
-  store;
-  request;
-  cacheId;
-  openCache = false;
-  fatherModule;
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "summary";
+    this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
     var _a, _b;
@@ -53,7 +48,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
       this.fatherModule = options.otherParams.fatherModule;
     }
     if (!this.shopStore) {
-      throw new Error("SummaryModule \u9700\u8981 shopStore \u63D2\u4EF6\u652F\u6301");
+      throw new Error("SummaryModule 需要 shopStore 插件支持");
     }
   }
   async getSummary(cartItems) {

package/lib/plugins/request.js

@@ -24,9 +24,6 @@ __export(request_exports, {
 });
 module.exports = __toCommonJS(request_exports);
 var RequestError = class extends Error {
-  response;
-  request;
-  config;
   constructor(message, config, request, response) {
     super(message);
     this.name = "RequestError";
@@ -36,36 +33,38 @@ var RequestError = class extends Error {
   }
 };
 var RequestPluginImpl = class {
-  name = "request";
-  version = "1.0.0";
-  core = null;
-  /**
-   * 默认请求选项
-   */
-  defaultOptions = {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json"
-    },
-    timeout: 3e4,
-    responseType: "json"
-  };
-  /**
-   * 全局拦截器
-   */
-  interceptors = {
-    request: [],
-    response: [],
-    error: []
-  };
+  constructor() {
+    this.name = "request";
+    this.version = "1.0.0";
+    this.core = null;
+    /**
+     * 默认请求选项
+     */
+    this.defaultOptions = {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      timeout: 3e4,
+      responseType: "json"
+    };
+    /**
+     * 全局拦截器
+     */
+    this.interceptors = {
+      request: [],
+      response: [],
+      error: []
+    };
+  }
   // 初始化方法
   initialize() {
     this.core = globalThis.pisellOS;
-    console.log("[RequestPlugin] \u521D\u59CB\u5316\u5B8C\u6210");
+    console.log("[RequestPlugin] 初始化完成");
   }
   // 销毁方法
   destroy() {
-    console.log("[RequestPlugin] \u5DF2\u9500\u6BC1");
+    console.log("[RequestPlugin] 已销毁");
   }
   /**
    * 添加请求拦截器
@@ -150,7 +149,7 @@ var RequestPluginImpl = class {
         config = await Promise.resolve(interceptor(config));
       } catch (error) {
         const requestError = error instanceof RequestError ? error : new RequestError(
-          error instanceof Error ? error.message : "\u8BF7\u6C42\u62E6\u622A\u5668\u9519\u8BEF",
+          error instanceof Error ? error.message : "请求拦截器错误",
           config
         );
         let processedError = requestError;
@@ -175,7 +174,7 @@ var RequestPluginImpl = class {
           );
         } catch (error) {
           const requestError = error instanceof RequestError ? error : new RequestError(
-            error instanceof Error ? error.message : "\u54CD\u5E94\u62E6\u622A\u5668\u9519\u8BEF",
+            error instanceof Error ? error.message : "响应拦截器错误",
             config,
             null,
             response
@@ -195,7 +194,7 @@ var RequestPluginImpl = class {
       return processedResponse.data;
     } catch (error) {
       const requestError = error instanceof RequestError ? error : new RequestError(
-        error instanceof Error ? error.message : "\u8BF7\u6C42\u9519\u8BEF",
+        error instanceof Error ? error.message : "请求错误",
         config
       );
       let processedError = requestError;
@@ -226,7 +225,7 @@ var RequestPluginImpl = class {
       withCredentials
     } = config;
     if (!url) {
-      throw new RequestError("URL\u4E0D\u80FD\u4E3A\u7A7A", config);
+      throw new RequestError("URL不能为空", config);
     }
     let fullUrl = url;
     if (params && Object.keys(params).length > 0) {
@@ -256,13 +255,13 @@ var RequestPluginImpl = class {
     const timeoutPromise = new Promise((_, reject) => {
       if (timeout) {
         timeoutId = setTimeout(() => {
-          reject(new RequestError(`\u8BF7\u6C42\u8D85\u65F6: ${timeout}ms`, config));
+          reject(new RequestError(`请求超时: ${timeout}ms`, config));
         }, timeout);
       }
     });
     try {
       const fetchPromise = typeof fetch !== "undefined" ? fetch(fullUrl, fetchOptions) : Promise.reject(
-        new RequestError("\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301 fetch API", config)
+        new RequestError("当前环境不支持 fetch API", config)
       );
       const response = await Promise.race([fetchPromise, timeoutPromise]);
       const responseHeaders = {};
@@ -298,7 +297,7 @@ var RequestPluginImpl = class {
       };
       if (!response.ok) {
         throw new RequestError(
-          `\u8BF7\u6C42\u5931\u8D25\uFF0C\u72B6\u6001\u7801: ${response.status}`,
+          `请求失败，状态码: ${response.status}`,
           config,
           fetchOptions,
           result