@pisell/pisellos 0.0.366 → 0.0.368

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/modules/Rules/index.js

@@ -107,12 +107,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _discount$holder;
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
-      // 卡券 holder 缺失视为不匹配
-      if (!discount.holder.holder_id) return false;
-
       // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
       var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
       var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+      // 父预约及商品都无holder, 则略过检查
+      if (!orderHolderId && !productHolderId) return true;
+
+      // 最终直接匹配 holder 是否相同
       return (productHolderId || orderHolderId) === discount.holder.holder_id;
     }
 
@@ -487,7 +488,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            holder_id: originProduct._extend.holder_id
+            holder_id: product.holder_id
           }, holders);
           var timeLimit = true;
           timeLimit = !!filterDiscountListByBookingTime([discount], (((_product = product) === null || _product === void 0 ? void 0 : _product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
@@ -615,7 +616,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            holder_id: originProduct._extend.holder_id
+            holder_id: product.holder_id
           }, holders);
           // 如果 holder 不匹配，则不适用
           if (!isHolderMatch) return false;

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

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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/modules/Rules/index.js

@@ -67,10 +67,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (((_a = discount.holder) == null ? void 0 : _a.holder_type) !== "form")
       return true;
-    if (!discount.holder.holder_id)
-      return false;
     const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : void 0;
     const productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
+    if (!orderHolderId && !productHolderId)
+      return true;
     return (productHolderId || orderHolderId) === discount.holder.holder_id;
   }
   // 判断discountList 是否可以对当前productList生效
@@ -336,7 +336,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       addModeDiscount.forEach((discount) => {
         var _a, _b, _c, _d, _e, _f, _g;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
-        const isHolderMatch = this.checkHolderMatch(discount, { holder_id: originProduct._extend.holder_id }, holders);
+        const isHolderMatch = this.checkHolderMatch(discount, { holder_id: product.holder_id }, holders);
         let timeLimit = true;
         timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
         const isLimitedProduct = (limitedData.type === "product_all" && limitedData.filter !== 1 || limitedData.type === "product_all" && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
@@ -443,7 +443,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (!timeLimit) {
           return false;
         }
-        const isHolderMatch = this.checkHolderMatch(discount, { holder_id: originProduct._extend.holder_id }, holders);
+        const isHolderMatch = this.checkHolderMatch(discount, { holder_id: product.holder_id }, holders);
         if (!isHolderMatch)
           return false;
         if (limitedData.type === "product_all") {

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

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

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

package/package.json

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