@pisell/pisellos 2.3.87 → 2.3.89

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

@@ -191,6 +191,8 @@ export interface OrderLocalizedText {
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     bundle_edit?: number;
     product_sku: OrderProductSku;
     gift_card?: number;

package/dist/modules/Order/utils.js

@@ -868,6 +868,7 @@ function formatSubmitBundleItems(bundle) {
     return {
       is_charge_tax: (_rawBundle$is_charge_ = rawBundle.is_charge_tax) !== null && _rawBundle$is_charge_ !== void 0 ? _rawBundle$is_charge_ : 0,
       bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0,
+      production_code: rawBundle.production_code,
       num: num,
       quantity: toBundleNumber((_rawBundle$quantity = rawBundle.quantity) !== null && _rawBundle$quantity !== void 0 ? _rawBundle$quantity : rawBundle.num, num),
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,

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

@@ -77,6 +77,8 @@ export interface ProductData {
     is_gst: number;
     /** 商品编码 */
     code: string;
+    /** ERP/生产侧商品编码；有规格时以选中 Variant 的值为准 */
+    production_code?: string;
     /** 商品条码 */
     barcode: string;
     /** 是否支持配送 */

package/dist/modules/ResourcePlanner/planner.js

@@ -52,6 +52,23 @@ function normalizeBookingCount(bookingCount) {
   }
   return normalized;
 }
+function resolveRequestedDurationMinutes(product, request) {
+  var _request$durationMinu;
+  var configured = Math.max(1, Number(product.durationMinutes || 30) || 30);
+  if (product.kind !== 'duration') return configured;
+  var override = (_request$durationMinu = request.durationMinutesByProductId) === null || _request$durationMinu === void 0 ? void 0 : _request$durationMinu[String(product.id)];
+  var normalized = Number(override);
+  return Number.isInteger(normalized) && normalized > 0 ? normalized : configured;
+}
+function resolveRequestedDurationStartTimes(product, request) {
+  var _request$durationStar;
+  if (product.kind !== 'duration') return [];
+  var values = (_request$durationStar = request.durationStartTimesByProductId) === null || _request$durationStar === void 0 ? void 0 : _request$durationStar[String(product.id)];
+  if (!Array.isArray(values)) return [];
+  return Array.from(new Set(values.filter(function (value) {
+    return typeof value === 'string' && /^([01]\d|2[0-3]):[0-5]\d$/.test(value);
+  })));
+}
 function toDateTime(value, _timezoneName) {
   try {
     return localDateTimeToScalar(parseLocalDateTime(value));
@@ -962,11 +979,29 @@ function dedupeProductRanges(ranges) {
     return left.startAt.localeCompare(right.startAt);
   });
 }
+function createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes) {
+  var bookingEnd = addMinutesZoned(start, durationMinutes, projection.meta.timezone);
+  return {
+    key: "".concat(String(product.id), ":").concat(start, ":").concat(bookingEnd),
+    productId: product.id,
+    source: 'duration_window',
+    startAt: formatDateTime(start, projection.meta.timezone, fixedOffsetMinutes),
+    endAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
+    bookingStartAt: formatDateTime(start, projection.meta.timezone, fixedOffsetMinutes),
+    bookingEndAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
+    date: formatDate(start, projection.meta.timezone),
+    startTime: formatTime(start, projection.meta.timezone),
+    endTime: formatTime(bookingEnd, projection.meta.timezone),
+    timezone: projection.meta.timezone,
+    scheduleRefs: []
+  };
+}
 export function getProductTimeRanges(projection) {
   var _extractFixedOffsetMi3, _request$productIds;
   var request = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var normalizedPartySize = normalizePartySize(request.partySize);
   var dateRange = resolveProjectionDateRange(projection, request.dateRange);
+  var slotStepMinutes = projection.meta.defaults.slotStepMinutes;
   var fixedOffsetMinutes = (_extractFixedOffsetMi3 = extractFixedOffsetMinutes(projection.meta.now)) !== null && _extractFixedOffsetMi3 !== void 0 ? _extractFixedOffsetMi3 : captureRuntimeOffsetMinutes();
   var resourceWindowIndex = buildResourceWindowIndex(projection);
   var filteredProductIdSet = (_request$productIds = request.productIds) !== null && _request$productIds !== void 0 && _request$productIds.length ? new Set(request.productIds.map(String)) : null;
@@ -978,6 +1013,7 @@ export function getProductTimeRanges(projection) {
         productId: product.id,
         title: product.title,
         kind: product.kind,
+        slotStepMinutes: slotStepMinutes,
         ranges: []
       };
     }
@@ -986,6 +1022,7 @@ export function getProductTimeRanges(projection) {
         productId: product.id,
         title: product.title,
         kind: product.kind,
+        slotStepMinutes: slotStepMinutes,
         ranges: getSessionRangesForProduct(projection, product, dateRange)
       };
     }
@@ -1007,9 +1044,9 @@ export function getProductTimeRanges(projection) {
       return current === null ? ranges : intersectRangeLists(current, ranges);
     }, null) || [] : null;
     var baseRanges = resourceRanges === null ? operatingRanges : intersectRangeLists(resourceRanges, operatingRanges);
