@pisell/pisellos 0.0.492 → 0.0.494

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

@@ -91,8 +91,14 @@ export function findFastestAvailableResource(_ref2) {
     _ref2$currentCapacity = _ref2.currentCapacity,
     currentCapacity = _ref2$currentCapacity === void 0 ? 1 : _ref2$currentCapacity,
     _ref2$countMap = _ref2.countMap,
-    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap;
+    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap,
+    targetDate = _ref2.targetDate,
+    _ref2$durationMinutes = _ref2.durationMinutes,
+    durationMinutes = _ref2$durationMinutes === void 0 ? 30 : _ref2$durationMinutes;
   var currentTime = dayjs();
+  var resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
+  var targetDay = targetDate ? dayjs(targetDate) : currentTime;
+  var isTargetDayToday = targetDay.isSame(currentTime, 'day');
   var fastestTime = null;
   var fastestResources = [];
   console.log('[TimeslotUtils] 查找最快可用资源:', {
@@ -108,17 +114,18 @@ export function findFastestAvailableResource(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _resource = _step2.value;
-      // 获取资源当天且还在工作时间内的时间段
-      var todayTimes = _resource.times.filter(function (time) {
-        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
-        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
-        return isToday && isStillWorking;
+      // 获取资源在目标日期且还在工作时间内的时间段
+      var targetDayTimes = _resource.times.filter(function (time) {
+        var isSameTargetDay = dayjs(time.start_at).isSame(targetDay, 'day');
+        if (!isSameTargetDay) return false;
+        if (!isTargetDayToday) return true;
+        return dayjs(time.end_at).isAfter(currentTime);
       });
-      if (todayTimes.length === 0) {
+      if (targetDayTimes.length === 0) {
         console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+      var _iterator4 = _createForOfIteratorHelper(targetDayTimes),
         _step4;
       try {
         var _loop = function _loop() {
@@ -128,7 +135,7 @@ export function findFastestAvailableResource(_ref2) {
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
-            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            var nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
             console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
@@ -165,7 +172,7 @@ export function findFastestAvailableResource(_ref2) {
                 // 检查资源类型和容量
                 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] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
@@ -177,7 +184,7 @@ export function findFastestAvailableResource(_ref2) {
                   var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
@@ -194,7 +201,7 @@ export function findFastestAvailableResource(_ref2) {
             } finally {
               _iterator5.f();
             }
-            if (finalAvailableTime.isAfter(workEndTime)) {
+            if (finalAvailableTime.add(resolvedDuration, 'minute').isAfter(workEndTime)) {
               console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }

package/dist/solution/ScanOrder/utils.js

@@ -358,6 +358,25 @@ export function normalizeOrderProduct(product) {
   if (product.identity_key && !metadata.unique_identification_number) {
     metadata.unique_identification_number = product.identity_key;
   }
+  var resolvedOriginalPrice = product.original_price || '0.00';
+  var resolvedSellingPrice = product.selling_price || '0.00';
+  if (metadata.main_product_original_price === undefined) {
+    metadata.main_product_original_price = resolvedOriginalPrice;
+  }
+  if (metadata.main_product_selling_price === undefined) {
+    metadata.main_product_selling_price = resolvedSellingPrice;
+  }
+  if (metadata.source_product_price === undefined) {
+    var _product$_origin$orig, _product$_origin;
+    metadata.source_product_price = (_product$_origin$orig = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.original_price) !== null && _product$_origin$orig !== void 0 ? _product$_origin$orig : resolvedOriginalPrice;
+  }
+  var normalizedBundle = (product.product_bundle || []).map(function (item) {
+    var _ref, _item$bundle_selling_, _ref2, _ref3, _item$custom_price;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      bundle_selling_price: (_ref = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref !== void 0 ? _ref : '0.00',
+      custom_price: (_ref2 = (_ref3 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00'
+    });
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -365,13 +384,13 @@ export 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_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
     discount_list: product.discount_list || [],
-    product_bundle: product.product_bundle || [],
+    product_bundle: normalizedBundle,
     metadata: metadata,
     _origin: product._origin
   };

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

@@ -60,14 +60,12 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    loadVenueProducts(params: {
-        productIds: number[];
-    }): Promise<ProductData[]>;
-    loadAddonProducts(params: {
-        categoryIds?: number[];
-        productIds?: number[];
-        collectionIds?: number[];
-    }): Promise<ProductData[]>;
+    loadAllProducts(): Promise<{
+        venueProducts: ProductData[];
+        addonProducts: ProductData[];
+    }>;
+    loadVenueProducts(): Promise<ProductData[]>;
+    loadAddonProducts(): Promise<ProductData[]>;
     getVenueProducts(): ProductData[];
     getAddonProductsList(): ProductData[];
     loadQuotations(params?: {
@@ -107,6 +105,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
     getSlotConfig(): VenueBookingSlotConfig;
     loadSchedules(): Promise<void>;
+    private injectScheduleResolverToQuotation;
     getScheduleListByIds(ids: number[]): import("../../server").ScheduleItem[];
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
@@ -140,7 +139,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         updates: Partial<ScanOrderOrderProduct>;
     }): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<ProductData[]>;
     private loadOpenDataConfig;
     private loadRuntimeConfigs;
     private fetchItemRuleConfigsByModelIds;