@pisell/pisellos 2.1.41 → 2.2.2

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

@@ -68,12 +68,12 @@ var formatDefaultCapacitys = ({
   }
   return [{ id: 0, value: 1, name: "" }];
 };
-var getSumCapacity = ({ capacity, num = 1 }) => {
+var getSumCapacity = ({ capacity }) => {
   let sum = 0;
   for (let item of capacity || []) {
     sum += item.value;
   }
-  return sum * num;
+  return sum;
 };
 function getCapacityInfoByCartItem(targetCartItem) {
   var _a;
@@ -81,7 +81,7 @@ function getCapacityInfoByCartItem(targetCartItem) {
     capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
     product_bundle: targetCartItem._origin.product.product_bundle
   });
-  const currentCapacity = getSumCapacity({ capacity: formatCapacity, num: (targetCartItem == null ? void 0 : targetCartItem.num) || 1 });
+  const currentCapacity = getSumCapacity({ capacity: formatCapacity });
   return {
     formatCapacity,
     currentCapacity
@@ -194,7 +194,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       );
       if (needsThisResourceType) {
         if (selectType === "single") {
-          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem == null ? void 0 : cartItem.num) || 1);
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
         } else {
           requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
         }
@@ -238,18 +238,13 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 多个预约检查: 总容量 ${totalAvailableCapacity}, 需求 ${requiredCapacity}`);
       if (totalAvailableCapacity < requiredCapacity) {
         console.log(`资源类型 ${formId} 容量不足: 需要 ${requiredCapacity}, 可用 ${totalAvailableCapacity}`);
-        return {
-          success: false,
-          required: requiredCapacity,
-          available: totalAvailableCapacity
-        };
+        return false;
       }
     } else {
       let availableResourceCount = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          var _a2;
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && ((_a2 = time.event_list) == null ? void 0 : _a2.length) === 0;
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           availableResourceCount++;
@@ -258,19 +253,11 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 单个预约检查: 可用资源数 ${availableResourceCount}, 需求 ${requiredCapacity}`);
       if (availableResourceCount < requiredCapacity) {
         console.log(`资源类型 ${formId} 数量不足: 需要 ${requiredCapacity}, 可用 ${availableResourceCount}`);
-        return {
-          success: false,
-          required: requiredCapacity,
-          available: availableResourceCount
-        };
+        return false;
       }
     }
   }
-  return {
-    success: true,
-    required: 0,
-    available: 0
-  };
+  return true;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -31,6 +31,14 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * @returns 商品列表
      */
     getProducts(): Promise<ProductData[]>;
+    /**
+     * 获取日程时间段点
+     * @param params 参数
+     * @returns 日程时间段点
+     */
+    getScheduleTimePoints(params: {
+        menu_list_ids: number[];
+    }): Promise<any>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/solution/BookingTicket/index.js

@@ -135,6 +135,19 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async getProducts() {
     return this.store.products.getProducts();
   }
