@pisell/pisellos 2.2.95 → 2.2.96

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

@@ -54,7 +54,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "orderDataSource", void 0);
     _defineProperty(_assertThisInitialized(_this), "pendingSyncMessages", []);
     _defineProperty(_assertThisInitialized(_this), "syncTimer", void 0);
-    _defineProperty(_assertThisInitialized(_this), "ORDER_SYNC_DEBOUNCE_MS", 10000);
+    _defineProperty(_assertThisInitialized(_this), "ORDER_SYNC_DEBOUNCE_MS", 5000);
     // Map<resource_id, OrderId[]> 资源到订单的倒排索引
     _defineProperty(_assertThisInitialized(_this), "resourceIdIndex", new Map());
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);

package/dist/solution/Sales/index.js

@@ -450,11 +450,14 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       }();
       var reservedStatus;
       var lateTime;
-      if (bookingStatus === 'reserved' && startAt.isValid() && endAt.isValid()) {
-        if (current.isBefore(startAt)) reservedStatus = 'not_arrived';
-        if (current.isAfter(endAt)) {
+      var remainingReserveTime;
+      if (bookingStatus === 'reserved' && startAt.isValid()) {
+        if (current.isBefore(startAt)) {
+          reservedStatus = 'not_arrived';
+          remainingReserveTime = startAt.diff(current, 'minute');
+        } else {
           reservedStatus = 'late';
-          lateTime = current.diff(startAt, 'minute');
+          lateTime = Math.max(current.diff(startAt, 'minute'), 0);
         }
       }
       return _objectSpread(_objectSpread({}, booking), {}, {
@@ -463,7 +466,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         timeoutTime: timeoutTime,
         progressPercent: progressPercent,
         lateTime: lateTime,
-        reserved_status: reservedStatus
+        reserved_status: reservedStatus,
+        remainingReserveTime: remainingReserveTime
       });
     }
   }, {

package/dist/solution/Sales/types.d.ts

@@ -24,6 +24,7 @@ export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'>
     timeoutTime?: number;
     progressPercent?: number;
     lateTime?: number;
+    remainingReserveTime?: number;
     reserved_status: SalesReservedStatus;
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {

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

@@ -44,7 +44,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.defaultName = "order";
     this.defaultVersion = "1.0.0";
     this.pendingSyncMessages = [];
-    this.ORDER_SYNC_DEBOUNCE_MS = 1e4;
+    this.ORDER_SYNC_DEBOUNCE_MS = 5e3;
     // Map<resource_id, OrderId[]> 资源到订单的倒排索引
     this.resourceIdIndex = /* @__PURE__ */ new Map();
   }

package/lib/solution/Sales/index.js

@@ -341,12 +341,14 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     })();
     let reservedStatus;
     let lateTime;
-    if (bookingStatus === "reserved" && startAt.isValid() && endAt.isValid()) {
-      if (current.isBefore(startAt))
+    let remainingReserveTime;
+    if (bookingStatus === "reserved" && startAt.isValid()) {
+      if (current.isBefore(startAt)) {
         reservedStatus = "not_arrived";
-      if (current.isAfter(endAt)) {
+        remainingReserveTime = startAt.diff(current, "minute");
+      } else {
         reservedStatus = "late";
-        lateTime = current.diff(startAt, "minute");
+        lateTime = Math.max(current.diff(startAt, "minute"), 0);
       }
     }
     return {
@@ -356,7 +358,8 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       timeoutTime,
       progressPercent,
       lateTime,
-      reserved_status: reservedStatus
+      reserved_status: reservedStatus,
+      remainingReserveTime
     };
   }
   async getResourceBookingList(currentTime, bookingList = []) {

package/lib/solution/Sales/types.d.ts

@@ -24,6 +24,7 @@ export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'>
     timeoutTime?: number;
     progressPercent?: number;
     lateTime?: number;
+    remainingReserveTime?: number;
     reserved_status: SalesReservedStatus;
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {

package/package.json

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