@pisell/pisellos 2.3.162 → 2.3.163

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

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/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/dist/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/dist/modules/Order/utils.js

@@ -1344,7 +1344,7 @@ export function normalizeSubmitBooking(booking) {
   });
 }
 var DEFAULT_TABLE_OCCUPANCY_DURATION = 20;
-function resolveTableOccupancyDuration(tempOrder) {
+export function resolveTableOccupancyDuration(tempOrder) {
   var _metadata$table_confi, _metadata$tableConfig, _metadata$resource_co, _metadata$resourceCon;
   var metadata = tempOrder.metadata || {};
   var candidates = [metadata.table_occupancy_duration, metadata.booking_duration, metadata.table_duration, metadata.duration, (_metadata$table_confi = metadata.table_config) === null || _metadata$table_confi === void 0 ? void 0 : _metadata$table_confi.occupancy_duration, (_metadata$tableConfig = metadata.tableConfig) === null || _metadata$tableConfig === void 0 ? void 0 : _metadata$tableConfig.occupancy_duration, (_metadata$resource_co = metadata.resource_config) === null || _metadata$resource_co === void 0 ? void 0 : _metadata$resource_co.occupancy_duration, (_metadata$resourceCon = metadata.resourceConfig) === null || _metadata$resourceCon === void 0 ? void 0 : _metadata$resourceCon.occupancy_duration];

package/dist/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 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 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: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/dist/solution/ScanOrder/index.js

@@ -36,7 +36,7 @@ import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleB
 import { createModule } from "../BookingByStep/types";
 import { ProductList } from "../../modules/ProductList";
 import { getDateIsInSchedule } from "../../modules/Schedule/getDateIsInSchedule";
-import { composeLinePrice, buildSubmitPayload, createUuidV4, getProductSkuOptions, normalizeSubmitCollectPaxValue, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, buildSubmitPayload, createUuidV4, getProductSkuOptions, normalizeSubmitBooking, normalizeSubmitCollectPaxValue, resolveTableOccupancyDuration, sumOptionUnitPrice } from "../../modules/Order/utils";
 import dayjs from 'dayjs';
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
@@ -1332,6 +1332,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       }
       return prepareRetailAvailability;
     }() // ScanOrder 提交 payload enhancer：
+    // - 新单有桌台上下文但无 booking 时，补建基础预约（通用 Order 已不再自动生成）
     // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
     // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
     // - 给第一条 booking 补 resources 与 product_uid（仅当存在 resource / rule product）
@@ -1358,7 +1359,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       return function (payload, _ref3) {
         var _resourceState$relati, _tempOrder$metadata, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati2, _pickFirstCustomCapac;
         var bookingUuid = _ref3.bookingUuid,
-          tempOrder = _ref3.tempOrder;
+          tempOrder = _ref3.tempOrder,
+          now = _ref3.now;
         var resourceId = String((_resourceState$relati = resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : '').trim();
         var hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && resourceState.relationId && resourceState.tableFormId);
         if (!hasReservationBookingContext) {
@@ -1393,7 +1395,31 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
         var bookingCapacityDimensionId = (_pickFirstCustomCapac = pickFirstCustomCapacityDimensionId(_this5.enabledReservationRuleProducts)) !== null && _pickFirstCustomCapac !== void 0 ? _pickFirstCustomCapac : 0;
-        var nextBookings = (payload.bookings || []).map(function (booking, idx) {
+        var bookings = payload.bookings || [];
+        if (!tempOrder.order_id && bookings.length === 0) {
+          var bookingStart = dayjs(now);
+          var bookingDuration = resolveTableOccupancyDuration(tempOrder);
+          var bookingEnd = bookingStart.add(bookingDuration, 'minute');
+          bookings = [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
+          })];
+        }
+        var nextBookings = bookings.map(function (booking, idx) {
           var metadata = _objectSpread({}, booking.metadata || {});
           if (hasExplicitCollectPax) {
             metadata.collect_pax = normalizeSubmitCollectPaxValue(rawCollectPax);

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 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 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: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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/package.json

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