@pisell/pisellos 2.2.300 → 2.2.302

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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/ResourcePlanner/planner.js

@@ -294,10 +294,12 @@ function evaluateCandidateTimeGate(params) {
     };
   }
   if (policy.type === 'before_start') {
-    // Flexible-duration candidates start at minute precision. Keep the current
-    // minute selectable instead of treating the freshly generated candidate as
-    // already started because the query clock still contains seconds.
-    var hasNotReachedStart = product.isFlexibleDuration ? floorToMinute(now) <= candidateRange.start : now < candidateRange.start;
+    // Flexible-duration candidates and POS fixed-duration anchors start at
+    // minute precision. Keep that current minute selectable instead of treating
+    // the freshly generated candidate as already started because the query
+    // clock still contains seconds.
+    var usesMinutePrecision = product.isFlexibleDuration || evaluationContext.useExactDurationCandidateMinute && product.kind === 'duration';
+    var hasNotReachedStart = usesMinutePrecision ? floorToMinute(now) <= candidateRange.start : now < candidateRange.start;
     if (hasNotReachedStart) return null;
     return {
       status: 'unavailable',
@@ -1179,7 +1181,8 @@ export function getProductTimeRanges(projection) {
       }
       return floorToMinute(evaluatedAt);
     }();
-    var durationAnchor = ceilToTenMinutes(toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone), projection.meta.timezone);
+    var durationCandidateAnchor = toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone);
+    var durationAnchor = runtimeOptions.useExactDurationCandidateMinute ? floorToMinute(durationCandidateAnchor) : ceilToTenMinutes(durationCandidateAnchor, projection.meta.timezone);
     var requestedStartTimes = resolveRequestedDurationStartTimes(product, request);
     var ranges = [];
     baseRanges.forEach(function (range) {
@@ -1445,6 +1448,7 @@ function buildEvaluationContext(params) {
     evaluatedAtMs: evaluatedAt,
     resourceIdSet: (_params$resourceIds2 = params.resourceIds) !== null && _params$resourceIds2 !== void 0 && _params$resourceIds2.length ? new Set(params.resourceIds.map(String)) : null,
     selectionsByGroupKey: selectionsByGroupKey,
+    useExactDurationCandidateMinute: params.useExactDurationCandidateMinute === true,
     allowExcludedScheduleDateOverride: params.allowExcludedScheduleDateOverride === true
   };
 }
@@ -1933,6 +1937,7 @@ export function queryAvailabilityProjection(projection, request) {
     projection: projection,
     evaluatedAt: evaluatedAt,
     resourceIds: request.resourceIds,
+    useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
     allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
   });
   if (request.target === 'time') {
@@ -2022,6 +2027,7 @@ export function queryAvailabilityProjection(projection, request) {
     partySize: normalizedPartySize
   }, {
     evaluatedAt: evaluatedAt,
+    useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
     allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
   });
   var candidateGroupMap = new Map(candidateGroups.map(function (group) {
@@ -2222,6 +2228,7 @@ export function validateAvailabilitySelection(projection, params) {
       projection: projection,
       evaluatedAt: evaluatedAt,
       requirementSelections: params.requirementSelections,
+      useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
       allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
     })
   });

package/dist/modules/ResourcePlanner/types.d.ts

