@pisell/pisellos 0.0.492 → 0.0.494

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

@@ -92,6 +92,13 @@ export interface MergedSlotGroup {
     slotCount: number;
     slots: VenueSlotSelection[];
 }
+export interface PriceBreakdownEntry {
+    start_time: string;
+    end_time: string;
+    unit_price: number;
+    quotation_shelf_id: number;
+    quantity: number;
+}
 export interface VenueBookingState {
     entryContext: VenueBookingEntryContext | null;
     status: VenueBookingStatus;

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -1,7 +1,17 @@
-import type { VenueSlotSelection, MergedSlotGroup, ResourceProductMapping, VenueResourceRawData } from '../types';
+import type { VenueSlotSelection, MergedSlotGroup, PriceBreakdownEntry, ResourceProductMapping, VenueResourceRawData } from '../types';
 import type { ScanOrderOrderProduct } from '../../ScanOrder/types';
 export declare function buildVenueIdentityKey(resourceId: number | string, groupIndex: number): string;
 export declare function mergeConsecutiveSlots(slots: VenueSlotSelection[]): MergedSlotGroup[];
+export declare function buildPriceBreakdown(params: {
+    group: MergedSlotGroup;
+    productId: number;
+    quotation?: {
+        getQuotationShelfId: (p: {
+            productId: number;
+            datetime: string;
+        }) => number;
+    };
+}): PriceBreakdownEntry[];
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;
@@ -13,6 +23,7 @@ export interface BuildVenueBookingParams {
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。
- * 通过 metadata 中的 start_time/end_time 和 slotDurationMinutes 进行拆分。
+ * 优先使用 metadata.price_breakdown 还原每个时段的精确价格，
+ * 回退到按 selling_price / slot_count 均分。
  */
 export declare function expandMergedSlotToIndividual(product: ScanOrderOrderProduct, slotDurationMinutes: number): VenueSlotSelection[];

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -1,3 +1,4 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -49,8 +50,47 @@ export function mergeConsecutiveSlots(slots) {
   });
   return groups;
 }
+export function buildPriceBreakdown(params) {
+  var group = params.group,
+    productId = params.productId,
+    quotation = params.quotation;
+  if (!group.slots.length) return [];
+  var entries = [];
+  var _iterator = _createForOfIteratorHelper(group.slots),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var slot = _step.value;
+      var unitPrice = Number(slot.price || '0');
+      var shelfId = quotation ? quotation.getQuotationShelfId({
+        productId: productId,
+        datetime: slot.startTime
+      }) : 0;
+      var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('HH:mm');
+      var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('HH:mm');
+      var last = entries[entries.length - 1];
+      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
+        last.end_time = endHm;
+        last.quantity += 1;
+      } else {
+        entries.push({
+          start_time: startHm,
+          end_time: endHm,
+          unit_price: unitPrice,
+          quotation_shelf_id: shelfId,
+          quantity: 1
+        });
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return entries;
+}
 export function buildVenueBookingEntry(params) {
-  var _rawResource$form_id, _rawResource$capacity;
+  var _rawResource$form_id;
   var group = params.group,
     resourceId = params.resourceId,
     mapping = params.mapping,
@@ -82,7 +122,7 @@ export function buildVenueBookingEntry(params) {
       main_field: mapping.resourceName,
       form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
       relation_id: resourceId,
-      capacity: (_rawResource$capacity = rawResource === null || rawResource === void 0 ? void 0 : rawResource.capacity) !== null && _rawResource$capacity !== void 0 ? _rawResource$capacity : 0,
+      capacity: 1,
       metadata: {}
     }],
     relation_products: [],
