@pisell/pisellos 2.3.160 → 2.3.162

package/lib/server/index.js

@@ -5468,7 +5468,7 @@ class Server {
   }
   buildOrderSalesDetailBackendPath(lookup, data) {
     const rawWith = data && typeof data === 'object' ? data.with : undefined;
-    const withFields = Array.isArray(rawWith) && rawWith.length > 0 ? rawWith : ['products', 'scheduleEvents'];
+    const withFields = Array.isArray(rawWith) && rawWith.length > 0 ? rawWith : ['all'];
     const searchParams = new URLSearchParams();
     withFields.forEach(field => {
       if (field === undefined || field === null || field === '') return;

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

@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -347,7 +347,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/Sales/index.js

@@ -274,7 +274,7 @@ class SalesImpl extends _BaseModule.BaseModule {
     } : {
       external_sale_number: normalizedLookup
     };
-    return this.request.post('/local/print-order', {
+    return this.request.post('/shop/local/print-order', {
       ...lookupPayload,
       lookup_order_from_db: 1,
       small_ticket_data_flag: 1,

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

@@ -105,6 +105,12 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private normalizeAvailabilityIdList;
     private normalizeAvailabilityStringList;
     private normalizeAvailabilityPrepareDescriptor;
+    /**
+     * 列表直加没有经过 SKU availability flow，legacy cacheItem 的灵活时长可能落到
+     * 23:59。提交前用同一套营业排期补齐结束时间，保留已选开始时间、资源和 Holder。
+     * 仅供直加调用；手动时间选择和 availability candidate 不经过此方法。
+     */
+    prepareDirectAddFlexibleBooking(cacheItem: any): Promise<any>;
     private resolveAvailabilityPrepareDefaults;
     private buildAvailabilityPrepareKey;
     private clearAvailabilityRemoteResourceState;

package/lib/solution/UnifiedBookingSales/index.js

@@ -33,8 +33,8 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _lodashEs = require("lodash-es");
 var _modules = require("../../modules");
 var _pickupTiming = require("../../modules/Order/pickupTiming");
-var _utils = require("../../modules/BookingContext/utils");
 var _cacheItemToBookingInput = require("../../modules/BookingContext/utils/cacheItemToBookingInput");
+var _utils = require("../../modules/BookingContext/utils");
 var _OpenData = require("../../modules/OpenData");
 var _getDateIsInSchedule = require("../../modules/Schedule/getDateIsInSchedule");
 var _ResourcePlanner = require("../../modules/ResourcePlanner");
@@ -1385,6 +1385,90 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       mode
     });
   }
+
+  /**
+   * 列表直加没有经过 SKU availability flow，legacy cacheItem 的灵活时长可能落到
+   * 23:59。提交前用同一套营业排期补齐结束时间，保留已选开始时间、资源和 Holder。
+   * 仅供直加调用；手动时间选择和 availability candidate 不经过此方法。
+   */
+  async prepareDirectAddFlexibleBooking(cacheItem) {
+    if (!(0, _utils.isProductFlexibleDuration)(cacheItem?.duration) || (0, _utils.isSessionProduct)(cacheItem)) {
+      return cacheItem;
+    }
+    const extend = cacheItem?._extend;
+    const {
+      startDate
+    } = (0, _utils.getServiceTimes)(cacheItem);
+    if (!extend?.start_date || !extend?.start_time || !startDate.isValid()) {
+      throw new _ResourcePlanner.AvailabilityError('INVALID_TARGET_FILTER', '灵活时长商品缺少有效开始时间');
+    }
+    const date = startDate.format('YYYY-MM-DD');
+    // 带上前一天，覆盖凌晨仍处在前一营业时段内的情况。
+    const dateRange = {
+      startDate: startDate.subtract(1, 'day').format('YYYY-MM-DD'),
+      endDate: date
+    };
+    const prepare = await this.resolveAvailabilityPrepareDefaults({
+      dateRange
+    });
+    if (prepare._availabilityOperatingHours?.source !== 'open_data_schedule') {
+      return cacheItem;
+    }
+    const operatingHours = this.buildAvailabilityOperatingHoursSnapshot({
+      prepare,
+      dateRange,
+      scheduleList: this.getAvailabilityScheduleCatalog(),
+      businessHours: DEFAULT_AVAILABILITY_BUSINESS_HOURS
+    });
+    if (operatingHours.missingScheduleIds.length > 0) {
+      throw new _ResourcePlanner.AvailabilityError('OPERATING_HOURS_RESOLVE_FAILED', '店铺营业时间排期缺失，请重试', {
+        missingScheduleIds: operatingHours.missingScheduleIds
+      });
+    }
+    const start = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(startDate.format('YYYY-MM-DDTHH:mm:00')));
+    const nextDay = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(`${startDate.add(1, 'day').format('YYYY-MM-DD')}T00:00:00`));
+    const windows = operatingHours.windows.map(window => ({
+      start: (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(window.startAt)),
+      end: (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(window.endAt))
+    })).filter(window => window.end > start && window.start < nextDay).sort((left, right) => left.start - right.start);
+    const merged = [];
+    for (const window of windows) {
+      const previous = merged[merged.length - 1];
+      if (previous && window.start <= previous.end) {
+        previous.end = Math.max(previous.end, window.end);
+      } else {
+        merged.push({
+          ...window
+        });
+      }
+    }
+    // POS 可以提前售票；保留开始分钟，结束取当前或当天下一段营业时间。
+    // 不跨越午休，也不把闭店后的直加顺延到次日。
+    let end = merged[0]?.end;
+    const resourceEndAt = (0, _utils.getUsableTime)(cacheItem)?._extend?.usableTime?.end_at;
+    if (resourceEndAt) {
+      const resourceEnd = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)((0, _dayjs.default)(resourceEndAt).format('YYYY-MM-DDTHH:mm:00')));
+      if (end !== undefined) end = Math.min(end, resourceEnd);
+    }
+    if (end === undefined || end <= start) {
+      throw new _ResourcePlanner.AvailabilityError('REVALIDATION_FAILED', '当前时间没有可用营业时段，请选择预约时间');
+    }
+    const duration = Math.floor((end - start) / 60000);
+    if (duration <= 0) {
+      throw new _ResourcePlanner.AvailabilityError('REVALIDATION_FAILED', '灵活时长商品的结束时间必须晚于开始时间');
+    }
+    const endDate = (0, _dayjs.default)((0, _localClock.formatLocalDateTime)(start + duration * 60000));
+    return {
+      ...cacheItem,
+      _extend: {
+        ...extend,
+        duration: _utils.flexibleObj.create(duration),
+        endDate,
+        end_date: endDate.format('YYYY-MM-DD'),
+        end_time: endDate.format('HH:mm')
+      }
+    };
+  }
   async resolveAvailabilityPrepareDefaults(params) {
     const needsOperatingHours = params.businessHours === undefined;
     const needsTimeSlice = params.slotStepMinutes === undefined;

package/package.json

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