+  /**
+   * 获取日程时间段点
+   * @param params 参数
+   * @returns 日程时间段点
+   */
+  async getScheduleTimePoints(params) {
+    const result = await this.request.post("/menu/schedule-time-points", {
+      menu_list_ids: params.menu_list_ids
+    }, {
+      osServer: true
+    });
+    return result.data || [];
+  }
   /**
    * 获取客户列表
    * @param params 查询参数

package/lib/solution/ShopDiscount/index.js

@@ -233,15 +233,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isScan: true
         };
       });
-      const currentSelectedDiscountList = this.getDiscountList().filter((n) => n.isSelected);
-      if (currentSelectedDiscountList.length && currentSelectedDiscountList.some((n) => withScanList.some((m) => m.id === n.id))) {
-        return {
-          type: "clientCalc",
-          isAvailable: true,
-          productList: this.store.productList || [],
-          discountList: this.getDiscountList()
-        };
-      }
       const {
         productList: newProductList,
         discountList: newDiscountList,

package/lib/solution/index.d.ts

@@ -2,5 +2,4 @@ export * from './BuyTickets';
 export * from './BookingByStep';
 export * from './BookingTicket';
 export * from './ShopDiscount';
-export * from './RegisterAndLogin';
 export * from './Checkout';

package/lib/solution/index.js

@@ -20,7 +20,6 @@ __reExport(solution_exports, require("./BuyTickets"), module.exports);
 __reExport(solution_exports, require("./BookingByStep"), module.exports);
 __reExport(solution_exports, require("./BookingTicket"), module.exports);
 __reExport(solution_exports, require("./ShopDiscount"), module.exports);
-__reExport(solution_exports, require("./RegisterAndLogin"), module.exports);
 __reExport(solution_exports, require("./Checkout"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -28,6 +27,5 @@ __reExport(solution_exports, require("./Checkout"), module.exports);
   ...require("./BookingByStep"),
   ...require("./BookingTicket"),
   ...require("./ShopDiscount"),
-  ...require("./RegisterAndLogin"),
   ...require("./Checkout")
 });

package/lib/types/index.d.ts

@@ -75,6 +75,26 @@ export interface ModuleContextConfig {
     name: string;
     validations: ContextValidationRule[];
 }
+/**
+ * Server 模块配置
+ */
+export interface ServerModuleConfig {
+    /** 模块名称 */
+    name: string;
+    /** 是否自动预加载数据 */
+    preload?: boolean;
+    /** 模块配置参数 */
+    config?: Record<string, any>;
+}
+/**
+ * Server 配置选项
+ */
+export interface ServerOptions {
+    /** 要启用的模块列表 */
+    modules?: string[] | ServerModuleConfig[];
+    /** 是否自动初始化数据 */
+    autoInitData?: boolean;
+}
 export interface PisellOSOptions {
     debug?: boolean;
     plugins?: Array<{
@@ -86,4 +106,10 @@ export interface PisellOSOptions {
         options?: ModuleOptions;
     }>;
     context?: BusinessContext;
+    /** Server 配置 */
+    server?: ServerOptions;
+}
+export interface InitializeServerOptions {
+    onModuleLoad?: (module: string) => void;
+    onModuleLoadComplete?: (module: string) => void;
 }

package/package.json

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

package/dist/solution/RegisterAndLogin/config.d.ts

@@ -1,87 +0,0 @@
-/**
- * 注册登录解决方案配置
- * 根据不同渠道配置不同的接口地址和参数
- */
-/**
- * API 配置接口
- */
-export interface ApiConfig {
-    url: string;
-    method: 'GET' | 'POST' | 'PUT' | 'DELETE';
-    transformParams?: (params: any) => any;
-    transformResponse?: (response: any) => any;
-    options?: Record<string, any>;
-}
-/**
- * 渠道配置接口
- */
-export interface ChannelConfig {
-    sendEmailVerificationCode: ApiConfig;
-    sendEmailLoginCode: ApiConfig;
-    sendSmsRegisterCode: ApiConfig;
-    sendEmailRegisterLink: ApiConfig;
-    verifyEmailRegistrationLink: ApiConfig;
-    emailPasswordLogin: ApiConfig;
-    emailCodeRegister: ApiConfig;
-    phoneCodeRegister: ApiConfig;
-    resendEmailRegisterLink: ApiConfig;
-    checkEmailLinkCode: ApiConfig;
-    sendSmsLoginCode: ApiConfig;
-    phoneCodeLogin: ApiConfig;
-    guestLogin: ApiConfig;
-    checkEmailExists: ApiConfig;
-    checkEmailCode: ApiConfig;
-    checkMobileCode: ApiConfig;
-    phonePasswordLogin: ApiConfig;
-    sendPasswordResetEmail: ApiConfig;
-    sendPasswordResetSms: ApiConfig;
-    sendResetPasswordLink: ApiConfig;
-    checkResetPasswordCode: ApiConfig;
-    resetPasswordByCode: ApiConfig;
-    resetPasswordByEmail: ApiConfig;
-    resetPasswordByPhone: ApiConfig;
-    verifyCode: ApiConfig;
-    register: ApiConfig;
-    login: ApiConfig;
-    oauthLogin: ApiConfig;
-    validateToken: ApiConfig;
-    logout: ApiConfig;
-    getCountries: ApiConfig;
-    facebookLogin: ApiConfig;
-    appleLogin: ApiConfig;
-}
-/**
- * 渠道配置映射
- */
-export declare const channelConfigMap: Record<string, ChannelConfig>;
-/**
- * 获取渠道配置
- */
-export declare function getChannelConfig(channel: string): ChannelConfig;
-/**
- * API 调用器类
- * 负责根据配置执行 API 调用
- */
-export declare class ApiCaller {
-    private request;
-    private config;
-    constructor(request: {
-        get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
-        post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
-        put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
-        delete: <T = any>(url: string, options?: any) => Promise<T>;
-    }, config: ChannelConfig);
-    /**
-     * 执行 API 调用
-     */
-    call<T = any>(apiName: keyof ChannelConfig, params?: any, additionalOptions?: any): Promise<T>;
-}
-/**
- * 创建 API 调用器
- */
-export declare function createApiCaller(request: {
-    get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
-    post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
-    put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
-    delete: <T = any>(url: string, options?: any) => Promise<T>;
-}, channel: string): ApiCaller;