@pisell/pisellos 3.0.43 → 3.0.44

package/dist/modules/Rules/index.js

@@ -441,7 +441,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             productOriginTotal = product.total;
           }
           // 如果当前 product 有 discount_list，则必须从 origin_total 拿
-          if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length) {
+          if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
 

package/dist/solution/BookingByStep/index.js

@@ -2167,12 +2167,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 value: 10
               };
               resource.startTime = timeSlots.start_at.format('YYYY-MM-DD HH:mm');
-              // 找到resource.times里最早的end_at
+              // 找到resource.times里最晚的end_at
               var targetResourceTimes = allResources === null || allResources === void 0 || (_allResources$find = allResources.find(function (n) {
                 return n.id === resource.id;
               })) === null || _allResources$find === void 0 ? void 0 : _allResources$find.times;
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
-                return dayjs(curr.end_at).isBefore(dayjs(acc.end_at)) ? curr : acc;
+                return dayjs(curr.end_at).isAfter(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
 
               // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间

package/lib/modules/Rules/index.js

@@ -301,7 +301,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (Number(((_g = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _g.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
           productOriginTotal = product.total;
         }
-        if ((_h = product.discount_list) == null ? void 0 : _h.length) {
+        if (((_h = product.discount_list) == null ? void 0 : _h.length) && product.origin_total) {
           productOriginTotal = product.origin_total;
         }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();

package/lib/solution/BookingByStep/index.js

@@ -1503,7 +1503,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             )) == null ? void 0 : _c.times;
             const resourcesEndTime = targetResourceTimes.reduce(
               (acc, curr) => {
-                return (0, import_dayjs.default)(curr.end_at).isBefore((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
+                return (0, import_dayjs.default)(curr.end_at).isAfter((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
               },
               targetResourceTimes[0]
             );

package/package.json

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