@pisell/pisellos 0.0.357 → 0.0.359

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

@@ -17,10 +17,7 @@ interface Formattitle {
 }
 interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
-    custom_usage_rules: {
-        types: ("standalone_product" | "package_sub_item")[];
-        package_sub_item_rules: ("original_price" | "markup_price")[];
-    };
+    rules: ("original_price" | "markup_price")[];
 }
 interface Limitedrelationproductdata {
     id: number;

package/dist/modules/Rules/index.js

@@ -1290,6 +1290,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
+      var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
 
       // 如果没有配置 package_sub_item_usage_rules，则默认可用
       if (!usageRules) {
@@ -1314,8 +1315,33 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 套餐中购买时，判断是否为原价
           var priceType = (_flatItem$bundleItem5 = flatItem.bundleItem) === null || _flatItem$bundleItem5 === void 0 ? void 0 : _flatItem$bundleItem5.price_type;
           var priceTypeExt = (_flatItem$bundleItem6 = flatItem.bundleItem) === null || _flatItem$bundleItem6 === void 0 ? void 0 : _flatItem$bundleItem6.price_type_ext;
+          // original_price 对应：
+          // 1. price_type: "markup" && price_type_ext: "product_price"
+          // markup_price 对应：
+          // price_type: "markup" && price_type_ext: ""
+          /** 原价 */
+          var isOriginalPrice = priceType === 'markup' && priceTypeExt === 'product_price';
+          /** 加价 */
+          var isMarkupPrice = priceType === 'markup' && (priceTypeExt === '' || !priceTypeExt);
+
+          // 检查 rules
+          if (rules.length > 0) {
+            // 检查原价
+            if (isOriginalPrice && rules.includes('original_price')) {
+              return true;
+            }
+
+            // 检查加价
+            if (isMarkupPrice && rules.includes('markup_price')) {
+              return true;
+            }
+
+            // 如果都不匹配，则不可用
+            return false;
+          }
+
           // 原价包括：price_type: "markup" && price_type_ext: "product_price"
-          return priceType === 'markup' && priceTypeExt === 'product_price';
+          return isOriginalPrice;
         }
         return true;
       }
@@ -1341,16 +1367,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return isMainProduct; // 只有单独购买时可用
       }
 
+      /*
       // custom_usage_rules: 根据自定义规则判断
       if (ruleType === 'custom_usage_rules') {
-        var customRules = usageRules.custom_usage_rules;
-        if (!customRules) {
+        const customRules = usageRules.custom_usage_rules;
+         if (!customRules) {
           return true; // 如果没有自定义规则，默认可用
         }
-        var types = customRules.types,
-          package_sub_item_rules = customRules.package_sub_item_rules;
-
-        // 判断商品类型是否在允许的类型中
+         const { types, package_sub_item_rules } = customRules;
+         // 判断商品类型是否在允许的类型中
         if (isMainProduct) {
           // 主商品对应 standalone_product
           if (!types.includes('standalone_product')) {
@@ -1358,40 +1383,36 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return true; // 主商品不需要判断 package_sub_item_rules
         }
-        if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10;
+         if (isBundleItem) {
           // bundle子商品对应 package_sub_item
           if (!types.includes('package_sub_item')) {
             return false;
           }
-
-          // 如果包含 package_sub_item，还需要判断 price_type
-          var _priceType2 = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
-          var _priceTypeExt2 = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
-
-          // 检查 package_sub_item_rules
+           // 如果包含 package_sub_item，还需要判断 price_type
+          const priceType = flatItem.bundleItem?.price_type;
+          const priceTypeExt = flatItem.bundleItem?.price_type_ext;
+           // 检查 package_sub_item_rules
           if (package_sub_item_rules && package_sub_item_rules.length > 0) {
             // original_price 对应：
             // 1. price_type: "markup" && price_type_ext: "product_price"
             // markup_price 对应：
             // price_type: "markup" && price_type_ext: ""
-
-            var isOriginalPrice = _priceType2 === 'markup' && _priceTypeExt2 === 'product_price';
-            var isMarkupPrice = _priceType2 === 'markup' && (_priceTypeExt2 === '' || !_priceTypeExt2);
-            if (isOriginalPrice && package_sub_item_rules.includes('original_price')) {
+             const isOriginalPrice = (priceType === 'markup' && priceTypeExt === 'product_price');
+            const isMarkupPrice = priceType === 'markup' && (priceTypeExt === '' || !priceTypeExt);
+             if (isOriginalPrice && package_sub_item_rules.includes('original_price')) {
               return true;
             }
-            if (isMarkupPrice && package_sub_item_rules.includes('markup_price')) {
+             if (isMarkupPrice && package_sub_item_rules.includes('markup_price')) {
               return true;
             }
-
-            // 如果都不匹配，则不可用
+             // 如果都不匹配，则不可用
             return false;
           }
-          return true; // 如果没有 package_sub_item_rules 配置，默认可用
+           return true; // 如果没有 package_sub_item_rules 配置，默认可用
         }
-        return true;
+         return true;
       }
+      * */
 
       // 默认可用
       return true;

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<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -17,10 +17,7 @@ interface Formattitle {
 }
 interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
