@pisell/pisellos 2.2.6 → 2.2.8

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

@@ -47,8 +47,9 @@ var formatDefaultCapacitys = ({
   if ((capacity == null ? void 0 : capacity.type) === "package") {
     return (product_bundle || []).map((d) => {
       const id = d.bundle_product_id;
+      const variantId = d.bundle_variant_id;
       const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id
+        (item2) => item2.product_id === id || item2.product_id === variantId
       );
       return {
         id,
@@ -68,12 +69,12 @@ var formatDefaultCapacitys = ({
   }
   return [{ id: 0, value: 1, name: "" }];
 };
-var getSumCapacity = ({ capacity }) => {
+var getSumCapacity = ({ capacity, num = 1 }) => {
   let sum = 0;
   for (let item of capacity || []) {
     sum += item.value;
   }
-  return sum;
+  return sum * num;
 };
 function getCapacityInfoByCartItem(targetCartItem) {
   var _a;
@@ -81,7 +82,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 });
+  const currentCapacity = getSumCapacity({ capacity: formatCapacity, num: (targetCartItem == null ? void 0 : targetCartItem.num) || 1 });
   return {
     formatCapacity,
     currentCapacity
@@ -194,7 +195,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       );
       if (needsThisResourceType) {
         if (selectType === "single") {
-          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem == null ? void 0 : cartItem.num) || 1);
         } else {
           requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
         }
@@ -238,7 +239,11 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 多个预约检查: 总容量 ${totalAvailableCapacity}, 需求 ${requiredCapacity}`);
       if (totalAvailableCapacity < requiredCapacity) {
         console.log(`资源类型 ${formId} 容量不足: 需要 ${requiredCapacity}, 可用 ${totalAvailableCapacity}`);
-        return false;
+        return {
+          success: false,
+          required: requiredCapacity,
+          available: totalAvailableCapacity
+        };
       }
     } else {
       let availableResourceCount = 0;
@@ -253,11 +258,19 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 单个预约检查: 可用资源数 ${availableResourceCount}, 需求 ${requiredCapacity}`);
       if (availableResourceCount < requiredCapacity) {
         console.log(`资源类型 ${formId} 数量不足: 需要 ${requiredCapacity}, 可用 ${availableResourceCount}`);
-        return false;
+        return {
+          success: false,
+          required: requiredCapacity,
+          available: availableResourceCount
+        };
       }
     }
   }
-  return true;
+  return {
+    success: true,
+    required: 0,
+    available: 0
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -0,0 +1,87 @@
+/**
+ * 注册登录解决方案配置
+ * 根据不同渠道配置不同的接口地址和参数
+ */
+/**
+ * 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;