@pisell/pisellos 2.1.89 → 2.1.91

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

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

package/dist/solution/BookingByStep/index.js

@@ -1818,7 +1818,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 timeSlots: timeSlots,
                 currentCapacity: totalCapacity + (capacity || 0)
               });
-              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
+              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime && n.capacity >= (capacity || 0)) {
                 targetResource = n;
                 targetResourceTime = currentResourceIdleTime;
                 return 1; // break
@@ -2213,6 +2213,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 计算容量的辅助函数
       var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
         var _items$0$_resourceOri;
+        if (items.length === 0) return 0;
         // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
         var firstResource = (_items$0$_resourceOri = items[0]._resourceOrigin) === null || _items$0$_resourceOri === void 0 ? void 0 : _items$0$_resourceOri[0].id;
         var sameResourceLength = items.filter(function (item) {
@@ -2387,6 +2388,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 计算容量的辅助函数
               calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
                 var _items$0$_resourceOri2;
+                if (items.length === 0) return 0;
                 // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
                 var firstResource = (_items$0$_resourceOri2 = items[0]._resourceOrigin) === null || _items$0$_resourceOri2 === void 0 ? void 0 : _items$0$_resourceOri2[0].id;
                 var sameResourceLength = items.filter(function (item) {

package/dist/solution/BookingByStep/utils/resources.js

@@ -349,7 +349,8 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
           return dayjs(current.end_at).isAfter(dayjs(latest.end_at)) ? current : latest;
         }, d.times[0]);
         // TODO,在这拉时间切片出来，如果可用 timeSlots.length > 1 才可以被选择
-        return dayjs(latestTime.end_at).isAfter(dayjs());
+        // 当前资源的配置容量需要大于当前需求的 capacity
+        return dayjs(latestTime.end_at).isAfter(dayjs()) && d.capacity >= capacity;
       });
       item.form_id = form_id;
       acc.push(item);

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

@@ -1153,8 +1153,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                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()
+                total: new import_decimal.default(newTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber(),
+                origin_total: new import_decimal.default(newOriginTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber()
               })
             );
             if (mainProductQuantity > 1) {
@@ -1204,8 +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();
+              newTotalOriginal = new import_decimal.default(newTotalOriginal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+              newOriginTotalOriginal = new import_decimal.default(newOriginTotalOriginal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,
@@ -1289,8 +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();
+              newTotal = new import_decimal.default(newTotal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+              newOriginTotal = new import_decimal.default(newOriginTotal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,

package/lib/solution/BookingByStep/index.js

@@ -1181,7 +1181,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           timeSlots,
           currentCapacity: totalCapacity + (capacity || 0)
         });
-        if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
+        if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime && n.capacity >= (capacity || 0)) {
           targetResource = n;
           targetResourceTime = currentResourceIdleTime;
           break;
@@ -1533,6 +1533,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const calculateCapacityFromCartItems = (items) => {
       var _a2;
+      if (items.length === 0)
+        return 0;
       const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
       const sameResourceLength = items.filter((item) => {
         var _a3;
@@ -1666,6 +1668,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const calculateCapacityFromCartItems = (items) => {
       var _a2;
+      if (items.length === 0)
+        return 0;
       const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
       const sameResourceLength = items.filter((item) => {
         var _a3;

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

@@ -298,7 +298,7 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
         const latestTime = d.times.reduce((latest, current) => {
           return (0, import_dayjs.default)(current.end_at).isAfter((0, import_dayjs.default)(latest.end_at)) ? current : latest;
         }, d.times[0]);
-        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)());
+        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)()) && d.capacity >= capacity;
       });
       item.form_id = form_id;
       acc.push(item);

package/package.json

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