@pisell/pisellos 0.10.28 → 0.10.30

package/dist/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -14,6 +14,7 @@
  * - 不在此处发明等价关系；UI 侧（ticketBooking）若需要别的字段，由 view-model 适配层做转换
  */
 import type { BaseSalesOrderProduct } from '../types';
+import type { OrderMetaList } from '../../../modules/Order/types';
 export interface ISalesDetailHeader {
     order_id: number | string | null;
     order_number?: string;
@@ -47,6 +48,7 @@ export interface ISalesDetailHeader {
     schedule_date?: string;
     created_at?: string;
     updated_at?: string | number;
+    order_meta_list?: OrderMetaList;
     metadata?: Record<string, any> | null;
     total_amount?: string | number;
     [key: string]: any;

package/dist/solution/BaseSales/utils/parseSalesResponse.js

@@ -25,7 +25,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 
 import { normalizeOrderCollections } from "../../../modules/Order/utils/orderCollectionIdentity";
 /** OrderData 中除大数组外的"顶层 header 字段"白名单，按需扩展。 */
-var HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
+var HEADER_KEYS = ['order_id', 'order_number', 'shop_order_number', 'shop_full_order_number', 'type', 'business_code', 'platform', 'sales_channel', 'order_sales_channel', 'vouchers', 'status', 'payment_status', 'shipping_status', 'customer_id', 'customer_name', 'country_calling_code', 'phone', 'email', 'is_price_include_tax', 'tax_title', 'tax_country_code', 'currency_code', 'currency_symbol', 'currency_format', 'is_deposit', 'deposit_amount', 'shop_discount', 'surcharge_fee', 'note', 'schedule_date', 'created_at', 'updated_at', 'order_meta_list', 'metadata', 'total_amount', 'shop_id', 'create_date', 'holder', 'relation_forms', 'contacts', 'contacts_info'];
 function pickHeader(raw) {
   var _raw$order_id;
   var header = {

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -260,8 +260,9 @@ export function transformBaseProductToOrderProduct(params) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
   // 从源头补充商品多语言标题
-  var productTitle = _objectSpread(_objectSpread({}, (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {}), {}, {
-    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
+  var productTitleI18n = (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {};
+  var productTitle = _objectSpread(_objectSpread({}, productTitleI18n), {}, {
+    original: productTitleI18n.original || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
   return _objectSpread(_objectSpread({
     product_id: productId,

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 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,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/Sales/index.d.ts

@@ -105,6 +105,13 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+    private sortUnpaidBookings;
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+    private buildUnpaidBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）

package/dist/solution/Sales/index.js

@@ -760,6 +760,64 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
     }
 
+    /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
+  }, {
+    key: "sortUnpaidBookings",
+    value: function sortUnpaidBookings(bookings, currentBookings) {
+      var _this4 = this;
+      var currentOrderIndexes = new Map(currentBookings.map(function (booking, index) {
+        return [String(booking.order.order_id), index];
+      }));
+      return _toConsumableArray(bookings).sort(function (left, right) {
+        var leftIndex = currentOrderIndexes.get(String(left.order.order_id));
+        var rightIndex = currentOrderIndexes.get(String(right.order.order_id));
+        if (leftIndex !== undefined || rightIndex !== undefined) {
+          if (leftIndex === undefined) return 1;
+          if (rightIndex === undefined) return -1;
+          return leftIndex - rightIndex;
+        }
+        var leftStartAt = _this4.toBookingDateTime(left.start_date, left.start_time).valueOf();
+        var rightStartAt = _this4.toBookingDateTime(right.start_date, right.start_time).valueOf();
+        return rightStartAt - leftStartAt;
+      });
+    }
+
+    /**
+     * 构造资源详情的 Unpaid 列表：复用旧版当前/未来订单的展示计算，再补齐被预约状态/时间漏掉的欠款订单。
+     * Unpaid 的成员资格由调用方按付款状态筛好；这里仅负责展示字段与顺序。
+     */
+  }, {
+    key: "buildUnpaidBookings",
+    value: function buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, currentBookings) {
+      var _this5 = this;
+      var legacyPrioritizedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
+        includeAllFuture: true
+      });
+      var allBookings = this.sortMatchedBookings(unpaidBookingList.map(function (booking) {
+        var normalized = _this5.normalizeMatchedBooking(current, deviceCurrent, booking, {
+          includeCompleted: true
+        });
+        if (normalized) return normalized;
+        var appointmentStatus = _this5.getBookingAppointmentStatus(booking);
+        var status = appointmentStatus === 'started' ? 'occupied' : appointmentStatus === 'completed' ? 'completed' : 'reserved';
+        return _objectSpread(_objectSpread({}, booking), {}, {
+          status: status,
+          isTimeout: false,
+          timeoutTime: undefined,
+          progressPercent: undefined,
+          lateTime: undefined,
+          reserved_status: undefined,
+          remainingReserveTime: undefined
+        });
+      }));
+      var legacyOrderIds = new Set(legacyPrioritizedBookings.map(function (booking) {
+        return String(booking.order.order_id);
+      }));
+      return this.sortUnpaidBookings([].concat(_toConsumableArray(legacyPrioritizedBookings), _toConsumableArray(allBookings.filter(function (booking) {
+        return !legacyOrderIds.has(String(booking.order.order_id));
+      }))), currentBookings);
+    }
+
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -771,7 +829,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
-      var _this4 = this;
+      var _this6 = this;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       if (bookings.length === 0) return [];
       var _this$getOperatingDay = this.getOperatingDayRange(current),
@@ -780,17 +838,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 仅保留与 current 所属营业日窗口有时间交集的预约，避免跨营业日误命中
       var dayScopedBookings = bookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this6.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return startAt.isBefore(operatingDayEndExclusive) && _this4.isSameOrAfter(endAt, operatingDayStart);
+        return startAt.isBefore(operatingDayEndExclusive) && _this6.isSameOrAfter(endAt, operatingDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
         if (selectedBookings.length === 0) return selectedBookings;
         if (options.includeAllFuture) {
           var allFutureBookings = dayScopedBookings.filter(function (booking) {
-            var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+            var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
             return startAt.isValid() && startAt.isAfter(current);
           });
           return [].concat(_toConsumableArray(selectedBookings), _toConsumableArray(allFutureBookings));
@@ -800,21 +858,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!shouldAppendNextGroup) return selectedBookings;
         var selectedStartValues = new Set(selectedBookings.map(function (booking) {
-          return _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          return _this6.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 = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.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 = _this4.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartAt = _this6.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
         var nextStartGroup = futureCandidates.filter(function (booking) {
-          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
@@ -826,10 +884,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this6.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this4.isSameOrAfter(current, startAt) && _this4.isSameOrBefore(current, endAt);
+        return _this6.isSameOrAfter(current, startAt) && _this6.isSameOrBefore(current, endAt);
       });
       if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
@@ -841,14 +899,14 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
-        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.isValid() && startAt.isAfter(current);
       });
       if (upcoming.length > 0) {
         if (options.includeAllFuture) return upcoming;
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
-          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this6.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
         return appendNextStartGroupIfNeeded(upcomingStartGroup);
@@ -901,10 +959,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceBookings",
     value: function normalizeResourceBookings(current, deviceCurrent, bookingList) {
-      var _this5 = this;
+      var _this7 = this;
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var normalizedBookings = bookingList.map(function (booking) {
-        return _this5.normalizeMatchedBooking(current, deviceCurrent, booking, options);
+        return _this7.normalizeMatchedBooking(current, deviceCurrent, booking, options);
       }).filter(function (booking) {
         return Boolean(booking);
       }).filter(function (booking) {
@@ -1034,7 +1092,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
-          _this6 = this;
+          _this8 = this;
         var bookingList,
           deviceTime,
           current,
@@ -1090,16 +1148,16 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               rawBookingMap = this.groupBookingsByResource(bookingList);
               bookingMap = this.groupBookingsByResource(normalizedBookings); // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
               list = resourceList.map(function (resource) {
-                var resourceId = _this6.getResourceId(resource);
+                var resourceId = _this8.getResourceId(resource);
                 var rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
                 var statsBookings = rawMatchedBookings.filter(function (booking) {
-                  return _this6.isBookingIncludedInStats(booking);
+                  return _this8.isBookingIncludedInStats(booking);
                 });
-                var orderCount = _this6.countBookingOrders(statsBookings);
+                var orderCount = _this8.countBookingOrders(statsBookings);
                 var bookingCount = statsBookings.length;
-                var compeleteBookingCount = _this6.countCompletedBookings(statsBookings);
-                var bookings = _this6.pickBookingsForCurrentPoint(current, matchedBookings);
+                var compeleteBookingCount = _this8.countCompletedBookings(statsBookings);
+                var bookings = _this8.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
                   orderCount: orderCount,
@@ -1136,7 +1194,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
         var _resourceResponse$dat3,
           _resourceResponse$dat4,
-          _this7 = this,
+          _this9 = this,
           _params$bookingList;
         var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, statsBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
@@ -1176,7 +1234,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context9.abrupt("return", null);
             case 12:
               targetResource = resourceList.find(function (resource) {
-                return String(_this7.getResourceId(resource)) === String(params.resourceId);
+                return String(_this9.getResourceId(resource)) === String(params.resourceId);
               });
               if (targetResource) {
                 _context9.next = 15;
@@ -1186,18 +1244,18 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 15:
               resourceId = this.getResourceId(targetResource);
               matchedBookingList = params.bookingList.filter(function (booking) {
-                return _this7.isBookingMatchedResource(booking, resourceId);
+                return _this9.isBookingMatchedResource(booking, resourceId);
               });
               statsBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.isBookingIncludedInStats(booking);
+                return _this9.isBookingIncludedInStats(booking);
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.getBookingAppointmentStatus(booking) === 'completed';
+                return _this9.getBookingAppointmentStatus(booking) === 'completed';
               }); // const unpaidBookingList = matchedBookingList.filter(
               //   (booking) => this.getBookingOrderPaymentStatus(booking) === 'unpaid' || this.getBookingOrderPaymentStatus(booking) === 'payment_processing',
               // );
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.isUnpaidBooking(booking);
+                return _this9.isUnpaidBooking(booking);
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
                 includeAllFuture: true
@@ -1213,9 +1271,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   remainingReserveTime: undefined
                 });
               });
-              unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
-                includeAllFuture: true
-              });
+              unpaidBookings = this.buildUnpaidBookings(current, deviceCurrent, unpaidBookingList, bookings);
               orderCount = this.countBookingOrders(statsBookingList);
               bookingCount = statsBookingList.length;
               compeleteBookingCount = this.countCompletedBookings(statsBookingList);

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

@@ -123,8 +123,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/dist/solution/UnifiedBookingSales/index.js

@@ -44,7 +44,7 @@ import { UnifiedBookingSalesHooks } from "./types";
 import { AvailabilityRemoteOccupancyCache } from "./remoteOccupancyCache";
 import { BookingTicket } from "../BookingTicket";
 import { addLocalCalendarDays, captureRuntimeOffsetMinutes, formatLocalDate, formatLocalDateTime, formatLocalTime, localDateTimeToScalar, localDateToScalar, localDateToScalarStart, parseLocalDate, parseLocalDateTime } from "../../modules/ResourcePlanner/localClock";
-import { isCustomerUserPlatform } from "../../utils/platform";
+import { isCustomerUserPlatform, normalizeRuntimePlatform } from "../../utils/platform";
 export * from "./types";
 export { AvailabilityError } from "../../modules/ResourcePlanner";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'basic', 'checkout', 'availability', 'documents'];
@@ -1098,6 +1098,7 @@ var POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cuto
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
 'missing_resource']);
+var POS_NO_RESOURCE_ID = 0;
 function matchesForcedSelectionGroup(selection, group) {
   var hasGroupId = typeof selection.requirementGroupId === 'string' && selection.requirementGroupId.trim().length > 0;
   var hasFormId = selection.formId !== undefined && selection.formId !== null;
@@ -1183,7 +1184,21 @@ function buildPosForcedAvailabilityAssignments(params) {
       return;
     }
     selectedResourceIds.forEach(function (resourceId) {
-      var _group$resourceIds2, _group$formId, _candidate$primarySch5, _candidate$primarySch6;
+      var _group$resourceIds2, _group$formId2, _candidate$primarySch7, _candidate$primarySch8;
+      if (sameAvailabilityId(resourceId, POS_NO_RESOURCE_ID)) {
+        var _group$formId, _candidate$primarySch5, _candidate$primarySch6;
+        assignments.push({
+          productId: product.id,
+          resourceId: POS_NO_RESOURCE_ID,
+          formId: (_group$formId = group.formId) !== null && _group$formId !== void 0 ? _group$formId : selection.formId,
+          startAt: candidate.bookingStartAt || candidate.startAt,
+          endAt: candidate.bookingEndAt || candidate.endAt,
+          capacityRequired: Math.max(1, partySize),
+          scheduleId: (_candidate$primarySch5 = candidate.primaryScheduleRef) === null || _candidate$primarySch5 === void 0 ? void 0 : _candidate$primarySch5.scheduleId,
+          timeSlotId: (_candidate$primarySch6 = candidate.primaryScheduleRef) === null || _candidate$primarySch6 === void 0 ? void 0 : _candidate$primarySch6.timeSlotId
+        });
+        return;
+      }
       var resource = resources.find(function (item) {
         return sameAvailabilityId(item.id, resourceId);
       });
@@ -1201,12 +1216,12 @@ function buildPosForcedAvailabilityAssignments(params) {
       assignments.push({
         productId: product.id,
         resourceId: resourceId,
-        formId: (_group$formId = group.formId) !== null && _group$formId !== void 0 ? _group$formId : resource.formId,
+        formId: (_group$formId2 = group.formId) !== null && _group$formId2 !== void 0 ? _group$formId2 : resource.formId,
         startAt: candidate.bookingStartAt || candidate.startAt,
         endAt: candidate.bookingEndAt || candidate.endAt,
         capacityRequired: Math.max(1, partySize),
-        scheduleId: (_candidate$primarySch5 = candidate.primaryScheduleRef) === null || _candidate$primarySch5 === void 0 ? void 0 : _candidate$primarySch5.scheduleId,
-        timeSlotId: (_candidate$primarySch6 = candidate.primaryScheduleRef) === null || _candidate$primarySch6 === void 0 ? void 0 : _candidate$primarySch6.timeSlotId
+        scheduleId: (_candidate$primarySch7 = candidate.primaryScheduleRef) === null || _candidate$primarySch7 === void 0 ? void 0 : _candidate$primarySch7.scheduleId,
+        timeSlotId: (_candidate$primarySch8 = candidate.primaryScheduleRef) === null || _candidate$primarySch8 === void 0 ? void 0 : _candidate$primarySch8.timeSlotId
       });
     });
   });
@@ -1815,15 +1830,17 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     }
 
     /**
-     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
      */
   }, {
     key: "shouldUseCheckoutSyncTask",
     value: function shouldUseCheckoutSyncTask() {
-      var _this$otherParams13;
+      var _this$otherParams13, _this$otherParams14;
       var configured = (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.checkoutSyncTaskEnabled;
-      return typeof configured === 'boolean' ? configured : false;
+      if (configured === true) return true;
+      var platform = normalizeRuntimePlatform((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.platform);
+      return platform !== 'h5' && platform !== 'kiosk';
     }
 
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
@@ -1977,8 +1994,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
   }, {
     key: "isAuthenticatedCustomerUserPlatform",
     value: function isAuthenticatedCustomerUserPlatform() {
-      var _this$otherParams14;
-      return isCustomerUserPlatform((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.platform);
+      var _this$otherParams15;
+      return isCustomerUserPlatform((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.platform);
     }
   }, {
     key: "resolveDiscountOrderIdentity",
@@ -2168,13 +2185,13 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "getOpenData",
     value: function () {
       var _getOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        var _this$otherParams15, _this$otherParams16;
+        var _this$otherParams16, _this$otherParams17;
         var businessCode, channel;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              businessCode = String(((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode) || '').trim();
-              channel = String(((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.channel) || '').trim();
+              businessCode = String(((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.businessCode) || '').trim();
+              channel = String(((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.channel) || '').trim();
               if (!(!businessCode || !channel)) {
                 _context12.next = 4;
                 break;
@@ -2267,9 +2284,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
   }, {
     key: "isInvoiceOpenDataCacheCurrent",
     value: function isInvoiceOpenDataCacheCurrent() {
-      var _this$otherParams17, _this$otherParams18;
-      var businessCode = String(((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.businessCode) || '').trim();
-      var channel = String(((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.channel) || '').trim();
+      var _this$otherParams18, _this$otherParams19;
+      var businessCode = String(((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) || '').trim();
+      var channel = String(((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.channel) || '').trim();
       if (!businessCode || !channel) return false;
       return this.openDataTarget === "".concat(businessCode, "+").concat(channel);
     }
@@ -4266,7 +4283,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     value: (function () {
       var _getProductTimeRanges = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(contextId) {
         var _this$otherParams$pla,
-          _this$otherParams19,
+          _this$otherParams20,
           _this9 = this;
         var request,
           _yield$this$ensureAva,
@@ -4287,7 +4304,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               context = _yield$this$ensureAva.context;
               projectionEntry = _yield$this$ensureAva.projectionEntry;
               contextVersion = context.activeVersion;
-              isPosAvailabilityRequest = String((_this$otherParams$pla = (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos';
+              isPosAvailabilityRequest = String((_this$otherParams$pla = (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos';
               allowOutsideOperatingHoursForRequestedStartTimes = isPosAvailabilityRequest && Object.values(request.durationStartTimesByProductId || {}).some(function (startTimes) {
                 return Array.isArray(startTimes) && startTimes.length > 0;
               });
@@ -4439,7 +4456,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "commitAvailabilitySelection",
     value: (function () {
       var _commitAvailabilitySelection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(contextId, params) {
-        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla2, _this$otherParams20, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
+        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla2, _this$otherParams21, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
         return _regeneratorRuntime().wrap(function _callee39$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -4669,7 +4686,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
               candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
               candidateStartTime = getCandidateStartTime(params.candidate);
-              allowPosAvailabilityOverride = String((_this$otherParams$pla2 = (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
+              allowPosAvailabilityOverride = String((_this$otherParams$pla2 = (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
               refreshedRanges = getProjectionProductTimeRanges(refreshedProjection, _objectSpread({
                 productIds: [params.candidate.productId],
                 dateRange: {

package/lib/core/index.d.ts

@@ -12,8 +12,15 @@ declare class PisellOSCore implements PisellCore {
     context: BusinessContext;
     server: any;
     serverOptions?: ServerOptions;
+    private serverModulePromise?;
     constructor(options?: PisellOSOptions);
     private initialize;
+    /**
+     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
+     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
+     */
+    preloadServerModule(): Promise<void>;
+    private loadServerModule;
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取

package/lib/core/index.js

@@ -20,7 +20,7 @@ class PisellOSCore {
   context = {};
   server; // Server 实例
   serverOptions; // 保存 Server 配置
-
+  serverModulePromise;
   constructor(options) {
     this.debug = options?.debug || false;
     this.context = options?.context || {};
@@ -45,6 +45,24 @@ class PisellOSCore {
     this.log('[PisellOS] 核心初始化完成');
   }
 
+  /**
+   * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
+   * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
+   */
+  async preloadServerModule() {
+    if (this.server || !this.serverOptions) return;
+    await this.loadServerModule();
+  }
+  loadServerModule() {
+    if (!this.serverModulePromise) {
+      this.serverModulePromise = Promise.resolve().then(() => _interopRequireWildcard(require("../server"))).catch(error => {
+        this.serverModulePromise = undefined;
+        throw error;
+      });
+    }
+    return this.serverModulePromise;
+  }
+
   /**
    * 初始化 Server（公开方法，需要外部显式调用并等待）
    * Server 配置从构造函数传入的 options.server 中获取
@@ -63,7 +81,7 @@ class PisellOSCore {
     }
     try {
       // 动态导入 Server 类以避免循环依赖
-      const ServerModule = await Promise.resolve().then(() => _interopRequireWildcard(require("../server")));
+      const ServerModule = await this.loadServerModule();
       const Server = ServerModule.default;
 
       // 创建 Server 实例

package/lib/model/strategy/adapter/dataVariant/evaluator.js

@@ -364,15 +364,25 @@ class DataVariantEvaluator {
     if (!appliedInfo?.appliedFields?.length) {
       return originalItem;
     }
+
+    // 套餐加价/减价使用配置价；仅商品原价模式跟随子商品的 Data Variant 价格。
+    const isOriginalPriceBundleItem = originalItem.price_type === 'markup' && originalItem.price_type_ext === 'product_price';
+    const appliedFields = appliedInfo.appliedFields.filter(field => field !== 'price' || isOriginalPriceBundleItem);
+    if (!appliedFields.length) {
+      return originalItem;
+    }
     const result = {
       ...originalItem
     };
-    for (const field of appliedInfo.appliedFields) {
+    for (const field of appliedFields) {
       if (resolvedItem[field] !== undefined) {
         result[field] = resolvedItem[field];
       }
     }
-    result._dataVariant = appliedInfo;
+    result._dataVariant = {
+      ...appliedInfo,
+      appliedFields
+    };
     return result;
   }
   evaluateProductRules(rule, product, businessData, menuScopeMap) {

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; }