@pisell/pisellos 2.1.87 → 2.1.89

package/dist/modules/Rules/index.js

@@ -1533,8 +1533,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                total: newTotalWithDiscount,
-                origin_total: newOriginTotalWithDiscount
+                total: new Decimal(newTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber(),
+                origin_total: new Decimal(newOriginTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber()
               })));
 
               // 第二个：包含原始bundle (qty=原quantity-1)
@@ -1596,6 +1596,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     return accumulator.add(currentPrice.mul(currentNum));
                   }, new Decimal(newTotalOriginal)).toNumber();
                 }
+                newTotalOriginal = new Decimal(newTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+                newOriginTotalOriginal = new Decimal(newOriginTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
 
                 // 添加第二个主商品：qty=原quantity-1，包含原始bundle
                 result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
@@ -1700,6 +1702,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     return accumulator.add(currentPrice.mul(currentNum));
                   }, new Decimal(newTotal)).toNumber();
                 }
+                newTotal = new Decimal(newTotal).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
+                newOriginTotal = new Decimal(newOriginTotal).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
 
                 // 生成最终的主商品
                 result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {

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

@@ -310,7 +310,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 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingByStep/index.js

@@ -2881,12 +2881,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           currentStats.left += 1;
           if (currentResourceTypeConfig.type === 'multiple') {
             currentStats.summaryCount += currentResourceMaxRemainingCapacity;
-            if (currentResourceMaxRemainingCapacity > currentStats.count) currentStats.count = currentResourceMaxRemainingCapacity;
-          } else {
-            // 单个预约：一个资源只计 1，不关心剩余容量
-            currentStats.summaryCount += 1;
-            if (currentStats.count < 1) currentStats.count = 1;
           }
+          if (currentResourceMaxRemainingCapacity > currentStats.count) currentStats.count = currentResourceMaxRemainingCapacity;
+          // else {
+          // 单个预约：一个资源只计 1，不关心剩余容量
+          // currentStats.summaryCount += 1;
+          // if (currentStats.count < 1) currentStats.count = 1;
+          //}
+
           statsByResourceType[m.form_id] = currentStats;
         });
         // 容量检测

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

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

@@ -1153,8 +1153,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                total: newTotalWithDiscount,
-                origin_total: newOriginTotalWithDiscount
+                total: new import_decimal.default(newTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber(),
+                origin_total: new import_decimal.default(newOriginTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber()
               })
             );
             if (mainProductQuantity > 1) {
@@ -1204,6 +1204,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   return accumulator.add(currentPrice.mul(currentNum));
                 }, new import_decimal.default(newTotalOriginal)).toNumber();
               }
+              newTotalOriginal = new import_decimal.default(newTotalOriginal).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+              newOriginTotalOriginal = new import_decimal.default(newOriginTotalOriginal).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,
@@ -1287,6 +1289,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   return accumulator.add(currentPrice.mul(currentNum));
                 }, new import_decimal.default(newTotal)).toNumber();
               }
+              newTotal = new import_decimal.default(newTotal).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
+              newOriginTotal = new import_decimal.default(newOriginTotal).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,

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

@@ -310,7 +310,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 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -2034,13 +2034,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         currentStats.left += 1;
         if (currentResourceTypeConfig.type === "multiple") {
           currentStats.summaryCount += currentResourceMaxRemainingCapacity;
-          if (currentResourceMaxRemainingCapacity > currentStats.count)
-            currentStats.count = currentResourceMaxRemainingCapacity;
-        } else {
-          currentStats.summaryCount += 1;
-          if (currentStats.count < 1)
-            currentStats.count = 1;
         }
+        if (currentResourceMaxRemainingCapacity > currentStats.count)
+          currentStats.count = currentResourceMaxRemainingCapacity;
         statsByResourceType[m.form_id] = currentStats;
       });
       const cartItems2 = this.store.cart.getItems();

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

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