@@ -250,6 +250,13 @@ export interface GetProductTimeRangesRequest {
 }
 export interface GetProductTimeRangesRuntimeOptions {
     evaluatedAt?: string;
+    /**
+     * Internal POS capability: fixed-duration candidates start from the stable
+     * context anchor's current minute instead of rounding up to ten minutes, and
+     * that minute remains selectable during before-start cutoff evaluation.
+     * Other callers keep the legacy alignment and strict second-level cutoff.
+     */
+    useExactDurationCandidateMinute?: boolean;
     /**
      * Internal POS capability: allow explicit duration/start overrides to append
      * a custom duration candidate for Session products. Fixed Session ranges are

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

@@ -229,6 +229,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
+    /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+    setPickupRef(buzzer: string): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;

package/dist/solution/BaseSales/index.js

@@ -2107,6 +2107,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (!this.store.order) throw new Error('order 模块未初始化');
       this.store.order.syncTempOrderNoteToRemote(orderId, note);
     }
+
+    /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+  }, {
+    key: "setPickupRef",
+    value: function setPickupRef(buzzer) {
+      if (!this.store.order) throw new Error('order 模块未初始化');
+      return this.store.order.updateTempOrderBuzzer(buzzer);
+    }
   }, {
     key: "updateTempOrderShopDiscount",
     value: function updateTempOrderShopDiscount(amount) {

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 3 | 1 | 5 | 6 | 4;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -453,19 +453,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/UnifiedBookingSales/index.js

@@ -4293,6 +4293,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
               } : {}), {
                 evaluatedAt: this.getAvailabilityRuntimeDateTime(),
+                useExactDurationCandidateMinute: isPosAvailabilityRequest,
                 allowSessionCustomRanges: isPosAvailabilityRequest,
                 allowExcludedScheduleDateOverride: isPosAvailabilityRequest
               }).map(function (group) {
@@ -4332,6 +4333,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               this.assertContextualQueryFreshness(context, request);
               isPosAvailabilityRequest = String((_this$otherParams$pla2 = (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
               result = queryAvailabilityProjection(projectionEntry.projection, request, {
+                useExactDurationCandidateMinute: isPosAvailabilityRequest,
                 allowExcludedScheduleDateOverride: isPosAvailabilityRequest
               });
               contextVersion = context.activeVersion;
@@ -4686,6 +4688,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               }, allowPosAvailabilityOverride ? {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
               } : {}) : {}) : {}), {
+                useExactDurationCandidateMinute: allowPosAvailabilityOverride,
                 allowSessionCustomRanges: allowPosAvailabilityOverride,
                 allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
               }).flatMap(function (group) {
@@ -4721,6 +4724,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 partySize: partySize,
                 bookingCount: bookingCount
               }, {
+                useExactDurationCandidateMinute: allowPosAvailabilityOverride,
                 allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
               });
               if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(function (conflict) {

package/lib/modules/ResourcePlanner/planner.js

@@ -281,10 +281,12 @@ function evaluateCandidateTimeGate(params) {
     };
   }
   if (policy.type === 'before_start') {
-    // Flexible-duration candidates start at minute precision. Keep the current
-    // minute selectable instead of treating the freshly generated candidate as
-    // already started because the query clock still contains seconds.
-    const hasNotReachedStart = product.isFlexibleDuration ? floorToMinute(now) <= candidateRange.start : now < candidateRange.start;
+    // Flexible-duration candidates and POS fixed-duration anchors start at
+    // minute precision. Keep that current minute selectable instead of treating
+    // the freshly generated candidate as already started because the query
+    // clock still contains seconds.
+    const usesMinutePrecision = product.isFlexibleDuration || evaluationContext.useExactDurationCandidateMinute && product.kind === 'duration';
+    const hasNotReachedStart = usesMinutePrecision ? floorToMinute(now) <= candidateRange.start : now < candidateRange.start;
     if (hasNotReachedStart) return null;
     return {
       status: 'unavailable',
@@ -1050,7 +1052,8 @@ function getProductTimeRanges(projection, request = {}, runtimeOptions = {}) {
       }
       return floorToMinute(evaluatedAt);
     })();
-    const durationAnchor = ceilToTenMinutes(toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone), projection.meta.timezone);
+    const durationCandidateAnchor = toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone);
+    const durationAnchor = runtimeOptions.useExactDurationCandidateMinute ? floorToMinute(durationCandidateAnchor) : ceilToTenMinutes(durationCandidateAnchor, projection.meta.timezone);
     const requestedStartTimes = resolveRequestedDurationStartTimes(product, request);
     const ranges = [];
     baseRanges.forEach(range => {
@@ -1256,6 +1259,7 @@ function buildEvaluationContext(params) {
     evaluatedAtMs: evaluatedAt,
     resourceIdSet: params.resourceIds?.length ? new Set(params.resourceIds.map(String)) : null,
     selectionsByGroupKey,
+    useExactDurationCandidateMinute: params.useExactDurationCandidateMinute === true,
     allowExcludedScheduleDateOverride: params.allowExcludedScheduleDateOverride === true
   };
 }
@@ -1663,6 +1667,7 @@ function queryAvailabilityProjection(projection, request, runtimeOptions = {}) {
     projection,
     evaluatedAt,
     resourceIds: request.resourceIds,
+    useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
     allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
   });
   if (request.target === 'time') {
@@ -1738,6 +1743,7 @@ function queryAvailabilityProjection(projection, request, runtimeOptions = {}) {
     partySize: normalizedPartySize
   }, {
     evaluatedAt,
+    useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
     allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
   });
   const candidateGroupMap = new Map(candidateGroups.map(group => [String(group.productId), group]));
@@ -1910,6 +1916,7 @@ function validateAvailabilitySelection(projection, params, runtimeOptions = {})
       projection,
       evaluatedAt,
       requirementSelections: params.requirementSelections,
+      useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
       allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
     })
   });

package/lib/modules/ResourcePlanner/types.d.ts

@@ -250,6 +250,13 @@ export interface GetProductTimeRangesRequest {
 }
 export interface GetProductTimeRangesRuntimeOptions {
     evaluatedAt?: string;
+    /**
+     * Internal POS capability: fixed-duration candidates start from the stable
+     * context anchor's current minute instead of rounding up to ten minutes, and
+     * that minute remains selectable during before-start cutoff evaluation.
+     * Other callers keep the legacy alignment and strict second-level cutoff.
+     */
+    useExactDurationCandidateMinute?: boolean;
     /**
      * Internal POS capability: allow explicit duration/start overrides to append
      * a custom duration candidate for Session products. Fixed Session ranges are

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

@@ -229,6 +229,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
+    /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+    setPickupRef(buzzer: string): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;

package/lib/solution/BaseSales/index.js

@@ -1439,6 +1439,12 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     this.store.order.syncTempOrderNoteToRemote(orderId, note);
   }
+
+  /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+  setPickupRef(buzzer) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderBuzzer(buzzer);
+  }
   updateTempOrderShopDiscount(amount) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderShopDiscount(amount);

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 3 | 1 | 5 | 6 | 4;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -453,19 +453,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/UnifiedBookingSales/index.js

@@ -2873,6 +2873,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       } : {})
     }, {
       evaluatedAt: this.getAvailabilityRuntimeDateTime(),
+      useExactDurationCandidateMinute: isPosAvailabilityRequest,
       allowSessionCustomRanges: isPosAvailabilityRequest,
       allowExcludedScheduleDateOverride: isPosAvailabilityRequest
     }).map(group => ({
@@ -2891,6 +2892,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     this.assertContextualQueryFreshness(context, request);
     const isPosAvailabilityRequest = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
     const result = (0, _ResourcePlanner.queryAvailabilityProjection)(projectionEntry.projection, request, {
+      useExactDurationCandidateMinute: isPosAvailabilityRequest,
       allowExcludedScheduleDateOverride: isPosAvailabilityRequest
     });
     const contextVersion = context.activeVersion;
@@ -3149,6 +3151,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
           } : {})
         } : {})
       }, {
+        useExactDurationCandidateMinute: allowPosAvailabilityOverride,
         allowSessionCustomRanges: allowPosAvailabilityOverride,
         allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
       }).flatMap(group => group.ranges);
@@ -3172,6 +3175,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         partySize,
         bookingCount
       }, {
+        useExactDurationCandidateMinute: allowPosAvailabilityOverride,
         allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
       });
       if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(conflict => POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES.has(conflict.code))) {

package/package.json

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