@pisell/pisellos 2.1.49 → 2.1.50

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

@@ -142,10 +142,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 遍历处理后的产品列表，检查是否有产品使用了新折扣
       result.productList.forEach(function (product) {
         var _this2$hooks$getProdu = _this2.hooks.getProduct(product),
-          discount_list = _this2$hooks$getProdu.discount_list;
-        if (discount_list && discount_list.length > 0) {
+          discount_list = _this2$hooks$getProdu.discount_list,
+          bundle = _this2$hooks$getProdu.bundle;
+        var allDiscountList = _toConsumableArray(discount_list || []);
+        (bundle || []).forEach(function (item) {
+          allDiscountList.push.apply(allDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+        });
+        if (allDiscountList && allDiscountList.length > 0) {
           // 检查是否有使用新折扣的情况
-          var usedNewDiscount = discount_list.some(function (discount) {
+          var usedNewDiscount = allDiscountList.some(function (discount) {
             var _discount$discount;
             return newDiscountIds.includes(discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id);
           });

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/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

@@ -95,9 +95,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     let hasApplicableDiscount = false;
     const newDiscountIds = newDiscountList.map((discount) => discount.id);
     result.productList.forEach((product) => {
-      const { discount_list } = this.hooks.getProduct(product);
-      if (discount_list && discount_list.length > 0) {
-        const usedNewDiscount = discount_list.some(
+      const { discount_list, bundle } = this.hooks.getProduct(product);
+      const allDiscountList = [...discount_list || []];
+      (bundle || []).forEach((item) => {
+        allDiscountList.push(...(item == null ? void 0 : item.discount_list) || []);
+      });
+      if (allDiscountList && allDiscountList.length > 0) {
+        const usedNewDiscount = allDiscountList.some(
           (discount) => {
             var _a;
             return newDiscountIds.includes((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id);

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/package.json

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