@pisell/pisellos 2.2.129 → 2.2.130

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

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

package/dist/solution/Sales/index.js

@@ -267,7 +267,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (slotCount <= 0) return [];
       var diff = new Int32Array(slotCount + 1);
       for (var i = 0; i < bookingList.length; i++) {
+        var _ref2, _booking$appointment_;
         var booking = bookingList[i];
+        var appointmentStatus = String((_ref2 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref2 !== void 0 ? _ref2 : '');
+        if (appointmentStatus === 'new' || appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') continue;
         var bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
         var bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
         if (!bookingStartAt.isValid() || !bookingEndAt.isValid()) continue;
@@ -336,8 +339,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourceId",
     value: function getResourceId(resource) {
-      var _ref2, _resource$id;
-      return (_ref2 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : '';
+      var _ref3, _resource$id;
+      return (_ref3 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref3 !== void 0 ? _ref3 : '';
     }
 
     /**
@@ -454,8 +457,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeMatchedBooking",
     value: function normalizeMatchedBooking(current, deviceCurrent, booking) {
-      var _ref3, _booking$appointment_;
-      var appointmentStatus = String((_ref3 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref3 !== void 0 ? _ref3 : '');
+      var _ref4, _booking$appointment_2;
+      var appointmentStatus = String((_ref4 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref4 !== void 0 ? _ref4 : '');
       if (appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') return null;
       var startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

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

package/lib/solution/Sales/index.js

@@ -166,6 +166,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const diff = new Int32Array(slotCount + 1);
     for (let i = 0; i < bookingList.length; i++) {
       const booking = bookingList[i];
+      const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
+      if (appointmentStatus === "new" || appointmentStatus === "rejected" || appointmentStatus === "cancelled")
+        continue;
       const bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       const bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
       if (!bookingStartAt.isValid() || !bookingEndAt.isValid())

package/package.json

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