-    var durationMinutes = Math.max(1, Number(product.durationMinutes || 30) || 30);
-    var timeSliceMinutes = projection.meta.defaults.slotStepMinutes;
+    var durationMinutes = resolveRequestedDurationMinutes(product, request);
     var durationAnchor = ceilToTenMinutes(toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone), projection.meta.timezone);
+    var requestedStartTimes = resolveRequestedDurationStartTimes(product, request);
     var ranges = [];
     baseRanges.forEach(function (range) {
       if (range.end <= durationAnchor) return;
@@ -1022,28 +1059,28 @@ export function getProductTimeRanges(projection) {
         if (bookingEnd > range.end) break;
         var bookingDate = formatDate(cursor);
         if (bookingDate >= dateRange.startDate && bookingDate <= dateRange.endDate) {
-          ranges.push({
-            key: "".concat(String(product.id), ":").concat(cursor, ":").concat(bookingEnd),
-            productId: product.id,
-            source: 'duration_window',
-            startAt: formatDateTime(cursor, projection.meta.timezone, fixedOffsetMinutes),
-            endAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
-            bookingStartAt: formatDateTime(cursor, projection.meta.timezone, fixedOffsetMinutes),
-            bookingEndAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
-            date: formatDate(cursor, projection.meta.timezone),
-            startTime: formatTime(cursor, projection.meta.timezone),
-            endTime: formatTime(bookingEnd, projection.meta.timezone),
-            timezone: projection.meta.timezone,
-            scheduleRefs: []
-          });
+          ranges.push(createDurationTimeRange(product, cursor, durationMinutes, projection, fixedOffsetMinutes));
         }
-        cursor = addMinutesZoned(cursor, timeSliceMinutes, projection.meta.timezone);
+        cursor = addMinutesZoned(cursor, slotStepMinutes, projection.meta.timezone);
       }
     });
+    if (dateRange.startDate === dateRange.endDate && requestedStartTimes.length > 0) {
+      requestedStartTimes.forEach(function (startTime) {
+        var start = toDateTimeInDate(dateRange.startDate, startTime, projection.meta.timezone);
+        if (!Number.isFinite(start)) return;
+        var end = addMinutesZoned(start, durationMinutes, projection.meta.timezone);
+        var startsInOperatingRange = operatingRanges.some(function (range) {
+          return range.start <= start && start < range.end;
+        });
+        if (!startsInOperatingRange) return;
+        ranges.push(createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes));
+      });
+    }
     return {
       productId: product.id,
       title: product.title,
       kind: product.kind,
+      slotStepMinutes: slotStepMinutes,
       ranges: dedupeProductRanges(ranges)
     };
   });

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

@@ -211,6 +211,7 @@ export interface ProductTimeRangeGroup {
     productId: AvailabilityId;
     title?: string;
     kind: AvailabilityProductKind;
+    slotStepMinutes?: number;
     ranges: ProductTimeRange[];
 }
 export interface AvailabilityAssignment extends AvailabilityAbsoluteRange {
@@ -231,6 +232,8 @@ export interface GetProductTimeRangesRequest {
     dateRange?: Partial<AvailabilityDateRange>;
     resourceIds?: AvailabilityId[];
     partySize?: number;
+    durationMinutesByProductId?: Record<string, number>;
+    durationStartTimesByProductId?: Record<string, string[]>;
 }
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];

package/dist/modules/Rules/index.js

@@ -2223,7 +2223,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkPackageSubItemUsageRules",
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
-      var _flatItem$product;
+      var _flatItem$product, _flatItem$originProdu, _flatItem$parentProdu10;
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
       var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
@@ -2236,7 +2236,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
       var _ref18 = packageScope || {},
-        scopeType = _ref18.type,
+        _ref18$type = _ref18.type,
+        scopeType = _ref18$type === void 0 ? 'product_all' : _ref18$type,
         _ref18$exclude_bundle = _ref18.exclude_bundle_product_ids,
         exclude_bundle_product_ids = _ref18$exclude_bundle === void 0 ? [] : _ref18$exclude_bundle,
         _ref18$include_bundle = _ref18.include_bundle_product_ids,
@@ -2246,6 +2247,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
       var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;
+      // 主商品id
+      var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2258,12 +2261,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11;
           // 套餐中购买时，判断是否为原价
           var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
           var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
           // 主商品id
