@pisell/pisellos 2.1.58 → 2.1.59

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

@@ -111,6 +111,8 @@ export interface Discount {
         data: any[];
     };
     num?: number;
+    start_date?: string;
+    start_time?: string;
 }
 export interface DiscountState {
     discountList: Discount[];

package/dist/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/dist/solution/BookingByStep/index.d.ts

@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -115,7 +115,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/dist/solution/ShopDiscount/utils.js

@@ -442,10 +442,24 @@ export var filterDiscountListByBookingTime = function filterDiscountListByBookin
     return discountList;
   }
   return discountList.filter(function (discount) {
-    var _discount$metadata2, _discount$metadata3, _discount$custom_sche;
-    if (!(discount !== null && discount !== void 0 && (_discount$metadata2 = discount.metadata) !== null && _discount$metadata2 !== void 0 && _discount$metadata2.validity_type) || (discount === null || discount === void 0 || (_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.validity_type) === "fixed_validity") {
+    var _discount$metadata2;
+    if ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.validity_type) === "custom_schedule_validity") {
+      var _discount$custom_sche;
+      return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
+    }
+    try {
+      var isHasStart = !!discount.start_date && !!discount.start_time;
+      var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
+      var bookingTimeDayjs = dayjs(bookingTime);
+
+      // 判断预约时间是否在开始时间之后
+      var isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
+
+      // 判断预约时间是否在过期时间之前（expire_time 为空时为长期有效）
+      var isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore(dayjs(discount.expire_time)) : true;
+      return isAfterStart && isBeforeExpire;
+    } catch (error) {
       return true;
     }
-    return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
   });
 };

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

@@ -111,6 +111,8 @@ export interface Discount {
         data: any[];
     };
     num?: number;
+    start_date?: string;
+    start_time?: string;
 }
 export interface DiscountState {
     discountList: Discount[];

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/solution/BookingByStep/index.d.ts

@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -115,7 +115,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/BookingTicket/index.js

@@ -122,12 +122,6 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  /**
-   * 初始化外设扫码结果监听
-   */
-  initPeripheralsListener() {
-    this.scan.initPeripheralsListener();
-  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表

package/lib/solution/ShopDiscount/utils.js

@@ -290,11 +290,20 @@ var filterDiscountListByBookingTime = (discountList, bookingTime) => {
     return discountList;
   }
   return discountList.filter((discount) => {
-    var _a, _b, _c;
-    if (!((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.validity_type) || ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.validity_type) === "fixed_validity") {
+    var _a, _b;
+    if (((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.validity_type) === "custom_schedule_validity") {
+      return getDateIsInSchedule(bookingTime, ((_b = discount.custom_schedule_snapshot) == null ? void 0 : _b.data) || []);
+    }
+    try {
+      const isHasStart = !!discount.start_date && !!discount.start_time;
+      const startDate = (0, import_dayjs.default)(`${discount.start_date} ${discount.start_time}`);
+      const bookingTimeDayjs = (0, import_dayjs.default)(bookingTime);
+      const isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
+      const isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore((0, import_dayjs.default)(discount.expire_time)) : true;
+      return isAfterStart && isBeforeExpire;
+    } catch (error) {
       return true;
     }
-    return getDateIsInSchedule(bookingTime, ((_c = discount.custom_schedule_snapshot) == null ? void 0 : _c.data) || []);
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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