@pisell/pisellos 2.1.133 → 2.1.134

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

@@ -19,7 +19,7 @@ interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
     package_scope?: {
-        type: 'all_packages' | 'specific_packages';
+        type: 'all_packages' | 'specific_packages' | 'product_all' | 'products';
         exclude_bundle_product_ids: number[];
         include_bundle_product_ids: number[];
         filter: 0 | 1;

package/dist/modules/Order/utils.js

@@ -202,7 +202,7 @@ export function createDefaultOrderRulesHooks() {
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
         metadata: _objectSpread(_objectSpread({}, metadataAny), {}, {
-          source_product_price: nextSourceSellingPrice,
+          source_product_price: nextSourceOriginalPrice,
           main_product_selling_price: nextMainSellingPrice,
           main_product_original_price: nextMainOriginalPrice,
           price_schema_version: 2

package/dist/modules/Rules/index.js

@@ -1882,8 +1882,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 套餐适用范围校验
             var isScopeValid = false;
 
-            // 排除套餐判断
-            if (scopeType === 'all_packages') {
+            // 排除套餐判断, product_all值兼容旧数据
+            if (scopeType === 'all_packages' || scopeType === 'product_all') {
               // 所有套餐可用
               if (!filter) {
                 isScopeValid = true;
@@ -1892,8 +1892,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }
             }
 
-            // 包含套餐判断
-            if (scopeType === 'specific_packages') {
+            // 包含套餐判断, products值兼容旧数据
+            if (scopeType === 'specific_packages' || scopeType === 'products') {
               isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 

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

@@ -19,7 +19,7 @@ interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
     package_scope?: {
-        type: 'all_packages' | 'specific_packages';
+        type: 'all_packages' | 'specific_packages' | 'product_all' | 'products';
         exclude_bundle_product_ids: number[];
         include_bundle_product_ids: number[];
         filter: 0 | 1;

package/lib/modules/Order/utils.js

@@ -166,7 +166,7 @@ function createDefaultOrderRulesHooks() {
         product_bundle: nextBundle,
         metadata: {
           ...metadataAny,
-          source_product_price: nextSourceSellingPrice,
+          source_product_price: nextSourceOriginalPrice,
           main_product_selling_price: nextMainSellingPrice,
           main_product_original_price: nextMainOriginalPrice,
           price_schema_version: 2

package/lib/modules/Rules/index.js

@@ -1421,14 +1421,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const _isMarkupPrice = isMarkupPrice && rules.includes("markup_price");
           const isPriceValid = _isOriginalPrice || _isMarkupPrice;
           let isScopeValid = false;
-          if (scopeType === "all_packages") {
+          if (scopeType === "all_packages" || scopeType === "product_all") {
             if (!filter) {
               isScopeValid = true;
             } else {
               isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
-          if (scopeType === "specific_packages") {
+          if (scopeType === "specific_packages" || scopeType === "products") {
             isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
           if (isPriceValid && isScopeValid) {

package/package.json

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