@pisell/pisellos 0.0.356 → 0.0.357

package/dist/modules/Rules/index.js

@@ -1299,6 +1299,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) {

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

@@ -1003,6 +1003,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     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;

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/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.357",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",