@pisell/pisellos 0.0.324 → 0.0.326

package/lib/modules/Payment/utils.js

@@ -46,9 +46,12 @@ var sortUserIdentificationCodeList = (list) => {
       var _a;
       const errorCode = (_a = item.unified_error_code) == null ? void 0 : _a.toString();
       const availableStatus = item.unified_available_status;
-      if (errorCode && middlePriorityErrorCodes.includes(errorCode)) return 2;
-      if (availableStatus === 0) return 3;
-      if (availableStatus === 1) return 1;
+      if (errorCode && middlePriorityErrorCodes.includes(errorCode))
+        return 2;
+      if (availableStatus === 0)
+        return 3;
+      if (availableStatus === 1)
+        return 1;
       return 0;
     };
     const aPriority = getPriority(a);

package/lib/modules/Payment/walletpass.js

@@ -27,20 +27,22 @@ var import_utils = require("./utils");
 var WalletPassPaymentImpl = class {
   constructor(paymentModule) {
     this.paymentModule = paymentModule;
+    this.walletRecommendList = [];
+    this.userIdentificationCodes = [];
+    this.searchResults = [];
+    this.walletParams = null;
   }
-  walletRecommendList = [];
-  userIdentificationCodes = [];
-  searchResults = [];
-  walletParams = null;
   /**
    * 发送事件的辅助方法
    * 支持使用WalletPassHooks或PaymentHooks
    */
   emitEvent(hook, data) {
     try {
-      this.paymentModule.core.effects.emit(hook, data);
+      const eventName = hook.split(":")[1] || hook.replace(/^[A-Z][a-z]+/, "").replace(/^On/, "").toLowerCase();
+      const fullEventName = `${this.paymentModule.name}:${eventName}`;
+      this.paymentModule.core.effects.emit(fullEventName, data);
     } catch (error) {
-      this.paymentModule.logError("[WalletPass] \u53D1\u9001\u4E8B\u4EF6\u5931\u8D25", error, { hook });
+      this.paymentModule.logError("[WalletPass] 发送事件失败", error, { hook });
     }
   }
   /**
@@ -67,7 +69,7 @@ var WalletPassPaymentImpl = class {
       payment_order_id
     };
     this.walletParams = walletParams;
-    this.paymentModule.logInfo("[WalletPass] \u94B1\u5305\u9ED8\u8BA4\u53C2\u6570\u5DF2\u751F\u6210\u5E76\u5B58\u50A8", {
+    this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
       customer_id: walletParams.customer_id,
       order_expect_amount: walletParams.order_expect_amount,
       order_product_amount: walletParams.order_product_amount,
@@ -89,7 +91,7 @@ var WalletPassPaymentImpl = class {
    */
   clearStoredWalletParams() {
     this.walletParams = null;
-    this.paymentModule.logInfo("[WalletPass] \u5DF2\u5B58\u50A8\u7684\u94B1\u5305\u53C2\u6570\u5DF2\u6E05\u7406");
+    this.paymentModule.logInfo("[WalletPass] 已存储的钱包参数已清理");
   }
   /**
    * 从业务数据初始化钱包数据
@@ -109,7 +111,7 @@ var WalletPassPaymentImpl = class {
       businessData,
       startTime
     });
-    this.paymentModule.logInfo("[WalletPass] \u5F00\u59CB\u4ECE\u4E1A\u52A1\u6570\u636E\u521D\u59CB\u5316\u94B1\u5305\u6570\u636E", {
+    this.paymentModule.logInfo("[WalletPass] 开始从业务数据初始化钱包数据", {
       customer_id: businessData.customer_id,
       totalAmount: (_c = businessData.amountInfo) == null ? void 0 : _c.totalAmount,
       subTotal: (_d = businessData.amountInfo) == null ? void 0 : _d.subTotal,
@@ -127,7 +129,7 @@ var WalletPassPaymentImpl = class {
         endTime,
         duration
       });
-      this.paymentModule.logInfo(`[WalletPass] \u4ECE\u4E1A\u52A1\u6570\u636E\u521D\u59CB\u5316\u94B1\u5305\u6570\u636E\u6210\u529F`, {
+      this.paymentModule.logInfo(`[WalletPass] 从业务数据初始化钱包数据成功`, {
         duration: `${duration}ms`,
         walletRecommendList_count: ((_f = result.walletRecommendList) == null ? void 0 : _f.length) || 0,
         userIdentificationCodes_count: ((_g = result.userIdentificationCodes) == null ? void 0 : _g.length) || 0
@@ -143,7 +145,7 @@ var WalletPassPaymentImpl = class {
         endTime,
         duration
       });
-      this.paymentModule.logError(`[WalletPass] \u4ECE\u4E1A\u52A1\u6570\u636E\u521D\u59CB\u5316\u94B1\u5305\u6570\u636E\u5931\u8D25`, error, {
+      this.paymentModule.logError(`[WalletPass] 从业务数据初始化钱包数据失败`, error, {
         duration: `${duration}ms`,
         customer_id: businessData.customer_id,
         totalAmount: (_h = businessData.amountInfo) == null ? void 0 : _h.totalAmount
@@ -171,7 +173,7 @@ var WalletPassPaymentImpl = class {
         userIdentificationCodes
       };
     } catch (error) {
-      this.paymentModule.logError("[WalletPass] \u521D\u59CB\u5316\u94B1\u5305\u6570\u636E\u5931\u8D25", error, {
+      this.paymentModule.logError("[WalletPass] 初始化钱包数据失败", error, {
         customer_id: baseParams.customer_id,
         order_expect_amount: baseParams.order_expect_amount
       });
@@ -181,7 +183,7 @@ var WalletPassPaymentImpl = class {
   async getWalletPassRecommendListAsync(params) {
     var _a;
     try {
-      this.paymentModule.logInfo("[WalletPass] \u5F00\u59CB\u83B7\u53D6\u94B1\u5305\u63A8\u8350\u5217\u8868", {
+      this.paymentModule.logInfo("[WalletPass] 开始获取钱包推荐列表", {
         customer_id: params.customer_id,
         order_expect_amount: params.order_expect_amount,
         sale_channel: params.sale_channel,
@@ -196,7 +198,7 @@ var WalletPassPaymentImpl = class {
       this.emitEvent(import_types.WalletPassHooks.OnWalletRecommendListUpdated, {
         walletRecommendList: this.walletRecommendList
       });
-      this.paymentModule.logInfo("[WalletPass] \u94B1\u5305\u63A8\u8350\u5217\u8868\u5DF2\u66F4\u65B0", {
+      this.paymentModule.logInfo("[WalletPass] 钱包推荐列表已更新", {
         count: this.walletRecommendList.length,
         items: this.walletRecommendList.map((item) => ({
           voucher_id: item.voucher_id,
@@ -207,7 +209,7 @@ var WalletPassPaymentImpl = class {
       });
       return this.walletRecommendList;
     } catch (error) {
-      this.paymentModule.logError("[WalletPass] \u83B7\u53D6\u94B1\u5305\u63A8\u8350\u5217\u8868\u5931\u8D25", error, {
+      this.paymentModule.logError("[WalletPass] 获取钱包推荐列表失败", error, {
         customer_id: params.customer_id,
         order_expect_amount: params.order_expect_amount,
         sale_channel: params.sale_channel
@@ -225,7 +227,7 @@ var WalletPassPaymentImpl = class {
         ...this.walletParams,
         ...params
       };
-      this.paymentModule.logInfo("[WalletPass] \u5F00\u59CB\u83B7\u53D6\u7528\u6237\u8BC6\u522B\u7801\u5217\u8868", {
+      this.paymentModule.logInfo("[WalletPass] 开始获取用户识别码列表", {
         customer_id: newParams.customer_id,
         available: newParams.available,
         prepare_payments_count: ((_a = newParams.prepare_payments) == null ? void 0 : _a.length) || 0,
@@ -241,7 +243,7 @@ var WalletPassPaymentImpl = class {
       this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
         userIdentificationCodes: this.userIdentificationCodes
       });
-      this.paymentModule.logInfo("[WalletPass] \u7528\u6237\u8BC6\u522B\u7801\u5217\u8868\u5DF2\u66F4\u65B0", {
+      this.paymentModule.logInfo("[WalletPass] 用户识别码列表已更新", {
         count: this.userIdentificationCodes.length,
         sorted_items: this.userIdentificationCodes.slice(0, 5).map((item) => ({
           code: item.code,
@@ -251,7 +253,7 @@ var WalletPassPaymentImpl = class {
       });
       return this.userIdentificationCodes;
     } catch (error) {
-      this.paymentModule.logError("[WalletPass] \u83B7\u53D6\u7528\u6237\u8BC6\u522B\u7801\u5217\u8868\u5931\u8D25", error, {
+      this.paymentModule.logError("[WalletPass] 获取用户识别码列表失败", error, {
         customer_id: params.customer_id,
         available: params.available
       });
@@ -267,7 +269,7 @@ var WalletPassPaymentImpl = class {
   async searchIdentificationCodeAsync(params, config = {}) {
     try {
       const { code } = params;
-      this.paymentModule.logInfo("[WalletPass] \u5F00\u59CB\u641C\u7D22\u8BC6\u522B\u7801", {
+      this.paymentModule.logInfo("[WalletPass] 开始搜索识别码", {
         code,
         code_length: code.length,
         noCache: config.noCache || false
@@ -279,7 +281,7 @@ var WalletPassPaymentImpl = class {
           with_customer: 1,
           with: ["wallet"]
         };
-        this.paymentModule.logInfo("[WalletPass] \u641C\u7D22\u94B1\u5305\u8BC6\u522B\u7801", {
+        this.paymentModule.logInfo("[WalletPass] 搜索钱包识别码", {
           code,
           with_customer: walletDetailParams.with_customer,
           with: walletDetailParams.with
@@ -289,7 +291,7 @@ var WalletPassPaymentImpl = class {
           walletDetailParams
         );
         const searchResults2 = (response2 == null ? void 0 : response2.data) || [];
-        this.paymentModule.logInfo("[WalletPass] \u94B1\u5305\u8BC6\u522B\u7801\u641C\u7D22\u5B8C\u6210", {
+        this.paymentModule.logInfo("[WalletPass] 钱包识别码搜索完成", {
           code,
           results_count: searchResults2.length,
           type: "walletCode"
@@ -315,7 +317,7 @@ var WalletPassPaymentImpl = class {
         code: params.code,
         payment_order_id: baseWalletParams == null ? void 0 : baseWalletParams.payment_order_id
       };
-      this.paymentModule.logInfo("[WalletPass] \u641C\u7D22\u666E\u901A\u8BC6\u522B\u7801", {
+      this.paymentModule.logInfo("[WalletPass] 搜索普通识别码", {
         code: searchParams.code,
         customer_id: searchParams.customer_id,
         order_expect_amount: searchParams.order_expect_amount,
@@ -348,7 +350,7 @@ var WalletPassPaymentImpl = class {
         cachedSearchResults: [...this.searchResults],
         searchParams: params
       });
-      this.paymentModule.logInfo("[WalletPass] \u666E\u901A\u8BC6\u522B\u7801\u641C\u7D22\u5B8C\u6210", {
+      this.paymentModule.logInfo("[WalletPass] 普通识别码搜索完成", {
         code: params.code,
         results_count: searchResults.length,
         cached_results_count: this.searchResults.length,
@@ -359,7 +361,7 @@ var WalletPassPaymentImpl = class {
         data: searchResults
       };
     } catch (error) {
-      this.paymentModule.logError("[WalletPass] \u641C\u7D22\u8BC6\u522B\u7801\u4FE1\u606F\u5931\u8D25", error, {
+      this.paymentModule.logError("[WalletPass] 搜索识别码信息失败", error, {
         code: params.code,
         customer_id: params.customer_id,
         order_expect_amount: params.order_expect_amount
@@ -368,19 +370,19 @@ var WalletPassPaymentImpl = class {
     }
   }
   async processWalletPayment(amount, orderUuid, voucherId) {
-    this.paymentModule.logInfo("[WalletPass] \u5F00\u59CB\u5904\u7406\u94B1\u5305\u652F\u4ED8", {
+    this.paymentModule.logInfo("[WalletPass] 开始处理钱包支付", {
       amount,
       orderUuid,
       voucherId: voucherId || "none"
     });
     const walletMethod = await this.paymentModule.getWalletPaymentMethod();
     if (!walletMethod) {
-      this.paymentModule.logError("[WalletPass] \u94B1\u5305\u652F\u4ED8\u65B9\u5F0F\u672A\u627E\u5230", null, {
+      this.paymentModule.logError("[WalletPass] 钱包支付方式未找到", null, {
         amount,
         orderUuid,
         voucherId
       });
-      throw new Error("\u94B1\u5305\u652F\u4ED8\u65B9\u5F0F\u672A\u627E\u5230");
+      throw new Error("钱包支付方式未找到");
     }
     const paymentItem = {
       amount: amount.toString(),
@@ -391,7 +393,7 @@ var WalletPassPaymentImpl = class {
       voucher_id: voucherId || ""
     };
     await this.paymentModule.addPaymentItemAsync(orderUuid, paymentItem);
-    this.paymentModule.logInfo("[WalletPass] \u94B1\u5305\u652F\u4ED8\u5904\u7406\u5B8C\u6210", {
+    this.paymentModule.logInfo("[WalletPass] 钱包支付处理完成", {
       amount,
       orderUuid,
       voucherId: voucherId || "none",
@@ -421,7 +423,7 @@ var WalletPassPaymentImpl = class {
     this.emitEvent(import_types.WalletPassHooks.OnWalletRecommendListCleared, {
       clearedTypes: ["walletRecommendList"]
     });
-    this.paymentModule.logInfo("[WalletPass] \u94B1\u5305\u63A8\u8350\u5217\u8868\u5DF2\u6E05\u9664");
+    this.paymentModule.logInfo("[WalletPass] 钱包推荐列表已清除");
   }
   /**
    * 清除用户识别码列表
@@ -431,7 +433,7 @@ var WalletPassPaymentImpl = class {
     this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesCleared, {
       clearedTypes: ["userIdentificationCodes"]
     });
-    this.paymentModule.logInfo("[WalletPass] \u7528\u6237\u8BC6\u522B\u7801\u5217\u8868\u5DF2\u6E05\u9664");
+    this.paymentModule.logInfo("[WalletPass] 用户识别码列表已清除");
   }
   /**
    * 获取缓存的搜索结果列表
@@ -450,7 +452,7 @@ var WalletPassPaymentImpl = class {
    */
   clearSearchResults() {
     this.searchResults = [];
-    this.paymentModule.logInfo("[WalletPass] \u641C\u7D22\u7ED3\u679C\u7F13\u5B58\u5DF2\u6E05\u9664");
+    this.paymentModule.logInfo("[WalletPass] 搜索结果缓存已清除");
   }
   /**
    * 清除所有缓存数据
@@ -463,7 +465,7 @@ var WalletPassPaymentImpl = class {
     this.emitEvent(import_types.WalletPassHooks.OnWalletCacheCleared, {
       clearedTypes: ["all"]
     });
-    this.paymentModule.logInfo("[WalletPass] \u6240\u6709\u7F13\u5B58\u6570\u636E\u5DF2\u6E05\u9664", {
+    this.paymentModule.logInfo("[WalletPass] 所有缓存数据已清除", {
       cleared_types: ["walletRecommendList", "userIdentificationCodes", "searchResults", "walletParams"]
     });
   }

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -24,17 +24,14 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
-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;
-  otherParams = {};
   constructor(name, version) {
     super(name, version);
+    this.defaultName = "productList";
+    this.defaultVersion = "1.0.0";
+    this.otherParams = {};
   }
   async initialize(core, options) {
     var _a;
@@ -129,14 +126,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
   }
   async getProducts() {
     await this.core.effects.emit(
-      import_types.ProductListHooks.onGetProducts,
+      `${this.name}:onGetProducts`,
       this.store.list
     );
     return (0, import_lodash_es.cloneDeep)(this.store.list);
   }
   async getProduct(id) {
     await this.core.effects.emit(
-      import_types.ProductListHooks.onGetProduct,
+      `${this.name}:onGetProduct`,
       this.store.list
     );
     const product = this.store.list.find((product2) => product2.id === id);

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,28 +39,32 @@ 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);
+    await this.core.effects.emit(`${this.name}:onResourceSelect`, resource);
   }
   getSelectedResource() {
     return this.store.selectedResource;
   }
   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

@@ -33,18 +33,15 @@ __export(Rules_exports, {
 });
 module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 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) {
@@ -54,7 +51,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async setRulesList(rulesList) {
     this.store.rulesList = rulesList;
-    await this.core.effects.emit(import_types.RulesHooks.OnRulesListChange, rulesList);
+    await this.core.effects.emit(`${this.name}:onRulesListChange`, rulesList);
   }
   getRulesList() {
     return this.store.rulesList;
@@ -135,15 +132,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
       var _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") {
         const typeA = ((_a = a.metadata) == null ? void 0 : _a.discount_card_type) || "percent";
         const typeB = ((_b = b.metadata) == null ? void 0 : _b.discount_card_type) || "percent";
-        if (typeA === "fixed_amount" && typeB === "percent") return -1;
-        if (typeA === "percent" && typeB === "fixed_amount") return 1;
+        if (typeA === "fixed_amount" && typeB === "percent")
+          return -1;
+        if (typeA === "percent" && typeB === "fixed_amount")
+          return 1;
         if (typeA === "fixed_amount" && typeB === "fixed_amount") {
           if (a.par_value !== b.par_value) {
             const valueA = new import_decimal.default(a.par_value || 0);
@@ -236,13 +237,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;
@@ -484,8 +488,8 @@ 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");
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
+    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

@@ -42,22 +42,19 @@ var import_utils2 = require("./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

@@ -346,7 +346,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(
@@ -580,7 +581,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;