@pisell/pisellos 2.3.161 → 2.3.163

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

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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

@@ -595,7 +595,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -213,6 +213,7 @@ export declare function normalizeBookingSubType(booking: Record<string, any>): s
 export declare function normalizeSubmitBooking<T extends {
     metadata?: Record<string, any>;
 }>(booking: T): T;
+export declare function resolveTableOccupancyDuration(tempOrder: OrderTempOrder): number;
 /** 提交用人数：有限且为正则向下取整，否则为 1 */
 export declare function normalizeSubmitCollectPaxValue(value: unknown): number;
 /** 从临时订单 metadata 解析合成 booking 的 collect_pax */

package/lib/modules/Order/utils.js

@@ -109,6 +109,7 @@ Object.defineProperty(exports, "resolveSafeProductNum", {
 });
 exports.resolveSubmitCollectPax = resolveSubmitCollectPax;
 exports.resolveSubmitOrderType = resolveSubmitOrderType;
+exports.resolveTableOccupancyDuration = resolveTableOccupancyDuration;
 Object.defineProperty(exports, "shouldBuildManualProductDiscount", {
   enumerable: true,
   get: function () {

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 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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/ScanOrder/index.js

@@ -797,6 +797,7 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
   }
 
   // ScanOrder 提交 payload enhancer：
+  // - 新单有桌台上下文但无 booking 时，补建基础预约（通用 Order 已不再自动生成）
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
   // - 给第一条 booking 补 resources 与 product_uid（仅当存在 resource / rule product）
@@ -818,7 +819,8 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
     };
     return (payload, {
       bookingUuid,
-      tempOrder
+      tempOrder,
+      now
     }) => {
       const resourceId = String(resourceState?.relationId ?? '').trim();
       const hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && resourceState.relationId && resourceState.tableFormId);
@@ -855,7 +857,31 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
       } : undefined;
       const ruleProductUid = ruleProduct ? (0, _utils2.createUuidV4)() : undefined;
       const bookingCapacityDimensionId = (0, _utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
-      const nextBookings = (payload.bookings || []).map((booking, idx) => {
+      let bookings = payload.bookings || [];
+      if (!tempOrder.order_id && bookings.length === 0) {
+        const bookingStart = (0, _dayjs.default)(now);
+        const bookingDuration = (0, _utils2.resolveTableOccupancyDuration)(tempOrder);
+        const bookingEnd = bookingStart.add(bookingDuration, 'minute');
+        bookings = [(0, _utils2.normalizeSubmitBooking)({
+          relation_id: 0,
+          form_id: 0,
+          start_time: bookingStart.format('HH:mm'),
+          start_date: bookingStart.format('YYYY-MM-DD'),
+          end_time: bookingEnd.format('HH:mm'),
+          end_date: bookingEnd.format('YYYY-MM-DD'),
+          duration: bookingDuration,
+          metadata: {
+            unique_identification_number: bookingUuid
+          },
+          select_date: bookingStart.format('YYYY-MM-DD'),
+          is_all: false,
+          like_status: 'common',
+          schedule_id: 0,
+          relation_type: '',
+          number: 1
+        })];
+      }
+      const nextBookings = bookings.map((booking, idx) => {
         const metadata = {
           ...(booking.metadata || {})
         };

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.161",
+  "version": "2.3.163",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",