@pisell/pisellos 2.2.129 → 2.2.131

package/dist/core/index.js

@@ -45,6 +45,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log('initialize123');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

package/dist/server/index.js

@@ -2684,6 +2684,7 @@ var Server = /*#__PURE__*/function () {
             case 0:
               tTotal = performance.now();
               menu_list_ids = context.menu_list_ids, schedule_date = context.schedule_date, schedule_datetime = context.schedule_datetime;
+              debugger;
               this.logInfo('computeProductQueryResult 开始', {
                 menuListIdsCount: (_menu_list_ids$length3 = menu_list_ids === null || menu_list_ids === void 0 ? void 0 : menu_list_ids.length) !== null && _menu_list_ids$length3 !== void 0 ? _menu_list_ids$length3 : 0,
                 schedule_datetime: schedule_datetime,
@@ -2691,7 +2692,7 @@ var Server = /*#__PURE__*/function () {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
               if (this.products) {
-                _context24.next = 6;
+                _context24.next = 7;
                 break;
               }
               this.logError('computeProductQueryResult: Products 模块未注册');
@@ -2702,9 +2703,9 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 6:
+            case 7:
               if (this.menu) {
-                _context24.next = 9;
+                _context24.next = 10;
                 break;
               }
               this.logError('computeProductQueryResult: Menu 模块未注册');
@@ -2715,9 +2716,9 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 9:
+            case 10:
               if (this.schedule) {
-                _context24.next = 12;
+                _context24.next = 13;
                 break;
               }
               this.logError('computeProductQueryResult: Schedule 模块未注册');
@@ -2728,7 +2729,7 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 12:
+            case 13:
               activeMenuList = [];
               if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
                 tMenu = performance.now();
@@ -2743,13 +2744,13 @@ var Server = /*#__PURE__*/function () {
                 });
               }
               tPrice = performance.now();
-              _context24.next = 17;
+              _context24.next = 18;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule()
               }, {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
-            case 17:
+            case 18:
               allProductsWithPrice = _context24.sent;
               perfMark('computeQuery.getProductsWithPrice', performance.now() - tPrice, {
                 count: allProductsWithPrice.length
@@ -2797,7 +2798,7 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 status: true
               });
-            case 32:
+            case 33:
             case "end":
               return _context24.stop();
           }

package/dist/server/modules/order/types.d.ts

@@ -412,6 +412,7 @@ export type BookingData = OrderBookingItem & {
  * 订单列表筛选条件（与 order.ts getFilterButtonList 等 UI 对齐）
  */
 export interface OrderFilters {
+    keyword?: string;
     order_by?: string;
     sort?: 'desc' | 'asc';
     status?: string[];

package/dist/server/modules/order/utils/filterOrders.js

@@ -28,6 +28,12 @@ export function filterOrders(orders, filters) {
 
   // 1. 过滤
   var filteredList = orders.filter(function (order) {
+    if (safeFilters.keyword) {
+      if (!JSON.stringify(order).toLowerCase().includes(safeFilters.keyword.toLowerCase())) {
+        return false;
+      }
+    }
+
     // status - 订单状态
     if (safeFilters.status && safeFilters.status.length > 0) {
       if (!order.status || !safeFilters.status.includes(order.status)) {

package/dist/solution/Sales/index.js

@@ -267,7 +267,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (slotCount <= 0) return [];
       var diff = new Int32Array(slotCount + 1);
       for (var i = 0; i < bookingList.length; i++) {
+        var _ref2, _booking$appointment_;
         var booking = bookingList[i];
+        var appointmentStatus = String((_ref2 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref2 !== void 0 ? _ref2 : '');
+        if (appointmentStatus === 'new' || appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') continue;
         var bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
         var bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
         if (!bookingStartAt.isValid() || !bookingEndAt.isValid()) continue;
@@ -336,8 +339,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourceId",
     value: function getResourceId(resource) {
-      var _ref2, _resource$id;
-      return (_ref2 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : '';
+      var _ref3, _resource$id;
+      return (_ref3 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref3 !== void 0 ? _ref3 : '';
     }
 
     /**
@@ -454,8 +457,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeMatchedBooking",
     value: function normalizeMatchedBooking(current, deviceCurrent, booking) {
-      var _ref3, _booking$appointment_;
-      var appointmentStatus = String((_ref3 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref3 !== void 0 ? _ref3 : '');
+      var _ref4, _booking$appointment_2;
+      var appointmentStatus = String((_ref4 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref4 !== void 0 ? _ref4 : '');
       if (appointmentStatus === 'rejected' || appointmentStatus === 'cancelled') return null;
       var startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);

package/lib/core/index.js

@@ -50,6 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log("initialize123");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

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

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/server/index.js

@@ -1713,6 +1713,7 @@ var Server = class {
   async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
     const { menu_list_ids, schedule_date, schedule_datetime } = context;
+    debugger;
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       schedule_datetime,

package/lib/server/modules/order/types.d.ts

@@ -412,6 +412,7 @@ export type BookingData = OrderBookingItem & {
  * 订单列表筛选条件（与 order.ts getFilterButtonList 等 UI 对齐）
  */
 export interface OrderFilters {
+    keyword?: string;
     order_by?: string;
     sort?: 'desc' | 'asc';
     status?: string[];

package/lib/server/modules/order/utils/filterOrders.js

@@ -35,6 +35,11 @@ function filterOrders(orders, filters) {
   const size = safeFilters.num || 20;
   const page = safeFilters.skip || 1;
   let filteredList = orders.filter((order) => {
+    if (safeFilters.keyword) {
+      if (!JSON.stringify(order).toLowerCase().includes(safeFilters.keyword.toLowerCase())) {
+        return false;
+      }
+    }
     if (safeFilters.status && safeFilters.status.length > 0) {
       if (!order.status || !safeFilters.status.includes(order.status)) {
         return false;

package/lib/solution/Sales/index.js

@@ -166,6 +166,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const diff = new Int32Array(slotCount + 1);
     for (let i = 0; i < bookingList.length; i++) {
       const booking = bookingList[i];
+      const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
+      if (appointmentStatus === "new" || appointmentStatus === "rejected" || appointmentStatus === "cancelled")
+        continue;
       const bookingStartAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       const bookingEndAt = this.toBookingDateTime(booking.end_date, booking.end_time);
       if (!bookingStartAt.isValid() || !bookingEndAt.isValid())

package/package.json

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