@pisell/pisellos 2.2.94 → 2.2.96

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

@@ -109,6 +109,7 @@ export interface ProductFormatterContext {
     schedule_date: string;
     priceData?: LoadProductsPriceData[];
     scheduleModule?: any;
+    locale?: string;
 }
 /**
  * 商品格式化器类型

package/dist/server/utils/product.d.ts

@@ -10,6 +10,10 @@ export declare function perfMark(label: string, durationMs: number, meta?: Recor
  */
 export declare function applyPriceDataToProducts(products: ProductData[], priceData: LoadProductsPriceData[]): ProductData[];
 export declare const getIsSessionProduct: (product: ProductData) => boolean;
+/**
+ * 根据 locale 将商品的 i18n 字段覆盖到对应原始字段
+ */
+export declare function applyI18nToProducts(products: ProductData[], locale?: string): ProductData[];
 /**
  * 将详情值数据应用到商品列表
  * @param products 商品列表

package/dist/server/utils/product.js

@@ -1,7 +1,11 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -186,6 +190,36 @@ var getIsOpenDetailModal = function getIsOpenDetailModal(product, context) {
     scheduleTimeSlots: scheduleTimeSlots
   };
 };
+var I18N_FIELD_MAP = {
+  title_i18n: 'title',
+  subtitle_i18n: 'subtitle',
+  description_i18n: 'description',
+  cover_i18n: 'cover'
+};
+
+/**
+ * 根据 locale 将商品的 i18n 字段覆盖到对应原始字段
+ */
+export function applyI18nToProducts(products, locale) {
+  if (!locale) return products;
+  return products.map(function (product) {
+    var _patched;
+    var patched = null;
+    for (var _i = 0, _Object$entries = Object.entries(I18N_FIELD_MAP); _i < _Object$entries.length; _i++) {
+      var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+        i18nKey = _Object$entries$_i[0],
+        originalKey = _Object$entries$_i[1];
+      var i18nDict = product[i18nKey];
+      if (!i18nDict) continue;
+      var localizedValue = i18nDict[locale];
+      if (localizedValue) {
+        if (!patched) patched = _objectSpread({}, product);
+        patched[originalKey] = localizedValue;
+      }
+    }
+    return (_patched = patched) !== null && _patched !== void 0 ? _patched : product;
+  });
+}
 var formatDataKey = function formatDataKey(data) {
   var _data$option, _data$bundle;
   var _data = _objectSpread({}, data);

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

@@ -344,7 +344,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -58,7 +58,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * - n = booking 数量
      * - s = 时间片数量
      */
-    getTimelineHighlights(bookingList?: BookingData[]): SalesTimelineHighlights;
+    getTimelineHighlights(bookingList?: BookingData[], startDateTime?: string, endDateTime?: string): SalesTimelineHighlights;
     /** dayjs 未启用插件时，手动封装 >= 判断 */
     private isSameOrAfter;
     /** dayjs 未启用插件时，手动封装 <= 判断 */

package/dist/solution/Sales/index.js

@@ -242,16 +242,24 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getTimelineHighlights",
     value: function getTimelineHighlights() {
       var bookingList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var startDateTime = arguments.length > 1 ? arguments[1] : undefined;
+      var endDateTime = arguments.length > 2 ? arguments[2] : undefined;
       var bucketMinutes = this.getTimelineBucketMinutes();
       var bucketMs = bucketMinutes * 60 * 1000;
-      var _this$getTimelineRang = this.getTimelineRangeByOperatingBoundary(),
-        startAt = _this$getTimelineRang.startAt,
-        endExclusiveAt = _this$getTimelineRang.endExclusiveAt;
+      var customStartAt = startDateTime ? dayjs(startDateTime) : dayjs('');
+      var customEndExclusiveAt = endDateTime ? dayjs(endDateTime) : dayjs('');
+      var hasValidCustomRange = customStartAt.isValid() && customEndExclusiveAt.isValid();
+      var _ref = hasValidCustomRange ? {
+          startAt: customStartAt,
+          endExclusiveAt: customEndExclusiveAt
+        } : this.getTimelineRangeByOperatingBoundary(),
+        startAt = _ref.startAt,
+        endExclusiveAt = _ref.endExclusiveAt;
       var startAtMs = startAt.valueOf();
       var endExclusiveAtMs = endExclusiveAt.valueOf();
-      if (!startAt.isValid() || !endExclusiveAt.isValid() || endExclusiveAtMs <= startAtMs) return {};
+      if (!startAt.isValid() || !endExclusiveAt.isValid() || endExclusiveAtMs <= startAtMs) return [];
       var slotCount = Math.ceil((endExclusiveAtMs - startAtMs) / bucketMs);
-      if (slotCount <= 0) return {};
+      if (slotCount <= 0) return [];
       var diff = new Int32Array(slotCount + 1);
       for (var i = 0; i < bookingList.length; i++) {
         var booking = bookingList[i];
@@ -268,12 +276,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         diff[startIdx] += 1;
         diff[endIdx + 1] -= 1;
       }
-      var timeline = {};
+      var timeline = [];
       var runningCount = 0;
       for (var _i = 0; _i < slotCount; _i++) {
         runningCount += diff[_i];
-        var label = startAt.add(_i * bucketMinutes, 'minute').format('HH:mm');
-        timeline[label] = runningCount;
+        timeline.push(runningCount);
       }
       return timeline;
     }
@@ -324,8 +331,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getResourceId",
     value: function getResourceId(resource) {
-      var _ref, _resource$id;
-      return (_ref = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.form_record_id) !== null && _ref !== void 0 ? _ref : '';
+      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 : '';
     }
 
     /**
@@ -351,6 +358,33 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         return _this2.isSameOrBefore(startAt, currentDayEnd) && _this2.isSameOrAfter(endAt, currentDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
+      var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
+        if (selectedBookings.length === 0) return selectedBookings;
+        var shouldAppendNextGroup = selectedBookings.some(function (booking) {
+          return booking.status === 'reserved' || booking.status === 'occupied';
+        });
+        if (!shouldAppendNextGroup) return selectedBookings;
+        var selectedStartValues = new Set(selectedBookings.map(function (booking) {
+          return _this2.toBookingDateTime(booking.start_date, booking.start_time);
+        }).filter(function (startAt) {
+          return startAt.isValid();
+        }).map(function (startAt) {
+          return startAt.valueOf();
+        }));
+        var futureCandidates = dayScopedBookings.filter(function (booking) {
+          var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
+          if (!startAt.isValid()) return false;
+          return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
+        });
+        if (futureCandidates.length === 0) return selectedBookings;
+        var nextStartAt = _this2.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartGroup = futureCandidates.filter(function (booking) {
+          var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
+          return startAt.isValid() && startAt.valueOf() === nextStartAt;
+        });
+        if (nextStartGroup.length === 0) return selectedBookings;
+        return [].concat(_toConsumableArray(selectedBookings), _toConsumableArray(nextStartGroup));
+      };
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
@@ -359,13 +393,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         if (!startAt.isValid() || !endAt.isValid()) return false;
         return _this2.isSameOrAfter(current, startAt) && _this2.isSameOrBefore(current, endAt);
       });
-      if (activeBookings.length > 0) return activeBookings;
+      if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
       // timeout occupied: 占用中且超时
       var timeoutOccupied = dayScopedBookings.filter(function (booking) {
         return booking.status === 'occupied' && booking.isTimeout;
       });
-      if (timeoutOccupied.length > 0) return timeoutOccupied;
+      if (timeoutOccupied.length > 0) return appendNextStartGroupIfNeeded(timeoutOccupied);
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
@@ -374,10 +408,11 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
       if (upcoming.length > 0) {
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
-        return upcoming.filter(function (booking) {
+        var upcomingStartGroup = upcoming.filter(function (booking) {
           var startAt = _this2.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
+        return appendNextStartGroupIfNeeded(upcomingStartGroup);
       }
 
       // fallback: 全部是过去且非 timeout 的场景，保留末条便于前端兜底展示
@@ -393,8 +428,8 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeMatchedBooking",
     value: function normalizeMatchedBooking(current, booking) {
-      var _ref2, _booking$appointment_;
-      var appointmentStatus = String((_ref2 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref2 !== void 0 ? _ref2 : '');
+      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 : '');
       if (appointmentStatus === 'rejected' || appointmentStatus === 'cancelled' || appointmentStatus === 'completed') {
         return null;
       }
@@ -402,15 +437,37 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
       var startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       var isTimeout = bookingStatus === 'occupied' && endAt.isValid() && current.isAfter(endAt);
+      var timeoutTime = isTimeout ? current.diff(endAt, 'minute') : undefined;
+      var progressPercent = function () {
+        if (bookingStatus !== 'occupied') return 0;
+        if (!startAt.isValid() || !endAt.isValid()) return 0;
+        var totalMinutes = endAt.diff(startAt, 'minute');
+        if (totalMinutes <= 0) return 0;
+        var elapsedMinutes = current.diff(startAt, 'minute');
+        if (elapsedMinutes <= 0) return 0;
+        if (elapsedMinutes >= totalMinutes) return 100;
+        return Math.floor(elapsedMinutes / totalMinutes * 100);
+      }();
       var reservedStatus;
-      if (bookingStatus === 'reserved' && startAt.isValid() && endAt.isValid()) {
-        if (current.isBefore(startAt)) reservedStatus = 'not_arrived';
-        if (current.isAfter(endAt)) reservedStatus = 'late';
+      var lateTime;
+      var remainingReserveTime;
+      if (bookingStatus === 'reserved' && startAt.isValid()) {
+        if (current.isBefore(startAt)) {
+          reservedStatus = 'not_arrived';
+          remainingReserveTime = startAt.diff(current, 'minute');
+        } else {
+          reservedStatus = 'late';
+          lateTime = Math.max(current.diff(startAt, 'minute'), 0);
+        }
       }
       return _objectSpread(_objectSpread({}, booking), {}, {
         status: bookingStatus,
         isTimeout: isTimeout,
-        reserved_status: reservedStatus
+        timeoutTime: timeoutTime,
+        progressPercent: progressPercent,
+        lateTime: lateTime,
+        reserved_status: reservedStatus,
+        remainingReserveTime: remainingReserveTime
       });
     }
   }, {
@@ -452,13 +509,12 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 6:
               resourceResponse = _context3.sent;
               resourceList = (_resourceResponse$dat = resourceResponse === null || resourceResponse === void 0 || (_resourceResponse$dat2 = resourceResponse.data) === null || _resourceResponse$dat2 === void 0 ? void 0 : _resourceResponse$dat2.list) !== null && _resourceResponse$dat !== void 0 ? _resourceResponse$dat : [];
-              console.log(1111, currentTime, resourceList, bookingList);
               if (!(!Array.isArray(resourceList) || resourceList.length === 0)) {
-                _context3.next = 11;
+                _context3.next = 10;
                 break;
               }
               return _context3.abrupt("return", []);
-            case 11:
+            case 10:
               // 全局先做 booking 标准化 + start_time 升序，后续映射直接复用
               normalizedBookings = bookingList.map(function (booking) {
                 return _this3.normalizeMatchedBooking(current, booking);
@@ -492,7 +548,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   bookings: bookings
                 });
               }));
-            case 15:
+            case 14:
             case "end":
               return _context3.stop();
           }

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

@@ -21,15 +21,17 @@ export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;
     isTimeout: boolean;
+    timeoutTime?: number;
+    progressPercent?: number;
+    lateTime?: number;
+    remainingReserveTime?: number;
     reserved_status: SalesReservedStatus;
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {
     resource_id: ResourceId;
     bookings: SalesResourceMatchedBooking[];
 }
-export interface SalesTimelineHighlights {
-    [time: string]: number;
-}
+export type SalesTimelineHighlights = number[];
 /**
  * Sales 解决方案状态
  *
@@ -61,5 +63,5 @@ export interface SalesModuleAPI {
     /** 获取资源维度的预约占用列表 */
     getResourceBookingList: (currentTime: string, bookingList: BookingData[]) => Promise<SalesResourceBookingItem[]>;
     /** 获取时间轴每个时间片的预约数量 */
-    getTimelineHighlights: (bookingList: BookingData[]) => SalesTimelineHighlights;
+    getTimelineHighlights: (bookingList: BookingData[], startDateTime?: string, endDateTime?: string) => SalesTimelineHighlights;
 }

