@pisell/pisellos 2.2.116 → 2.2.118

package/dist/server/index.js

@@ -370,6 +370,9 @@ var Server = /*#__PURE__*/function () {
                 skip: (data === null || data === void 0 ? void 0 : data.skip) || 1,
                 num: (data === null || data === void 0 ? void 0 : data.num) || 10
               });
+              _this.logInfo('Server 劫持 Resource 接口：handleResourceList: 资源列表查询结果', {
+                list: list
+              });
               return _context6.abrupt("return", {
                 code: 200,
                 data: {
@@ -379,7 +382,7 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 status: true
               });
-            case 4:
+            case 5:
             case "end":
               return _context6.stop();
           }

package/dist/server/modules/resource/index.js

@@ -763,13 +763,16 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
             case 4:
               result = _context8.sent;
               console.log('result', result);
+              this.logInfo('setupResourceSync: 资源列表查询结果', {
+                result: result
+              });
               if (!(result !== null && result !== void 0 && (_result$data = result.data) !== null && _result$data !== void 0 && (_result$data = _result$data.list) !== null && _result$data !== void 0 && _result$data.length)) {
-                _context8.next = 9;
+                _context8.next = 10;
                 break;
               }
-              _context8.next = 9;
+              _context8.next = 10;
               return this.mergeResourcesToStore(result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.list);
-            case 9:
+            case 10:
             case "end":
               return _context8.stop();
           }

package/dist/solution/Sales/index.js

@@ -471,9 +471,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           lateTime = Math.max(current.diff(startAt, 'minute'), 0);
         }
       }
-
       // 未来查询投影：查询时间晚于设备时间时，预留+迟到且 end_time 仍在查询时间之后的预约强制视为占用
-      if (current.isAfter(deviceCurrent) && bookingStatus === 'reserved' && reservedStatus === 'late' && endAt.isValid() && endAt.isAfter(current)) {
+      if (current.isAfter(deviceCurrent) && bookingStatus === 'reserved' && reservedStatus === 'late' && endAt.isValid() && endAt.isSameOrAfter(current)) {
         bookingStatus = 'occupied';
         reservedStatus = undefined;
         lateTime = undefined;

package/lib/server/index.js

@@ -254,6 +254,7 @@ var Server = class {
         skip: (data == null ? void 0 : data.skip) || 1,
         num: (data == null ? void 0 : data.num) || 10
       });
+      this.logInfo("Server 劫持 Resource 接口：handleResourceList: 资源列表查询结果", { list });
       return {
         code: 200,
         data: { list, count: (list == null ? void 0 : list.length) || 0 },

package/lib/server/modules/resource/index.js

@@ -440,6 +440,7 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
     }).catch(() => {
     });
     console.log("result", result);
+    this.logInfo("setupResourceSync: 资源列表查询结果", { result });
     if ((_b = (_a = result == null ? void 0 : result.data) == null ? void 0 : _a.list) == null ? void 0 : _b.length) {
       await this.mergeResourcesToStore((_c = result == null ? void 0 : result.data) == null ? void 0 : _c.list);
     }

package/lib/solution/Sales/index.js

@@ -360,7 +360,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
         lateTime = Math.max(current.diff(startAt, "minute"), 0);
       }
     }
-    if (current.isAfter(deviceCurrent) && bookingStatus === "reserved" && reservedStatus === "late" && endAt.isValid() && endAt.isAfter(current)) {
+    if (current.isAfter(deviceCurrent) && bookingStatus === "reserved" && reservedStatus === "late" && endAt.isValid() && endAt.isSameOrAfter(current)) {
       bookingStatus = "occupied";
       reservedStatus = void 0;
       lateTime = void 0;

package/package.json

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