-    custom_usage_rules: {
-        types: ("standalone_product" | "package_sub_item")[];
-        package_sub_item_rules: ("original_price" | "markup_price")[];
-    };
+    rules: ("original_price" | "markup_price")[];
 }
 interface Limitedrelationproductdata {
     id: number;

package/lib/modules/Rules/index.js

@@ -994,9 +994,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
    * @returns 是否可用
    */
   checkPackageSubItemUsageRules(discount, flatItem) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     const limitedData = discount.limited_relation_product_data;
     const usageRules = limitedData == null ? void 0 : limitedData.package_sub_item_usage_rules;
+    const rules = ["original_price", ...(usageRules == null ? void 0 : usageRules.rules) || []];
     if (!usageRules) {
       return true;
     }
@@ -1013,7 +1014,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isBundleItem) {
         const priceType = (_a = flatItem.bundleItem) == null ? void 0 : _a.price_type;
         const priceTypeExt = (_b = flatItem.bundleItem) == null ? void 0 : _b.price_type_ext;
-        return priceType === "markup" && priceTypeExt === "product_price";
+        const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
+        const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
+        if (rules.length > 0) {
+          if (isOriginalPrice && rules.includes("original_price")) {
+            return true;
+          }
+          if (isMarkupPrice && rules.includes("markup_price")) {
+            return true;
+          }
+          return false;
+        }
+        return isOriginalPrice;
       }
       return true;
     }
@@ -1031,39 +1043,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     if (ruleType === "single_item_promo") {
       return isMainProduct;
     }
-    if (ruleType === "custom_usage_rules") {
-      const customRules = usageRules.custom_usage_rules;
-      if (!customRules) {
-        return true;
-      }
-      const { types, package_sub_item_rules } = customRules;
-      if (isMainProduct) {
-        if (!types.includes("standalone_product")) {
-          return false;
-        }
-        return true;
-      }
-      if (isBundleItem) {
-        if (!types.includes("package_sub_item")) {
-          return false;
-        }
-        const priceType = (_e = flatItem.bundleItem) == null ? void 0 : _e.price_type;
-        const priceTypeExt = (_f = flatItem.bundleItem) == null ? void 0 : _f.price_type_ext;
-        if (package_sub_item_rules && package_sub_item_rules.length > 0) {
-          const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
-          const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
-          if (isOriginalPrice && package_sub_item_rules.includes("original_price")) {
-            return true;
-          }
-          if (isMarkupPrice && package_sub_item_rules.includes("markup_price")) {
-            return true;
-          }
-          return false;
-        }
-        return true;
-      }
-      return true;
-    }
     return true;
   }
   async destroy() {

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<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/package.json

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