package/dist/types/index.d.ts

@@ -52,6 +52,7 @@ export interface PisellCore {
     validateContext: (config: ModuleContextConfig) => boolean;
     serverOptions?: ServerOptions;
     server?: any;
+    setContext: (ctx: Partial<BusinessContext>) => void;
 }
 /**
  * 业务上下文接口
@@ -59,6 +60,7 @@ export interface PisellCore {
 export interface BusinessContext {
     userId?: string;
     companyId?: string;
+    locale?: string;
     [key: string]: any;
 }
 /**

package/lib/core/index.d.ts

@@ -29,6 +29,7 @@ declare class PisellOSCore implements PisellCore {
     getModuleExports<T = any>(name: string): T | null;
     hasModule(name: string): boolean;
     destroy(): Promise<void>;
+    setContext(ctx: Partial<BusinessContext>): void;
     /**
      * 验证上下文参数
      */

package/lib/core/index.js

@@ -235,6 +235,10 @@ var PisellOSCore = class {
     this.plugins.clear();
     this.log("PisellOS 核心已销毁");
   }
+  setContext(ctx) {
+    this.context = { ...this.context, ...ctx };
+    this.log(`上下文已更新: ${JSON.stringify(Object.keys(ctx))}`);
+  }
   /**
    * 验证上下文参数
    */

