@pisell/pisellos 2.2.110 → 2.2.112

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

@@ -24,6 +24,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     protected options: ModuleOptions;
     protected otherParams: Record<string, any>;
     protected request: RequestPlugin;
+    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /** 获取当前 store 快照 */

package/dist/solution/Sales/index.js

@@ -43,6 +43,8 @@ export * from "./types";
 export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesImpl, _BaseModule);
   var _super = _createSuper(SalesImpl);
+  // LoggerManager 实例
+
   function SalesImpl(name, version) {
     var _this;
     _classCallCheck(this, SalesImpl);
@@ -55,6 +57,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "options", {});
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
+    _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     return _this;
   }
   _createClass(SalesImpl, [{
@@ -87,9 +90,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
               // TODO(Rolo): 等领导提供 reservationList 的目标结构后，
               // 在这里补充从 Server/Order 读取 currentDay 原始数据并转换为预约列表。
-              _context.next = 11;
+
+              this.logger = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp().logger;
+              _context.next = 12;
               return this.core.effects.emit("".concat(this.name, ":onInited"), {});
-            case 11:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -510,6 +515,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           resourceList,
           normalizedBookings,
           bookingMap,
+          list,
           _args3 = arguments;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -555,6 +561,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return _this3.normalizeMatchedBooking(current, deviceCurrent, booking);
               }).filter(function (booking) {
                 return Boolean(booking);
+              }).filter(function (booking) {
+                return !booking.status;
               }).sort(function (left, right) {
                 var leftStartAt = _this3.toBookingDateTime(left.start_date, left.start_time).valueOf();
                 var rightStartAt = _this3.toBookingDateTime(right.start_date, right.start_time).valueOf();
@@ -574,7 +582,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
-              return _context3.abrupt("return", resourceList.map(function (resource) {
+              list = resourceList.map(function (resource) {
                 var resourceId = _this3.getResourceId(resource);
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
                 var bookings = _this3.pickBookingsForCurrentPoint(current, matchedBookings);
@@ -582,8 +590,15 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_id: resourceId,
                   bookings: bookings
                 });
-              }));
-            case 18:
+              });
+              this.logger.info('getResourceBookingList', {
+                currentTime: currentTime,
+                bookingList: bookingList,
+                deviceTime: deviceTime,
+                list: list
+              });
+              return _context3.abrupt("return", list);
+            case 20:
             case "end":
               return _context3.stop();
           }

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

@@ -24,6 +24,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     protected options: ModuleOptions;
     protected otherParams: Record<string, any>;
     protected request: RequestPlugin;
+    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /** 获取当前 store 快照 */

package/lib/solution/Sales/index.js

@@ -40,6 +40,7 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 __reExport(Sales_exports, require("./types"), module.exports);
 var SalesImpl = class extends import_BaseModule.BaseModule {
+  // LoggerManager 实例
   constructor(name, version) {
     super(name, version);
     this.defaultName = "sales";
@@ -62,6 +63,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       currentDay: (0, import_dayjs.default)().startOf("day"),
       reservationList: []
     };
+    this.logger = appPlugin == null ? void 0 : appPlugin.getApp().logger;
     await this.core.effects.emit(`${this.name}:onInited`, {});
   }
   // -------------------------------------------------------------------------
@@ -407,7 +409,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const resourceList = ((_a = resourceResponse == null ? void 0 : resourceResponse.data) == null ? void 0 : _a.list) ?? [];
     if (!Array.isArray(resourceList) || resourceList.length === 0)
       return [];
-    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, deviceCurrent, booking)).filter((booking) => Boolean(booking)).sort((left, right) => {
+    const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, deviceCurrent, booking)).filter((booking) => Boolean(booking)).filter((booking) => !booking.status).sort((left, right) => {
       const leftStartAt = this.toBookingDateTime(left.start_date, left.start_time).valueOf();
       const rightStartAt = this.toBookingDateTime(right.start_date, right.start_time).valueOf();
       return leftStartAt - rightStartAt;
@@ -421,12 +423,12 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
         if (relationId === void 0 || relationId === null)
           return;
         const key = String(relationId);
-        const list = bookingMap.get(key) || [];
-        list.push(booking);
-        bookingMap.set(key, list);
+        const list2 = bookingMap.get(key) || [];
+        list2.push(booking);
+        bookingMap.set(key, list2);
       });
     });
-    return resourceList.map((resource) => {
+    const list = resourceList.map((resource) => {
       const resourceId = this.getResourceId(resource);
       const matchedBookings = bookingMap.get(String(resourceId)) || [];
       const bookings = this.pickBookingsForCurrentPoint(current, matchedBookings);
@@ -436,6 +438,13 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
         bookings
       };
     });
+    this.logger.info("getResourceBookingList", {
+      currentTime,
+      bookingList,
+      deviceTime,
+      list
+    });
+    return list;
   }
 };
 var Sales_default = SalesImpl;

package/package.json

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