@pisell/pisellos 0.0.412 → 0.0.414

package/dist/modules/Rules/index.js

@@ -675,7 +675,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2;
+          var _flatItem$parentProdu2, _product$price, _ref5, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -701,10 +701,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 对于 bundle 子商品，quantity 需要乘以主商品的购买数量
           var quantity = flatItem.type === 'main' ? product.quantity || 1 : (product.num || 1) * (((_flatItem$parentProdu2 = flatItem.parentProduct) === null || _flatItem$parentProdu2 === void 0 ? void 0 : _flatItem$parentProdu2.quantity) || 1);
 
+          // 对于主商品：使用 price
+          // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
+          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref5 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+
           // 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
           var productData = {
             productId: flatItem._id,
-            amount: Number(product.price || 0),
+            amount: originalAmount,
             quantity: quantity
           };
 
@@ -947,8 +951,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis5, _product11, _product11$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref5;
-            return !((_ref5 = item.discount_list || []) !== null && _ref5 !== void 0 && _ref5.length);
+            var _ref6;
+            return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
           }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
@@ -958,8 +962,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (parentProduct) {
             var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref6;
-              return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
+              var _ref7;
+              return !((_ref7 = item.discount_list || []) !== null && _ref7 !== void 0 && _ref7.length);
             }) && (!((_parentProduct$discou = parentProduct.discount_list) !== null && _parentProduct$discou !== void 0 && _parentProduct$discou.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou2 = parentProduct.discount_list) === null || _parentProduct$discou2 === void 0 || (_parentProduct$discou3 = _parentProduct$discou2.every) === null || _parentProduct$discou3 === void 0 ? void 0 : _parentProduct$discou3.call(_parentProduct$discou2, function (item) {
               return item.type === 'product';
             })));

package/dist/modules/Summary/utils.js

@@ -1024,12 +1024,12 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
     var productCount = matchedItems.reduce(function (total, item) {
       if (item.isMain) {
         // 主商品和addons商品
-        return total + (item.num || 1);
+        return total + (item.num || item.quantity || 1);
       } else {
         // 子商品（bundle item）和加时商品
         // 加时商品的 mainQuantity = 1，所以不受影响
         // bundle item 的 mainQuantity = 主商品数量，需要乘以实际数量
-        return total + (item.num || 1) * (item.mainQuantity || 1);
+        return total + (item.num || item.quantity || 1) * (item.mainQuantity || 1);
       }
     }, 0);
 

package/dist/solution/BookingByStep/index.d.ts

@@ -357,7 +357,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/Rules/index.js

@@ -487,9 +487,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           };
         }
         const quantity = flatItem.type === "main" ? product.quantity || 1 : (product.num || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.quantity) || 1);
+        const originalAmount = flatItem.type === "main" ? Number(product.price ?? 0) : Number(flatItem.original_price ?? flatItem.price ?? 0);
         const productData = {
           productId: flatItem._id,
-          amount: Number(product.price || 0),
+          amount: originalAmount,
           quantity
         };
         if (flatItem.type === "bundle") {

package/lib/modules/Summary/utils.js

@@ -634,9 +634,9 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
     let finalAmount = 0;
     const productCount = matchedItems.reduce((total, item) => {
       if (item.isMain) {
-        return total + (item.num || 1);
+        return total + (item.num || item.quantity || 1);
       } else {
-        return total + (item.num || 1) * (item.mainQuantity || 1);
+        return total + (item.num || item.quantity || 1) * (item.mainQuantity || 1);
       }
     }, 0);
     let fixedTotal = new import_decimal.default(0);

package/lib/solution/BookingByStep/index.d.ts

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