@@ -99,7 +139,8 @@ export function buildVenueBookingEntry(params) {
 
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。
- * 通过 metadata 中的 start_time/end_time 和 slotDurationMinutes 进行拆分。
+ * 优先使用 metadata.price_breakdown 还原每个时段的精确价格，
+ * 回退到按 selling_price / slot_count 均分。
  */
 export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   var meta = product.metadata || {};
@@ -108,21 +149,57 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   var startTime = meta.start_time;
   var endTime = meta.end_time;
   if (!startTime || !endTime) return [];
-  var slotCount = meta.slot_count || 1;
-  var totalPrice = new Decimal(product.selling_price || '0');
-  var perSlotPrice = slotCount > 0 ? totalPrice.div(slotCount).toFixed(2) : totalPrice.toFixed(2);
+  var breakdown = meta.price_breakdown;
+  var datePrefix = dayjs(startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD');
   var result = [];
   var cursor = dayjs(startTime, 'YYYY-MM-DD HH:mm');
   var end = dayjs(endTime, 'YYYY-MM-DD HH:mm');
-  while (cursor.isBefore(end)) {
-    var slotEnd = cursor.add(slotDurationMinutes, 'minute');
-    result.push({
-      resourceId: resourceId,
-      startTime: cursor.format('YYYY-MM-DD HH:mm'),
-      endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
-      price: perSlotPrice
-    });
-    cursor = slotEnd;
+  if (breakdown !== null && breakdown !== void 0 && breakdown.length) {
+    var priceMap = new Map();
+    var _iterator2 = _createForOfIteratorHelper(breakdown),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var entry = _step2.value;
+        var entryCursor = dayjs("".concat(datePrefix, " ").concat(entry.start_time), 'YYYY-MM-DD HH:mm');
+        var entryEnd = dayjs("".concat(datePrefix, " ").concat(entry.end_time), 'YYYY-MM-DD HH:mm');
+        while (entryCursor.isBefore(entryEnd)) {
+          priceMap.set(entryCursor.format('HH:mm'), entry.unit_price);
+          entryCursor = entryCursor.add(slotDurationMinutes, 'minute');
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    while (cursor.isBefore(end)) {
+      var _priceMap$get;
+      var slotEnd = cursor.add(slotDurationMinutes, 'minute');
+      var hm = cursor.format('HH:mm');
+      var price = (_priceMap$get = priceMap.get(hm)) !== null && _priceMap$get !== void 0 ? _priceMap$get : 0;
+      result.push({
+        resourceId: resourceId,
+        startTime: cursor.format('YYYY-MM-DD HH:mm'),
+        endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
+        price: new Decimal(price).toFixed(2)
+      });
+      cursor = slotEnd;
+    }
+  } else {
+    var slotCount = meta.slot_count || 1;
+    var totalPrice = new Decimal(product.selling_price || '0');
+    var perSlotPrice = slotCount > 0 ? totalPrice.div(slotCount).toFixed(2) : totalPrice.toFixed(2);
+    while (cursor.isBefore(end)) {
+      var _slotEnd = cursor.add(slotDurationMinutes, 'minute');
+      result.push({
+        resourceId: resourceId,
+        startTime: cursor.format('YYYY-MM-DD HH:mm'),
+        endTime: _slotEnd.format('YYYY-MM-DD HH:mm'),
+        price: perSlotPrice
+      });
+      cursor = _slotEnd;
+    }
   }
   return result;
 }

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

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Cart/utils/cartProduct.js

@@ -341,6 +341,7 @@ var formatBundleToOrigin = (bundle) => {
       option: formatOptionsToOrigin(getBundleValueByKey("option")),
       discount_list: d.discount_list,
       "bundle_selling_price": d == null ? void 0 : d.price,
+      "custom_price": d == null ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference

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

@@ -15,6 +15,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private cacheId;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
+    /**
+     * Populate `savedAmount` on each discount based on product-level discount details.
+     * Only selected discounts get a non-zero value.
+     */
+    static populateSavedAmounts(productList: Array<Record<string, any>>, discountList: Array<Record<string, any>>): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**

package/lib/modules/Order/index.js

@@ -47,6 +47,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.defaultName = "order";
     this.defaultVersion = "1.0.0";
   }
+  /**
+   * Populate `savedAmount` on each discount based on product-level discount details.
+   * Only selected discounts get a non-zero value.
+   */
+  static populateSavedAmounts(productList, discountList) {
+    var _a, _b;
+    const savedMap = /* @__PURE__ */ new Map();
+    for (const product of productList) {
+      const qty = product.num || 1;
+      for (const pd of product.discount_list || []) {
+        const discountKey = ((_a = pd.discount) == null ? void 0 : _a.resource_id) || pd.id;
+        if (discountKey == null)
+          continue;
+        const amount = new import_decimal.default(pd.amount || 0).times(qty).plus(((_b = pd.metadata) == null ? void 0 : _b.product_discount_difference) || 0);
+        savedMap.set(discountKey, (savedMap.get(discountKey) || new import_decimal.default(0)).plus(amount));
+      }
+    }
+    for (const d of discountList) {
+      const key = d.id;
+      d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
+    }
+  }
   async initialize(core, options) {
     var _a;
     this.core = core;
@@ -151,7 +173,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         original_price: values.original_price !== void 0 ? String(values.original_price) : product.original_price,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
-        product_bundle: values.bundle ?? product.product_bundle
+        product_bundle: values.bundle ?? product.product_bundle,
+        metadata: {
+          ...product.metadata || {},
+          ...values.main_product_selling_price !== void 0 ? { main_product_selling_price: String(values.main_product_selling_price) } : {}
+        }
       })
     };
   }