package/lib/modules/Customer/index.d.ts

@@ -9,6 +9,7 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
     private cacheId;
     private openCache;
     private fatherModule;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**

package/lib/modules/Customer/index.js

@@ -46,12 +46,14 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       searchParams: {}
     };
     this.openCache = false;
+    this.otherParams = {};
   }
   async initialize(core, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
     this.request = this.core.getPlugin("request");
+    this.otherParams = (options == null ? void 0 : options.otherParams) || {};
     if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.customerList)) {
       const customerList = (0, import_lodash_es.cloneDeep)(options.initialState.customerList || []);
       this.store.customerList = customerList;
@@ -95,9 +97,12 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
    * @returns API响应数据
    */
   async fetchCustomerListData(params = {}) {
-    var _a, _b;
-    const url = "/customer/select-list";
-    const { skip = 1, num = import_constants.DEFAULT_PAGE_SIZE, search, ...otherParams } = params;
+    var _a, _b, _c, _d;
+    let url = "/customer/select-list";
+    if ((_a = this.otherParams) == null ? void 0 : _a.isFranchisee) {
+      url = "/franchisee/customer/select-list";
+    }
+    const { skip = 1, num = import_constants.DEFAULT_PAGE_SIZE, search, ..._otherParams } = params;
     const queryParams = {
       skip,
       num,
@@ -106,7 +111,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
       ...search && { search },
-      ...otherParams
+      ..._otherParams
     };
     const res = await this.request.get(url, queryParams, {
       cache: {
@@ -117,9 +122,19 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     if ((res == null ? void 0 : res.code) !== 200) {
       throw new Error(res == null ? void 0 : res.message);
     }
+    let _customerList = ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.list) || [];
+    if (((_c = this.otherParams) == null ? void 0 : _c.isFranchisee) && (_customerList == null ? void 0 : _customerList.length) > 0) {
+      _customerList = _customerList == null ? void 0 : _customerList.map((item) => {
+        return {
+          ...item || {},
+          is_franchisor_customer: 1
+          // 标识是总店的客户
+        };
+      });
+    }
     return {
-      customerList: ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [],
-      total: ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.count) || 0,
+      customerList: _customerList,
+      total: ((_d = res == null ? void 0 : res.data) == null ? void 0 : _d.count) || 0,
       page: skip,
       pageSize: num
     };

package/lib/modules/Order/index.d.ts

@@ -23,7 +23,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     private logError;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/server/index.d.ts

@@ -167,7 +167,7 @@ declare class Server {
      */
     private handleUnsubscribeOrderQuery;
     /**
-     * 判断预约查询的 es_start_datetime_between 起始日期是否为今天
+     * 判断预约查询的 sales_time_between 起始日期是否为今天
      */
     private isBookingQueryForToday;
     /**
@@ -201,11 +201,16 @@ declare class Server {
     /**
      * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
      * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
+     * @param context 查询上下文
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private recomputeAndNotifyProductQuery;
     /**

package/lib/server/index.js

@@ -557,8 +557,10 @@ var Server = class {
     } else {
       this.logInfo("跳过自动预加载", { autoPreload });
     }
-    this.core.effects.on(import_types.ProductsHooks.onProductsSyncCompleted, () => {
-      this.recomputeAndNotifyProductQuery();
+    this.core.effects.on(import_types.ProductsHooks.onProductsSyncCompleted, (payload) => {
+      this.recomputeAndNotifyProductQuery({
+        changedIds: payload == null ? void 0 : payload.changedIds
+      });
     });
     this.core.effects.on(import_types2.OrderHooks.onOrdersChanged, () => {
       this.recomputeAndNotifyOrderQuery();
@@ -834,10 +836,10 @@ var Server = class {
     }
   }
   /**
-   * 判断预约查询的 es_start_datetime_between 起始日期是否为今天
+   * 判断预约查询的 sales_time_between 起始日期是否为今天
    */
   isBookingQueryForToday(data) {
-    const range = data == null ? void 0 : data.es_start_datetime_between;
+    const range = data == null ? void 0 : data.sales_time_between;
     if (!Array.isArray(range) || range.length < 1)
       return true;
     const startDateStr = String(range[0]).split("T")[0].split(" ")[0];
@@ -859,18 +861,18 @@ var Server = class {
       };
     }
     try {
-      const response = await this.app.request.get("/shop/order/sales", { ...data, with: ["all"] }, {
+      const response = await this.app.request.get("/shop/order/sales", { ...data, form_record_ids: void 0, with: ["all"] }, {
         isShopApi: true
       });
       const rawList = ((_b = response == null ? void 0 : response.data) == null ? void 0 : _b.list) ?? (response == null ? void 0 : response.list) ?? [];
-      const list = (0, import_filterBookings.flattenOrdersToBookings)(rawList);
+      const list = (0, import_filterBookings.filterBookingsFromOrders)(rawList, data);
       this.logInfo("fetchBookingListFromAPI: API 返回并拆分完成", {
         rawCount: rawList.length,
-        flattenedCount: list.length
+        flattenedCount: list.count
       });
       return {
         code: 200,
-        data: { ...response.data, list },
+        data: { ...response.data, list: (list == null ? void 0 : list.list) || [] },
         message: "",
         status: true
       };
@@ -950,14 +952,18 @@ var Server = class {
   /**
    * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
    * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
+   * @param context 查询上下文
+   * @param options 可选参数
+   * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
    */
-  async computeProductQueryResult(context) {
+  async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
     const { menu_list_ids, schedule_date, schedule_datetime } = context;
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       schedule_datetime,
-      schedule_date
+      schedule_date,
+      changedIds: options == null ? void 0 : options.changedIds
     });
     if (!this.products) {
       this.logError("computeProductQueryResult: Products 模块未注册");
@@ -987,6 +993,8 @@ var Server = class {
     const tPrice = performance.now();
     const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
       scheduleModule: this.getSchedule()
+    }, {
+      changedIds: options == null ? void 0 : options.changedIds
     });
     (0, import_product.perfMark)("computeQuery.getProductsWithPrice", performance.now() - tPrice, {
       count: allProductsWithPrice.length
@@ -997,6 +1005,13 @@ var Server = class {
       before: allProductsWithPrice.length,
       after: filteredProducts.length
     });
+    const tStatus = performance.now();
+    const beforeStatusCount = filteredProducts.length;
+    filteredProducts = filteredProducts.filter((p) => ((p == null ? void 0 : p.status) || "published") === "published");
+    (0, import_product.perfMark)("computeQuery.filterByStatus", performance.now() - tStatus, {
+      before: beforeStatusCount,
+      after: filteredProducts.length
+    });
     const tSort = performance.now();
     filteredProducts = filteredProducts.sort((a, b) => {
       const sortDiff = Number(b.sort) - Number(a.sort);
@@ -1025,16 +1040,21 @@ var Server = class {
   /**
    * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
    * 由 ProductsModule 的 onProductsSyncCompleted 事件触发
+   * @param options 可选参数
+   * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
    */
-  async recomputeAndNotifyProductQuery() {
+  async recomputeAndNotifyProductQuery(options) {
     if (this.productQuerySubscribers.size === 0)
       return;
     this.logInfo("recomputeAndNotifyProductQuery: 开始推送", {
-      subscriberCount: this.productQuerySubscribers.size
+      subscriberCount: this.productQuerySubscribers.size,
+      changedIds: options == null ? void 0 : options.changedIds
     });
     for (const [subscriberId, subscriber] of this.productQuerySubscribers.entries()) {
       try {
-        const result = await this.computeProductQueryResult(subscriber.context);
+        const result = await this.computeProductQueryResult(subscriber.context, {
+          changedIds: options == null ? void 0 : options.changedIds
+        });
         subscriber.callback(result);
         this.logInfo("recomputeAndNotifyProductQuery: 已推送", { subscriberId });
       } catch (error) {

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/server/modules/order/types.d.ts

@@ -438,7 +438,7 @@ export interface BookingFilters {
     payment_method?: string[];
     business_code?: string;
     appointment_status?: string[];
-    es_start_datetime_between?: string[];
+    sales_time_between?: string[];
     /**
      * 仅保留「预约开始时刻」大于等于该时间的条目。
      * 预约时刻由 start_date 与 start_time 拼接解析（与 order_by start_at 一致）。

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

@@ -75,7 +75,7 @@ function prepareFilters(f) {
     customerIdStr: hasCustomerId ? String(f.customer_id) : "",
     hasBusinessCode: !!f.business_code,
     businessCode: f.business_code,
-    bookingTimeRange: parseDateRange(f.es_start_datetime_between),
+    bookingTimeRange: parseDateRange(f.sales_time_between),
     createdAtRange: parseDateRange(f.created_at_between),
     updatedAtRange: parseDateRange(f.updated_at_between),
     numberRange: parseNumberRange(f.number_between),