@pisell/pisellos 0.0.356 → 0.0.358

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) {
@@ -1299,6 +1300,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
 
+      // 主商品直接可用
+      if (isMainProduct) {
+        return true;
+      }
+
       // universal_discount: 单独购买和套餐中（子商品为原价）均可使用
       if (ruleType === 'universal_discount') {
         if (isMainProduct) {
@@ -1325,8 +1331,34 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 套餐中购买时，判断是否为原价
           var _priceType = (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.price_type;
           var _priceTypeExt = (_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.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 false;
       }
@@ -1336,16 +1368,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')) {
@@ -1353,40 +1384,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/utils/capacity.js

@@ -24,8 +24,9 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
       var id = d.bundle_product_id;
+      var variantId = d.bundle_variant_id;
       var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id;
+        return item.product_id === id || item.product_id === variantId;
       });
       return {
         id: id,

package/dist/solution/Checkout/index.js

@@ -385,10 +385,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
       };
       var formatProduct = function formatProduct(items) {
         return items.map(function (item) {
+          var _item$is_charge_tax;
           return {
             product_id: item.product_id,
             product_variant_id: item.product_variant_id,
             quantity: item.num,
+            // 商品是否含税：1；0
+            is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
+            // 若商品不含税，计算得到的税费，单位（元）
+            tax_fee: item.tax_fee,
             // 整个商品折扣后的总金额
             selling_price: item.calculated_selling_price,
             // 整个商品折扣前的总金额

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,15 +994,19 @@ 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;
     }
     const ruleType = usageRules.type;
     const isMainProduct = flatItem.type === "main";
     const isBundleItem = flatItem.type === "bundle";
+    if (isMainProduct) {
+      return true;
+    }
     if (ruleType === "universal_discount") {
       if (isMainProduct) {
         return true;
@@ -1021,45 +1025,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isBundleItem) {
         const priceType = (_c = flatItem.bundleItem) == null ? void 0 : _c.price_type;
         const priceTypeExt = (_d = flatItem.bundleItem) == null ? void 0 : _d.price_type_ext;
-        return priceType === "markup" && priceTypeExt === "product_price";
-      }
-      return false;
-    }
-    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")) {
+        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 && package_sub_item_rules.includes("markup_price")) {
+          if (isMarkupPrice && rules.includes("markup_price")) {
             return true;
           }
           return false;
         }
-        return true;
+        return isOriginalPrice;
       }
-      return true;
+      return false;
+    }
+    if (ruleType === "single_item_promo") {
+      return isMainProduct;
     }
     return true;
   }

package/lib/solution/BookingByStep/utils/capacity.js

@@ -47,8 +47,9 @@ var formatDefaultCapacitys = ({
   if ((capacity == null ? void 0 : capacity.type) === "package") {
     return (product_bundle || []).map((d) => {
       const id = d.bundle_product_id;
+      const variantId = d.bundle_variant_id;
       const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id
+        (item2) => item2.product_id === id || item2.product_id === variantId
       );
       return {
         id,

package/lib/solution/Checkout/index.js

@@ -212,6 +212,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           product_id: item.product_id,
           product_variant_id: item.product_variant_id,
           quantity: item.num,
+          // 商品是否含税：1；0
+          is_charge_tax: item.is_charge_tax ?? 0,
+          // 若商品不含税，计算得到的税费，单位（元）
+          tax_fee: item.tax_fee,
           // 整个商品折扣后的总金额
           selling_price: item.calculated_selling_price,
           // 整个商品折扣前的总金额

package/package.json

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