@pisell/pisellos 0.0.411 → 0.0.413

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -919,8 +919,9 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
               mainQuantity: mainQuantity // 主商品的mainQuantity等于自己的quantity
             });
           }
+          var arr = (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || [];
           // 遍历子商品 原价商品符合附加费条件
-          var _iterator6 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
+          var _iterator6 = _createForOfIteratorHelper(arr),
             _step6;
           try {
             for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -1169,7 +1170,8 @@ function resetItemsSurchargeSideEffects(_ref12) {
       for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
         var item = _step10.value;
         resetItem(item);
-        var _iterator11 = _createForOfIteratorHelper((item === null || item === void 0 ? void 0 : item.bundle) || []),
+        var arr = (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || [];
+        var _iterator11 = _createForOfIteratorHelper(arr),
           _step11;
         try {
           for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -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/dist/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -559,7 +559,8 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             // 主商品的mainQuantity等于自己的quantity
           });
         }
-        for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
+        const arr = (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || [];
+        for (let bundleItem of arr) {
           if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
@@ -735,7 +736,8 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
   if (Array.isArray(service)) {
     for (let item of service) {
       resetItem(item);
-      for (let bundleItem of (item == null ? void 0 : item.bundle) || [])
+      const arr = (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || [];
+      for (let bundleItem of arr)
         resetItem(bundleItem);
       for (let relationDetail of (item == null ? void 0 : item.relation_details) || [])
         resetItem(relationDetail);

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -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/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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