@@ -247,6 +273,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder.products = result.productList;
     }
     if (result == null ? void 0 : result.discountList) {
+      OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
       (_f = this.store.discount) == null ? void 0 : _f.setDiscountList(result.discountList);
       tempOrder.discount_list = result.discountList.filter((d) => d.isSelected);
     }
@@ -425,9 +452,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async removeProductFromOrder(identity) {
     const tempOrder = this.ensureTempOrder();
+    const beforeProducts = tempOrder.products;
     tempOrder.products = tempOrder.products.filter(
       (item) => !(0, import_utils3.isIdentityMatch)(item, identity)
     );
+    const removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
+    if (removedByStrictIdentity === 0 && identity.identity_key) {
+      tempOrder.products = tempOrder.products.filter((item) => {
+        const isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
+        const hasNoIdentityKey = !item.identity_key;
+        return !(isSameProduct && hasNoIdentityKey);
+      });
+    }
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();

package/lib/modules/Order/utils.js

@@ -110,6 +110,19 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
   }
+  const priceMetaKeys = [
+    "main_product_original_price",
+    "main_product_selling_price",
+    "source_product_price"
+  ];
+  for (const key of priceMetaKeys) {
+    if (rawMetadata[key] !== void 0) {
+      cleanMetadata[key] = rawMetadata[key];
+    }
+  }
+  if (rawMetadata.price_breakdown) {
+    cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
+  }
   return {
     ...submitProduct,
     ...bookingUid ? { booking_uid: bookingUid } : {},

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
+import type { ScheduleItem } from '../Schedule/types';
 import type { QuotationItem } from './types';
 export type { QuotationItem, QuotationProductData, QuotationSchedule, QuotationState } from './types';
 export declare class QuotationModule extends BaseModule implements Module {
@@ -7,6 +8,7 @@ export declare class QuotationModule extends BaseModule implements Module {
     protected defaultVersion: string;
     private request;
     private store;
+    private scheduleResolver?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     loadQuotations(params?: {
@@ -26,6 +28,11 @@ export declare class QuotationModule extends BaseModule implements Module {
         variantId?: number;
         datetime: string;
     }): string | null;
+    getQuotationShelfId(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+    }): number;
     /**
      * Batch pre-compute quotation prices for a set of products across multiple time points.
      * Key format: `${productId}:${timePoint}`
@@ -35,6 +42,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         productIds: number[];
         timePoints: string[];
     }): Map<string, string | null>;
+    setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
     private isQuotationActiveAt;
     private findProductData;
 }

package/lib/modules/Quotation/index.js

@@ -77,6 +77,18 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     }
     return null;
   }
+  getQuotationShelfId(params) {
+    const { productId, variantId, datetime } = params;
+    for (const quotation of this.store.list) {
+      if (!this.isQuotationActiveAt(quotation, datetime))
+        continue;
+      const match = this.findProductData(quotation.product_data, productId, variantId);
+      if (!match || match.value === 0)
+        continue;
+      return quotation.id;
+    }
+    return 0;
+  }
   /**
    * Batch pre-compute quotation prices for a set of products across multiple time points.
    * Key format: `${productId}:${timePoint}`
@@ -97,16 +109,25 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     }
     return map;
   }
+  setScheduleResolver(resolver) {
+    this.scheduleResolver = resolver;
+  }
   isQuotationActiveAt(quotation, datetime) {
     var _a;
     if (!((_a = quotation.schedule) == null ? void 0 : _a.length))
       return false;
-    const scheduleItems = quotation.schedule.map((s) => ({
-      ...s,
-      repeat_type: s.repeat_type || "none",
-      repeat_rule: s.repeat_rule || null,
-      time_slot: s.time_slot || []
-    }));
+    const scheduleItems = quotation.schedule.map((s) => {
+      var _a2;
+      const full = (_a2 = this.scheduleResolver) == null ? void 0 : _a2.call(this, s.id);
+      if (full)
+        return full;
+      return {
+        ...s,
+        repeat_type: s.repeat_type || "none",
+        repeat_rule: s.repeat_rule || null,
+        time_slot: s.time_slot || []
+      };
+    });
     return (0, import_getDateIsInSchedule.getDateIsInSchedule)(datetime, scheduleItems);
   }
   findProductData(productData, productId, variantId) {

package/lib/modules/Schedule/getDateIsInSchedule.js

@@ -70,7 +70,7 @@ var isInStandardSchedule = (targetDate, targetDateString, targetTimeString, sche
   }
   const startDate = (0, import_dayjs.default)(schedule.start_time);
   const endDate = (0, import_dayjs.default)(schedule.end_time);
-  const isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate);
+  const isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate);
   if (schedule.repeat_type === "none") {
     return isInBasicRange;
   }
@@ -80,16 +80,14 @@ var isInTimeSlotsSchedule = (targetDate, targetDateString, targetTimeString, sch
   if (!schedule.start_time) {
     return false;
   }
-  const scheduleDate = schedule.start_time.split(" ")[0];
-  if (targetDateString !== scheduleDate) {
+  const scheduleStartDate = (0, import_dayjs.default)(schedule.start_time.split(" ")[0]);
+  if (!isDateInTimeSlotsSchedule(targetDate, schedule, scheduleStartDate)) {
     return false;
   }
   for (const timeSlot of schedule.time_slot) {
-    const slotStart = `${scheduleDate} ${timeSlot.start_time}:00`;
-    const slotEnd = `${scheduleDate} ${timeSlot.end_time}:00`;
-    const slotStartDate = (0, import_dayjs.default)(slotStart);
-    const slotEndDate = (0, import_dayjs.default)(slotEnd);
-    if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
+    const slotStart = (0, import_dayjs.default)(`${targetDateString} ${timeSlot.start_time}:00`);
+    const slotEnd = (0, import_dayjs.default)(`${targetDateString} ${timeSlot.end_time}:00`);
+    if (targetDate.isSameOrAfter(slotStart) && targetDate.isBefore(slotEnd)) {
       return true;
     }
   }
@@ -104,7 +102,7 @@ var isInDesignationSchedule = (targetDate, targetDateString, targetTimeString, s
     const endDateTime = `${designation.end_date} ${designation.end_time}:00`;
     const startDate = (0, import_dayjs.default)(startDateTime);
     const endDate = (0, import_dayjs.default)(endDateTime);
-    if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
+    if (targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate)) {
       return true;
     }
   }
@@ -158,7 +156,7 @@ var isInDailyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
 };
 var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetDayOfWeek = targetDate.day();
@@ -175,7 +173,7 @@ var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
 };
 var getScheduleStartEndTimePoints = (date, scheduleList) => {
   if (!date || !scheduleList || scheduleList.length === 0) {

package/lib/solution/BookingByStep/index.js

@@ -1237,7 +1237,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
         const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
         const hasOriginTimeSlot = Boolean(item._origin.start_time) && Boolean(item._origin.end_time) && !(timeSlots == null ? void 0 : timeSlots.start_time);
         if (hasOriginTimeSlot) {
@@ -1370,7 +1370,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const fastestResource = (0, import_timeslots.findFastestAvailableResource)({
               resources: targetRenderList,
               currentCapacity,
-              countMap: selectResourcesMap
+              countMap: selectResourcesMap,
+              targetDate: (_k = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _k.date,
+              durationMinutes: ((_l = item == null ? void 0 : item.duration) == null ? void 0 : _l.value) || ((_n = (_m = item == null ? void 0 : item._productOrigin) == null ? void 0 : _m.duration) == null ? void 0 : _n.value) || 10
             });
             const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;

package/lib/solution/BookingByStep/utils/timeslots.d.ts

@@ -19,10 +19,12 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
+    targetDate?: string | Dayjs;
+    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

package/lib/solution/BookingByStep/utils/timeslots.js

@@ -77,10 +77,15 @@ function calculateResourceAvailableTime({
 function findFastestAvailableResource({
   resources,
   currentCapacity = 1,
-  countMap = {}
+  countMap = {},
+  targetDate,
+  durationMinutes = 30
 }) {
   var _a, _b, _c;
   const currentTime = (0, import_dayjs.default)();
+  const resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
+  const targetDay = targetDate ? (0, import_dayjs.default)(targetDate) : currentTime;
+  const isTargetDayToday = targetDay.isSame(currentTime, "day");
   let fastestTime = null;
   let fastestResources = [];
   console.log("[TimeslotUtils] 查找最快可用资源:", {
@@ -90,19 +95,22 @@ function findFastestAvailableResource({
     countMap
   });
   for (const resource of resources) {
-    const todayTimes = resource.times.filter((time) => {
-      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
-      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
-      return isToday && isStillWorking;
+    const targetDayTimes = resource.times.filter((time) => {
+      const isSameTargetDay = (0, import_dayjs.default)(time.start_at).isSame(targetDay, "day");
+      if (!isSameTargetDay)
+        return false;
+      if (!isTargetDayToday)
+        return true;
+      return (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
     });
-    if (todayTimes.length === 0) {
+    if (targetDayTimes.length === 0) {
       console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
     }
-    for (const time of todayTimes) {
+    for (const time of targetDayTimes) {
       const workStartTime = (0, import_dayjs.default)(time.start_at);
       const workEndTime = (0, import_dayjs.default)(time.end_at);
-      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+      let nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
       console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
         workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
         checkStartTime: nextAvailableTime.format("HH:mm:ss"),
@@ -126,7 +134,7 @@ function findFastestAvailableResource({
           pax: event.pax || 1
         });
         if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
             finalAvailableTime = eventEnd;
             console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
@@ -134,7 +142,7 @@ function findFastestAvailableResource({
           const totalCapacity = resource.capacity || 0;
           const currentUsedCapacity = countMap[resource.id] || 0;
           const eventUsedCapacity = event.pax || 1;
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
             const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
             if (totalRequiredCapacity > totalCapacity) {
               finalAvailableTime = eventEnd;
@@ -143,7 +151,7 @@ function findFastestAvailableResource({
           }
         }
       }
-      if (finalAvailableTime.isAfter(workEndTime)) {
+      if (finalAvailableTime.add(resolvedDuration, "minute").isAfter(workEndTime)) {
         console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
         continue;
       }

package/lib/solution/ScanOrder/utils.js

@@ -294,10 +294,27 @@ function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
 }
 function normalizeOrderProduct(product) {
+  var _a;
   const metadata = { ...product.metadata || {} };
   if (product.identity_key && !metadata.unique_identification_number) {
     metadata.unique_identification_number = product.identity_key;
   }
+  const resolvedOriginalPrice = product.original_price || "0.00";
+  const resolvedSellingPrice = product.selling_price || "0.00";
+  if (metadata.main_product_original_price === void 0) {
+    metadata.main_product_original_price = resolvedOriginalPrice;
+  }
+  if (metadata.main_product_selling_price === void 0) {
+    metadata.main_product_selling_price = resolvedSellingPrice;
+  }
+  if (metadata.source_product_price === void 0) {
+    metadata.source_product_price = ((_a = product._origin) == null ? void 0 : _a.original_price) ?? resolvedOriginalPrice;
+  }
+  const normalizedBundle = (product.product_bundle || []).map((item) => ({
+    ...item,
+    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
+    custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? "0.00"
+  }));
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -305,13 +322,13 @@ function normalizeOrderProduct(product) {
     product_variant_id: product.product_variant_id,
     identity_key: product.identity_key,
     product_option_item: product.product_option_item || [],
-    selling_price: product.selling_price || "0.00",
-    original_price: product.original_price || "0.00",
+    selling_price: resolvedSellingPrice,
+    original_price: resolvedOriginalPrice,
     payment_price: product.payment_price || "0.00",
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
     discount_list: product.discount_list || [],
-    product_bundle: product.product_bundle || [],
+    product_bundle: normalizedBundle,
     metadata,
     _origin: product._origin
   };