@pisell/pisellos 2.2.117 → 2.2.119

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -106,8 +106,7 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
                 this.logger = app.logger;
               }
               this.initResourceDataSource();
-              this.setupResourceSync();
-            case 8:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -150,38 +149,41 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.loadResourcesFromSQLite();
+              return this.setupResourceSync();
             case 2:
+              _context2.next = 4;
+              return this.loadResourcesFromSQLite();
+            case 4:
               cachedResources = _context2.sent;
               if (!(cachedResources.length > 0)) {
-                _context2.next = 10;
+                _context2.next = 12;
                 break;
               }
               this.store.list = cloneDeep(cachedResources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 8;
+              _context2.next = 10;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
-            case 8:
-              _context2.next = 18;
-              break;
             case 10:
-              _context2.next = 12;
-              return this.loadResourcesByServer();
+              _context2.next = 20;
+              break;
             case 12:
+              _context2.next = 14;
+              return this.loadResourcesByServer();
+            case 14:
               resources = _context2.sent;
               if (!(resources.length > 0)) {
-                _context2.next = 18;
+                _context2.next = 20;
                 break;
               }
               this.store.list = cloneDeep(resources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 18;
+              _context2.next = 20;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
-            case 18:
+            case 20:
             case "end":
               return _context2.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;
@@ -599,9 +598,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 title: 'getResourceBookingList',
                 metadata: {
                   currentTime: currentTime,
-                  bookingList: bookingList,
+                  bookingList: bookingList === null || bookingList === void 0 ? void 0 : bookingList.length,
                   deviceTime: deviceTime,
-                  list: list
+                  list: list === null || list === void 0 ? void 0 : list.length
                 }
               });
               return _context3.abrupt("return", list);

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

@@ -68,7 +68,6 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
       this.logger = app.logger;
     }
     this.initResourceDataSource();
-    this.setupResourceSync();
   }
   logInfo(title, metadata) {
     if (this.logger) {
@@ -89,6 +88,7 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
     }
   }
   async preload() {
+    await this.setupResourceSync();
     const cachedResources = await this.loadResourcesFromSQLite();
     if (cachedResources.length > 0) {
       this.store.list = (0, import_lodash_es.cloneDeep)(cachedResources).map((item) => this.normalizeResource(item));

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;
@@ -444,9 +444,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       title: "getResourceBookingList",
       metadata: {
         currentTime,
-        bookingList,
+        bookingList: bookingList == null ? void 0 : bookingList.length,
         deviceTime,
-        list
+        list: list == null ? void 0 : list.length
       }
     });
     return list;

package/package.json

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