-          var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
+          // const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -2288,13 +2291,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2357,13 +2360,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 _isScopeValid = true;
               } else {
-                _isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                _isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              _isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用

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

@@ -112,6 +112,8 @@ export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrde
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: BaseSalesProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

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

@@ -3,6 +3,7 @@ import type { ProductData } from '../../../modules/Product/types';
 export interface BaseProductDetailOptionItem {
     option_group_item_id?: number | string;
     option_group_id?: number | string;
+    production_code?: string;
     num?: number | string;
     quantity?: number | string;
     price?: number | string;
@@ -10,6 +11,7 @@ export interface BaseProductDetailOptionItem {
     [key: string]: any;
 }
 export interface BaseProductDetailBundleItem {
+    production_code?: string;
     option?: BaseProductDetailOptionItem[];
     [key: string]: any;
 }
@@ -18,6 +20,7 @@ export interface BaseProductDetailPayload {
     product_id?: number | string | null;
     variant_id?: number | string | null;
     product_variant_id?: number | string | null;
+    production_code?: string;
     quantity?: number | string;
     num?: number | string;
     option?: BaseProductDetailOptionItem[];

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

@@ -30,6 +30,10 @@ function toPriceString(value) {
   if (!Number.isFinite(parsedValue)) return fallback;
   return parsedValue.toFixed(2);
 }
+function normalizeProductionCode(value) {
+  if (value === undefined || value === null) return '';
+  return String(value).trim();
+}
 function isBlankValue(value) {
   return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
 }
@@ -104,7 +108,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _origin$production_co, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -116,6 +120,7 @@ export function transformBaseProductToOrderProduct(params) {
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
+  var productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.production_code : (_origin$production_co = origin === null || origin === void 0 ? void 0 : origin.production_code) !== null && _origin$production_co !== void 0 ? _origin$production_co : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.production_code);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
   // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
@@ -198,6 +203,7 @@ export function transformBaseProductToOrderProduct(params) {
   return _objectSpread(_objectSpread({
     product_id: productId,
     product_variant_id: productVariantId,
+    production_code: productionCode,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
     num: resolvedQuantity,
     product_sku: _objectSpread(_objectSpread({}, payload.product_sku && _typeof(payload.product_sku) === 'object' ? payload.product_sku : {}), {}, {

package/dist/solution/BaseSales/utils.js

@@ -256,11 +256,14 @@ export function normalizeOrderProduct(product) {
     sellingPrice: composedSellingPrice,
     quantity: getSafeProductNum(product.num)
   });
-  return {
+  return _objectSpread(_objectSpread({
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
-    product_variant_id: product.product_variant_id,
+    product_variant_id: product.product_variant_id
+  }, product.production_code !== undefined && product.production_code !== null ? {
+    production_code: String(product.production_code).trim()
+  } : {}), {}, {
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: finalOriginalPrice,
@@ -270,5 +273,5 @@ export function normalizeOrderProduct(product) {
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''
-  };
+  });
 }

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 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 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/BookingTicket/utils/addProductDecision.js

@@ -319,7 +319,7 @@ export function transformDetailToProductAndBooking(cacheItem, ctx) {
  * 把 cacheItem._extend.other 中的字段 + 顶层运行态拼成 `BaseProductDetailPayload`。
  */
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2;
+  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _other$production_cod, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2;
   var other = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.other) || {};
   var quantity = (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : (_cacheItem$_extend$qu = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.quantity) !== null && _cacheItem$_extend$qu !== void 0 ? _cacheItem$_extend$qu : 1;
   var resolvedPid = (_cacheItem$product_id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id) !== null && _cacheItem$product_id !== void 0 ? _cacheItem$product_id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id;
@@ -329,6 +329,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     id: (_cacheItem$id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id) !== null && _cacheItem$id !== void 0 ? _cacheItem$id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id,
     product_id: resolvedPid,
     variant_id: (_ref5 = (_other$product_varian = other === null || other === void 0 ? void 0 : other.product_variant_id) !== null && _other$product_varian !== void 0 ? _other$product_varian : other === null || other === void 0 ? void 0 : other.variant_id) !== null && _ref5 !== void 0 ? _ref5 : 0,
+    // SKUOptionsSelection 已按 Product / Variant 解析好主商品编码；显式空串也需保留。
+    production_code: (_other$production_cod = other === null || other === void 0 ? void 0 : other.production_code) !== null && _other$production_cod !== void 0 ? _other$production_cod : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.production_code,
     quantity: quantity,
     // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
     product_sku: productSku ? _objectSpread(_objectSpread({}, productSku), {}, {

package/dist/solution/ScanOrder/types.d.ts

@@ -44,6 +44,8 @@ export interface ScanOrderProductSku {
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

package/dist/solution/ScanOrder/utils.js

@@ -660,11 +660,14 @@ export function normalizeOrderProduct(product) {
     sellingPrice: composedSellingPrice,
     quantity: getSafeProductNum(product.num)
   });
-  return {
+  return _objectSpread(_objectSpread({
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
-    product_variant_id: product.product_variant_id,
+    product_variant_id: product.product_variant_id
+  }, product.production_code !== undefined && product.production_code !== null ? {
+    production_code: String(product.production_code).trim()
+  } : {}), {}, {
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: manualOriginalPrice,
@@ -674,7 +677,7 @@ export function normalizeOrderProduct(product) {
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''
-  };
+  });
 }
 
 /**

package/dist/solution/UnifiedBookingSales/index.js

@@ -52,6 +52,30 @@ function normalizePositiveInteger(value) {
   if (!Number.isInteger(normalized) || normalized <= 0) return undefined;
   return normalized;
 }
+function getCandidateDurationMinutes(candidate) {
+  var startAt = candidate.bookingStartAt || candidate.startAt;
+  var endAt = candidate.bookingEndAt || candidate.endAt;
+  try {
+    var start = localDateTimeToScalar(parseLocalDateTime(startAt));
+    var end = localDateTimeToScalar(parseLocalDateTime(endAt));
+    var minutes = Math.round((end - start) / 60000);
+    return Number.isInteger(minutes) && minutes > 0 ? minutes : undefined;
+  } catch (_error) {
+    return undefined;
+  }
+}
+function getCandidateStartTime(candidate) {
+  if (/^([01]\d|2[0-3]):[0-5]\d$/.test(candidate.startTime || '')) {
+    return candidate.startTime;
+  }
+  var startAt = candidate.bookingStartAt || candidate.startAt;
+  try {
+    var start = parseLocalDateTime(startAt);
+    return "".concat(String(start.hour).padStart(2, '0'), ":").concat(String(start.minute).padStart(2, '0'));
+  } catch (_error) {
+    return undefined;
+  }
+}
 function isRecord(value) {
   return !!value && _typeof(value) === 'object' && !Array.isArray(value);
 }
@@ -4332,7 +4356,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "commitAvailabilitySelection",
     value: (function () {
       var _commitAvailabilitySelection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(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$pla, _this$otherParams17, _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, refreshedRanges, refreshedCandidateBase, product, validation, allowPosAvailabilityOverride, 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$pla, _this$otherParams17, _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, refreshedRanges, refreshedCandidateBase, product, validation, allowPosAvailabilityOverride, 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 _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
             case 0:
@@ -4560,20 +4584,26 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               });
             case 67:
               this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
-              refreshedRanges = getProjectionProductTimeRanges(refreshedProjection, {
+              candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
+              candidateStartTime = getCandidateStartTime(params.candidate);
+              refreshedRanges = getProjectionProductTimeRanges(refreshedProjection, _objectSpread({
                 productIds: [params.candidate.productId],
                 dateRange: {
                   startDate: params.candidate.startAt.slice(0, 10),
                   endDate: params.candidate.startAt.slice(0, 10)
                 }
-              }).flatMap(function (group) {
+              }, candidateDurationMinutes ? _objectSpread({
+                durationMinutesByProductId: _defineProperty({}, String(params.candidate.productId), candidateDurationMinutes)
+              }, candidateStartTime ? {
+                durationStartTimesByProductId: _defineProperty({}, String(params.candidate.productId), [candidateStartTime])
+              } : {}) : {})).flatMap(function (group) {
                 return group.ranges;
               });
               refreshedCandidateBase = refreshedRanges.find(function (candidate) {
                 return candidate.startAt === params.candidate.startAt && candidate.endAt === params.candidate.endAt && candidate.bookingStartAt === params.candidate.bookingStartAt && candidate.bookingEndAt === params.candidate.bookingEndAt;
               });
               if (refreshedCandidateBase) {
-                _context37.next = 72;
+                _context37.next = 74;
                 break;
               }
               throw new AvailabilityError('REVALIDATION_FAILED', '缓存重校验后候选时间已不在商品配置中', {
@@ -4581,18 +4611,18 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 candidate: params.candidate,
                 refreshedSnapshotId: refreshedProjection.meta.snapshotId
               });
-            case 72:
+            case 74:
               product = refreshedProjection.products.find(function (item) {
                 return sameAvailabilityId(item.id, refreshedCandidateBase.productId);
               });
               if (product) {
-                _context37.next = 75;
+                _context37.next = 77;
                 break;
               }
               throw new AvailabilityError('REVALIDATION_FAILED', '缓存重校验后商品不在 projection 中', {
                 productId: refreshedCandidateBase.productId
               });
-            case 75:
+            case 77:
               validation = validateAvailabilitySelection(refreshedProjection, {
                 candidate: refreshedCandidateBase,
                 requirementSelections: params.requirementSelections,
@@ -4621,7 +4651,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 });
               }
               if (validation.ok) {
-                _context37.next = 81;
+                _context37.next = 83;
                 break;
               }
               capacityConflict = validation.conflicts.find(function (conflict) {
@@ -4631,7 +4661,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 validation: validation,
                 refreshedSnapshotId: refreshedProjection.meta.snapshotId
               });
-            case 81:
+            case 83:
               // Revalidation failure must leave the caller's candidate reusable. Only publish the
               // refreshed projection/version after candidate and resource validation has passed;
               // otherwise a second Confirm from the still-open modal would incorrectly become stale.
@@ -4644,7 +4674,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 incrementVersion: true
               });
               revalidatedContext = this.getAvailabilityContextEntry(normalizedContextId);
-              _context37.next = 85;
+              _context37.next = 87;
               return this.emitAvailabilityDiagnostic({
                 action: 'refresh',
                 contextId: normalizedContextId,
@@ -4655,7 +4685,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 previousOrderRevision: baseProjection.meta.orderRevision,
                 reason: 'commit_cached_occupancy_revalidation'
               });
-            case 85:
+            case 87:
               commitWriteGuard = {
                 contextId: normalizedContextId,
                 expectedVersion: revalidatedContext.activeVersion,
@@ -4667,13 +4697,13 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               existingBooking = editingLine ? this.findLinkedBooking(editingLine) : undefined;
               existingBookingUid = existingBooking ? getBookingUid(existingBooking) : '';
               if (!(params.mode === 'edit' && !existingBookingUid)) {
-                _context37.next = 91;
+                _context37.next = 93;
                 break;
               }
               throw new AvailabilityError('PRODUCT_LINE_NOT_FOUND', '编辑商品行缺少关联 booking', {
                 productLineUid: params.productLineUid
               });
-            case 91:
+            case 93:
               this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
               booking = buildBookingFromAvailabilitySelection({
                 assignments: validation.assignments,
@@ -4689,13 +4719,13 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 quantity: bookingCount
               }), 'unified_booking_sales', product);
               if (transformed) {
-                _context37.next = 96;
+                _context37.next = 98;
                 break;
               }
               throw new AvailabilityError('INVALID_TARGET_FILTER', 'orderProduct 无法转换为订单行', {
                 orderProduct: params.orderProduct
               });
-            case 96:
+            case 98:
               transformed.num = bookingCount;
               transformed.metadata = _objectSpread(_objectSpread({}, transformed.metadata || {}), {}, {
                 unified_booking_sales: true,
@@ -4708,7 +4738,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               productLineUids = [];
               bookingUids = [];
               if (!(params.mode === 'edit' && editingLine && params.productLineUid)) {
-                _context37.next = 115;
+                _context37.next = 117;
                 break;
               }
               transformed.product_sku = (_transformed$product_ = transformed.product_sku) !== null && _transformed$product_ !== void 0 ? _transformed$product_ : editingLine.product_sku;
@@ -4718,7 +4748,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 unique_identification_number: params.productLineUid,
                 booking_uid: existingBookingUid
               });
-              _context37.next = 109;
+              _context37.next = 111;
               return this.updateOrderProduct(_objectSpread(_objectSpread({
                 product_id: (_transformed$product_3 = transformed.product_id) !== null && _transformed$product_3 !== void 0 ? _transformed$product_3 : editingLine.product_id,
                 product_variant_id: (_ref50 = (_transformed$product_4 = transformed.product_variant_id) !== null && _transformed$product_4 !== void 0 ? _transformed$product_4 : editingLine.product_variant_id) !== null && _ref50 !== void 0 ? _ref50 : 0,
@@ -4730,23 +4760,23 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               } : {}), params.allowBookingDiscountReapply !== undefined ? {
                 allow_booking_discount_reapply: params.allowBookingDiscountReapply
               } : {}));
-            case 109:
+            case 111:
               productLineUid = params.productLineUid;
               bookingUid = existingBookingUid;
               productLineUids = [productLineUid];
               bookingUids = [bookingUid];
-              _context37.next = 127;
+              _context37.next = 129;
               break;
-            case 115:
+            case 117:
               beforeProductLineUids = new Set((((_this$getTempOrder4 = this.getTempOrder()) === null || _this$getTempOrder4 === void 0 ? void 0 : _this$getTempOrder4.products) || []).map(function (line) {
                 return getProductLineUid(line);
               }).filter(Boolean));
               beforeBookingUids = new Set((((_this$getTempOrder5 = this.getTempOrder()) === null || _this$getTempOrder5 === void 0 ? void 0 : _this$getTempOrder5.bookings) || []).map(function (item) {
                 return getBookingUid(item);
               }).filter(Boolean));
-              _context37.next = 119;
+              _context37.next = 121;
               return this.addProductToOrder(transformed, booking);
-            case 119:
+            case 121:
               products = _context37.sent;
               addedLines = products.filter(function (line) {
                 var _line$product_id, _line$metadata;
@@ -4770,7 +4800,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               }
               productLineUid = productLineUids[productLineUids.length - 1] || '';
               bookingUid = bookingUids[bookingUids.length - 1] || '';
-            case 127:
+            case 129:
               this.invalidateAvailabilityContextsAfterCommit();
               nextContext = this.getAvailabilityContextEntry(normalizedContextId);
               result = {
@@ -4784,21 +4814,21 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 productLineUids: productLineUids,
                 bookingUids: bookingUids
               };
-              _context37.next = 132;
+              _context37.next = 134;
               return this.core.effects.emit("".concat(this.name, ":").concat(UnifiedBookingSalesHooks.onAvailabilitySelectionCommitted), result);
-            case 132:
+            case 134:
               return _context37.abrupt("return", result);
-            case 133:
-              _context37.prev = 133;
-              _context37.next = 136;
+            case 135:
+              _context37.prev = 135;
+              _context37.next = 138;
               return this.releaseAvailabilityCommitLock(normalizedContextId);
-            case 136:
-              return _context37.finish(133);
-            case 137:
+            case 138:
+              return _context37.finish(135);
+            case 139:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[5,, 133, 137]]);
+        }, _callee37, this, [[5,, 135, 139]]);
       }));
       function commitAvailabilitySelection(_x32, _x33) {
         return _commitAvailabilitySelection.apply(this, arguments);

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/types.d.ts

@@ -191,6 +191,8 @@ export interface OrderLocalizedText {
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     bundle_edit?: number;
     product_sku: OrderProductSku;
     gift_card?: number;

package/lib/modules/Order/utils.js

@@ -909,6 +909,7 @@ function formatSubmitBundleItems(bundle) {
     return {
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
+      production_code: rawBundle.production_code,
       num,
       quantity: toBundleNumber(rawBundle.quantity ?? rawBundle.num, num),
       extension_id: rawBundle.extension_id ?? 0,

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

@@ -77,6 +77,8 @@ export interface ProductData {
     is_gst: number;
     /** 商品编码 */
     code: string;
+    /** ERP/生产侧商品编码；有规格时以选中 Variant 的值为准 */
+    production_code?: string;
     /** 商品条码 */
     barcode: string;
     /** 是否支持配送 */

package/lib/modules/ResourcePlanner/planner.js

@@ -48,6 +48,19 @@ function normalizeBookingCount(bookingCount) {
   }
   return normalized;
 }
+function resolveRequestedDurationMinutes(product, request) {
+  const configured = Math.max(1, Number(product.durationMinutes || 30) || 30);
+  if (product.kind !== 'duration') return configured;
+  const override = request.durationMinutesByProductId?.[String(product.id)];
+  const normalized = Number(override);
+  return Number.isInteger(normalized) && normalized > 0 ? normalized : configured;
+}
+function resolveRequestedDurationStartTimes(product, request) {
+  if (product.kind !== 'duration') return [];
+  const values = request.durationStartTimesByProductId?.[String(product.id)];
+  if (!Array.isArray(values)) return [];
+  return Array.from(new Set(values.filter(value => typeof value === 'string' && /^([01]\d|2[0-3]):[0-5]\d$/.test(value))));
+}
 function toDateTime(value, _timezoneName) {
   try {
     return (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(value));
@@ -865,9 +878,27 @@ function dedupeProductRanges(ranges) {
   });
   return Array.from(map.values()).sort((left, right) => left.startAt.localeCompare(right.startAt));
 }
+function createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes) {
+  const bookingEnd = addMinutesZoned(start, durationMinutes, projection.meta.timezone);
+  return {
+    key: `${String(product.id)}:${start}:${bookingEnd}`,
+    productId: product.id,
+    source: 'duration_window',
+    startAt: formatDateTime(start, projection.meta.timezone, fixedOffsetMinutes),
+    endAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
+    bookingStartAt: formatDateTime(start, projection.meta.timezone, fixedOffsetMinutes),
+    bookingEndAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
+    date: formatDate(start, projection.meta.timezone),
+    startTime: formatTime(start, projection.meta.timezone),
+    endTime: formatTime(bookingEnd, projection.meta.timezone),
+    timezone: projection.meta.timezone,
+    scheduleRefs: []
+  };
+}
 function getProductTimeRanges(projection, request = {}) {
   const normalizedPartySize = normalizePartySize(request.partySize);
   const dateRange = resolveProjectionDateRange(projection, request.dateRange);
+  const slotStepMinutes = projection.meta.defaults.slotStepMinutes;
   const fixedOffsetMinutes = (0, _localClock.extractFixedOffsetMinutes)(projection.meta.now) ?? (0, _localClock.captureRuntimeOffsetMinutes)();
   const resourceWindowIndex = buildResourceWindowIndex(projection);
   const filteredProductIdSet = request.productIds?.length ? new Set(request.productIds.map(String)) : null;
@@ -877,6 +908,7 @@ function getProductTimeRanges(projection, request = {}) {
         productId: product.id,
         title: product.title,
         kind: product.kind,
+        slotStepMinutes,
         ranges: []
       };
     }
@@ -885,6 +917,7 @@ function getProductTimeRanges(projection, request = {}) {
         productId: product.id,
         title: product.title,
         kind: product.kind,
+        slotStepMinutes,
         ranges: getSessionRangesForProduct(projection, product, dateRange)
       };
     }
@@ -900,9 +933,9 @@ function getProductTimeRanges(projection, request = {}) {
       resourceWindowIndex
     })).reduce((current, ranges) => current === null ? ranges : intersectRangeLists(current, ranges), null) || [] : null;
     const baseRanges = resourceRanges === null ? operatingRanges : intersectRangeLists(resourceRanges, operatingRanges);
-    const durationMinutes = Math.max(1, Number(product.durationMinutes || 30) || 30);
-    const timeSliceMinutes = projection.meta.defaults.slotStepMinutes;
+    const durationMinutes = resolveRequestedDurationMinutes(product, request);
     const durationAnchor = ceilToTenMinutes(toDateTime(projection.meta.durationCandidateAnchorAt, projection.meta.timezone), projection.meta.timezone);
+    const requestedStartTimes = resolveRequestedDurationStartTimes(product, request);
     const ranges = [];
     baseRanges.forEach(range => {
       if (range.end <= durationAnchor) return;
@@ -915,28 +948,26 @@ function getProductTimeRanges(projection, request = {}) {
         if (bookingEnd > range.end) break;
         const bookingDate = formatDate(cursor);
         if (bookingDate >= dateRange.startDate && bookingDate <= dateRange.endDate) {
-          ranges.push({
-            key: `${String(product.id)}:${cursor}:${bookingEnd}`,
-            productId: product.id,
-            source: 'duration_window',
-            startAt: formatDateTime(cursor, projection.meta.timezone, fixedOffsetMinutes),
-            endAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
-            bookingStartAt: formatDateTime(cursor, projection.meta.timezone, fixedOffsetMinutes),
-            bookingEndAt: formatDateTime(bookingEnd, projection.meta.timezone, fixedOffsetMinutes),
-            date: formatDate(cursor, projection.meta.timezone),
-            startTime: formatTime(cursor, projection.meta.timezone),
-            endTime: formatTime(bookingEnd, projection.meta.timezone),
-            timezone: projection.meta.timezone,
-            scheduleRefs: []
-          });
+          ranges.push(createDurationTimeRange(product, cursor, durationMinutes, projection, fixedOffsetMinutes));
         }
-        cursor = addMinutesZoned(cursor, timeSliceMinutes, projection.meta.timezone);
+        cursor = addMinutesZoned(cursor, slotStepMinutes, projection.meta.timezone);
       }
     });
+    if (dateRange.startDate === dateRange.endDate && requestedStartTimes.length > 0) {
+      requestedStartTimes.forEach(startTime => {
+        const start = toDateTimeInDate(dateRange.startDate, startTime, projection.meta.timezone);
+        if (!Number.isFinite(start)) return;
+        const end = addMinutesZoned(start, durationMinutes, projection.meta.timezone);
+        const startsInOperatingRange = operatingRanges.some(range => range.start <= start && start < range.end);
+        if (!startsInOperatingRange) return;
+        ranges.push(createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes));
+      });
+    }
     return {
       productId: product.id,
       title: product.title,
       kind: product.kind,
+      slotStepMinutes,
       ranges: dedupeProductRanges(ranges)
     };
   });

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

@@ -211,6 +211,7 @@ export interface ProductTimeRangeGroup {
     productId: AvailabilityId;
     title?: string;
     kind: AvailabilityProductKind;
+    slotStepMinutes?: number;
     ranges: ProductTimeRange[];
 }
 export interface AvailabilityAssignment extends AvailabilityAbsoluteRange {
@@ -231,6 +232,8 @@ export interface GetProductTimeRangesRequest {
     dateRange?: Partial<AvailabilityDateRange>;
     resourceIds?: AvailabilityId[];
     partySize?: number;
+    durationMinutesByProductId?: Record<string, number>;
+    durationStartTimesByProductId?: Record<string, string[]>;
 }
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];

package/lib/modules/Rules/index.js

@@ -1961,7 +1961,7 @@ class RulesModule extends _BaseModule.BaseModule {
     // 套餐适用范围配置
     const packageScope = usageRules?.package_scope;
     const {
-      type: scopeType,
+      type: scopeType = 'product_all',
       exclude_bundle_product_ids = [],
       include_bundle_product_ids = [],
       filter = 0
@@ -1969,6 +1969,8 @@ class RulesModule extends _BaseModule.BaseModule {
     const isMainProduct = flatItem.type === 'main'; // 单独购买
     const isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
     const bundleMainProductId = flatItem.product?.product_id;
+    // 主商品id
+    const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
 
     // 主商品直接可用
     if (isMainProduct) {
@@ -1985,7 +1987,7 @@ class RulesModule extends _BaseModule.BaseModule {
         const priceType = flatItem.bundleItem?.price_type;
         const priceTypeExt = flatItem.bundleItem?.price_type_ext;
         // 主商品id
-        const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
+        // const mainProductId = flatItem?.originProduct?._productOrigin?.id || flatItem?.parentProduct?.id || 0;
         // original_price 对应：
         // 1. price_type: "markup" && price_type_ext: "product_price"
         // markup_price 对应：
@@ -2010,13 +2012,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用
@@ -2078,13 +2080,13 @@ class RulesModule extends _BaseModule.BaseModule {
             if (!filter) {
               isScopeValid = true;
             } else {
-              isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
 
           // 包含套餐判断, products值兼容旧数据
           if (scopeType === 'specific_packages' || scopeType === 'products') {
-            isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
 
           // 价格和套餐适用范围都符合，则可用

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

@@ -112,6 +112,8 @@ export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrde
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: BaseSalesProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -3,6 +3,7 @@ import type { ProductData } from '../../../modules/Product/types';
 export interface BaseProductDetailOptionItem {
     option_group_item_id?: number | string;
     option_group_id?: number | string;
+    production_code?: string;
     num?: number | string;
     quantity?: number | string;
     price?: number | string;
@@ -10,6 +11,7 @@ export interface BaseProductDetailOptionItem {
     [key: string]: any;
 }
 export interface BaseProductDetailBundleItem {
+    production_code?: string;
     option?: BaseProductDetailOptionItem[];
     [key: string]: any;
 }
@@ -18,6 +20,7 @@ export interface BaseProductDetailPayload {
     product_id?: number | string | null;
     variant_id?: number | string | null;
     product_variant_id?: number | string | null;
+    production_code?: string;
     quantity?: number | string;
     num?: number | string;
     option?: BaseProductDetailOptionItem[];

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

@@ -27,6 +27,10 @@ function toPriceString(value, fallback = '0.00') {
   if (!Number.isFinite(parsedValue)) return fallback;
   return parsedValue.toFixed(2);
 }
+function normalizeProductionCode(value) {
+  if (value === undefined || value === null) return '';
+  return String(value).trim();
+}
 function isBlankValue(value) {
   return value === undefined || value === null || typeof value === 'string' && value.trim() === '';
 }
@@ -108,6 +112,7 @@ function transformBaseProductToOrderProduct(params) {
     ...(callbackOrigin || {})
   };
   const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
+  const productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant?.production_code : origin?.production_code ?? sourceProduct?.production_code);
   const hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
   // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
@@ -193,6 +198,7 @@ function transformBaseProductToOrderProduct(params) {
   return {
     product_id: productId,
     product_variant_id: productVariantId,
+    production_code: productionCode,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : undefined,
     num: resolvedQuantity,
     product_sku: {

package/lib/solution/BaseSales/utils.js

@@ -257,6 +257,9 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
+    ...(product.production_code !== undefined && product.production_code !== null ? {
+      production_code: String(product.production_code).trim()
+    } : {}),
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: finalOriginalPrice,

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 | 1 | 2 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 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/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -336,6 +336,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     id: cacheItem?.id ?? cacheItem?.product_id,
     product_id: resolvedPid,
     variant_id: other?.product_variant_id ?? other?.variant_id ?? 0,
+    // SKUOptionsSelection 已按 Product / Variant 解析好主商品编码；显式空串也需保留。
+    production_code: other?.production_code ?? cacheItem?.production_code,
     quantity,
     // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
     product_sku: productSku ? {

package/lib/solution/ScanOrder/types.d.ts

@@ -44,6 +44,8 @@ export interface ScanOrderProductSku {
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`

package/lib/solution/ScanOrder/utils.js

@@ -633,6 +633,9 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
+    ...(product.production_code !== undefined && product.production_code !== null ? {
+      production_code: String(product.production_code).trim()
+    } : {}),
     product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: manualOriginalPrice,

package/lib/solution/UnifiedBookingSales/index.js

@@ -58,6 +58,30 @@ function normalizePositiveInteger(value) {
   if (!Number.isInteger(normalized) || normalized <= 0) return undefined;
   return normalized;
 }
+function getCandidateDurationMinutes(candidate) {
+  const startAt = candidate.bookingStartAt || candidate.startAt;
+  const endAt = candidate.bookingEndAt || candidate.endAt;
+  try {
+    const start = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(startAt));
+    const end = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(endAt));
+    const minutes = Math.round((end - start) / 60000);
+    return Number.isInteger(minutes) && minutes > 0 ? minutes : undefined;
+  } catch (_error) {
+    return undefined;
+  }
+}
+function getCandidateStartTime(candidate) {
+  if (/^([01]\d|2[0-3]):[0-5]\d$/.test(candidate.startTime || '')) {
+    return candidate.startTime;
+  }
+  const startAt = candidate.bookingStartAt || candidate.startAt;
+  try {
+    const start = (0, _localClock.parseLocalDateTime)(startAt);
+    return `${String(start.hour).padStart(2, '0')}:${String(start.minute).padStart(2, '0')}`;
+  } catch (_error) {
+    return undefined;
+  }
+}
 function isRecord(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value);
 }
@@ -3027,12 +3051,24 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         });
       }
       this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
+      const candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
+      const candidateStartTime = getCandidateStartTime(params.candidate);
       const refreshedRanges = (0, _ResourcePlanner.getProductTimeRanges)(refreshedProjection, {
         productIds: [params.candidate.productId],
         dateRange: {
           startDate: params.candidate.startAt.slice(0, 10),
           endDate: params.candidate.startAt.slice(0, 10)
-        }
+        },
+        ...(candidateDurationMinutes ? {
+          durationMinutesByProductId: {
+            [String(params.candidate.productId)]: candidateDurationMinutes
+          },
+          ...(candidateStartTime ? {
+            durationStartTimesByProductId: {
+              [String(params.candidate.productId)]: [candidateStartTime]
+            }
+          } : {})
+        } : {})
       }).flatMap(group => group.ranges);
       const refreshedCandidateBase = refreshedRanges.find(candidate => candidate.startAt === params.candidate.startAt && candidate.endAt === params.candidate.endAt && candidate.bookingStartAt === params.candidate.bookingStartAt && candidate.bookingEndAt === params.candidate.bookingEndAt);
       if (!refreshedCandidateBase) {

package/package.json

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