@pisell/pisellos 2.1.125 → 2.1.127

package/lib/solution/VenueBooking/index.js

@@ -40,6 +40,7 @@ var import_types2 = require("../BookingByStep/types");
 var import_ProductList = require("../../modules/ProductList");
 var import_Date = require("../../modules/Date");
 var import_Schedule = require("../../modules/Schedule");
+var import_utils2 = require("../../modules/Schedule/utils");
 var import_Quotation = require("../../modules/Quotation");
 var import_OpenData = require("../../modules/OpenData");
 var import_types3 = require("../../modules/Account/types");
@@ -49,7 +50,7 @@ var import_resource = require("./utils/resource");
 var import_timeSlot = require("./utils/timeSlot");
 var import_dateSummary = require("./utils/dateSummary");
 var import_slotMerge = require("./utils/slotMerge");
-var import_utils2 = require("../../modules/Order/utils");
+var import_utils3 = require("../../modules/Order/utils");
 var import_Order = require("../../modules/Order");
 var import_types4 = require("../RegisterAndLogin/types");
 var import_decimal = __toESM(require("decimal.js"));
@@ -96,6 +97,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
     };
     this.otherParams = {};
+    this.baseSlotConfig = { ...import_types.DEFAULT_SLOT_CONFIG };
     this.itemRuleEvaluator = new import_itemRule.ItemRuleEvaluator();
     this.itemRuleConfigs = [];
     this.itemRuleConfigsPromise = null;
@@ -301,10 +303,11 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.store.status = "initializing";
     this.store.error = null;
     this.store.rawResourceData = [];
-    this.store.slotConfig = {
+    this.baseSlotConfig = {
       ...import_types.DEFAULT_SLOT_CONFIG,
       ...((_b = options.otherParams) == null ? void 0 : _b.slotConfig) || {}
     };
+    this.store.slotConfig = { ...this.baseSlotConfig };
     this.otherParams = options.otherParams || {};
     this.cacheId = (_c = this.otherParams) == null ? void 0 : _c.cacheId;
     this.itemRuleRuntimeConfig = ((_d = this.otherParams) == null ? void 0 : _d.venueBookingItemRule) || ((_e = this.otherParams) == null ? void 0 : _e.itemRule) || {};
@@ -645,27 +648,87 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   // ─── 日期概览 & 时间槽矩阵（纯计算，不发请求） ───
+  getOperatingHoursScheduleIds() {
+    var _a, _b;
+    const openData = this.otherParams.openData || ((_b = (_a = this.store.openData) == null ? void 0 : _a.getOpenData) == null ? void 0 : _b.call(_a)) || null;
+    const rawIds = openData == null ? void 0 : openData["availability.operating_hours"];
+    if (!Array.isArray(rawIds))
+      return [];
+    return [...new Set(
+      rawIds.map((id) => Number(id)).filter((id) => Number.isFinite(id) && id > 0).map((id) => Math.floor(id))
+    )];
+  }
+  resolveSlotConfigForDate(date) {
+    var _a;
+    const nextSlotConfig = { ...this.baseSlotConfig };
+    if (!date || !this.store.schedule)
+      return nextSlotConfig;
+    const operatingHoursScheduleIds = this.getOperatingHoursScheduleIds();
+    if (!operatingHoursScheduleIds.length)
+      return nextSlotConfig;
+    const scheduleList = this.store.schedule.getScheduleListByIds(
+      operatingHoursScheduleIds
+    );
+    if (!scheduleList.length)
+      return nextSlotConfig;
+    const timeRangeMap = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
+      scheduleList,
+      void 0,
+      date
+    );
+    let earliestStart = null;
+    let latestEnd = null;
+    for (const schedule of scheduleList) {
+      const dateRangeList = ((_a = timeRangeMap == null ? void 0 : timeRangeMap[schedule.id]) == null ? void 0 : _a.dateRangeFormat) || [];
+      for (const range of dateRangeList) {
+        const start = (0, import_dayjs.default)(range == null ? void 0 : range.start);
+        const end = (0, import_dayjs.default)(range == null ? void 0 : range.end);
+        if (!start.isValid() || !end.isValid())
+          continue;
+        if (!earliestStart || start.isBefore(earliestStart)) {
+          earliestStart = start;
+        }
+        if (!latestEnd || end.isAfter(latestEnd)) {
+          latestEnd = end;
+        }
+      }
+    }
+    if (!earliestStart || !latestEnd)
+      return nextSlotConfig;
+    return {
+      ...nextSlotConfig,
+      businessStartTime: earliestStart.format("HH:mm"),
+      businessEndTime: latestEnd.format("HH:mm")
+    };
+  }
+  syncOperatingHoursToSlotConfig(date) {
+    const resolvedSlotConfig = this.resolveSlotConfigForDate(date);
+    this.store.slotConfig = resolvedSlotConfig;
+    return resolvedSlotConfig;
+  }
   getDateRangeSummary(params) {
     return (0, import_dateSummary.buildDateRangeSummary)({
       startDate: params.startDate,
       endDate: params.endDate,
-      config: this.store.slotConfig,
+      config: this.baseSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
-      quotationModule: this.store.quotation
+      quotationModule: this.store.quotation,
+      resolveConfig: (date) => this.resolveSlotConfigForDate(date)
     });
   }
   getTimeSlotGrid(date) {
+    const resolvedSlotConfig = this.syncOperatingHoursToSlotConfig(date);
     let quotationPriceMap;
     if (this.store.quotation) {
       const productIds = [...new Set([...this.resourceProductMap.values()].map((m) => m.productId))];
-      const timeLabels = (0, import_timeSlot.generateTimeLabels)(this.store.slotConfig);
+      const timeLabels = (0, import_timeSlot.generateTimeLabels)(resolvedSlotConfig);
       const timePoints = timeLabels.map((label) => `${date} ${label}`);
       quotationPriceMap = this.store.quotation.buildProductPriceMap({ productIds, timePoints });
     }
     return (0, import_timeSlot.buildTimeSlotGrid)({
       date,
-      config: this.store.slotConfig,
+      config: resolvedSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
       quotationPriceMap
@@ -800,7 +863,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     for (let i = 0; i < merged.length; i++) {
       const group = merged[i];
       const identityKey = (0, import_slotMerge.buildVenueIdentityKey)(resourceId, i);
-      const bookingUuid = (0, import_utils2.createUuidV4)();
+      const bookingUuid = (0, import_utils3.createUuidV4)();
       const startMoment = (0, import_dayjs.default)(group.startTime, "YYYY-MM-DD HH:mm");
       const endMoment = (0, import_dayjs.default)(group.endTime, "YYYY-MM-DD HH:mm");
       const duration = endMoment.diff(startMoment, "minute");
@@ -813,7 +876,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           num: 1,
           selling_price: group.totalPrice,
           original_price: group.totalPrice,
-          payment_price: group.totalPrice,
           is_charge_tax: (venueProduct == null ? void 0 : venueProduct.is_charge_tax) ?? 0,
           metadata: {
             venue_booking: true,
@@ -892,10 +954,13 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   // ─── 配置 ───
   setSlotConfig(config) {
-    this.store.slotConfig = {
-      ...this.store.slotConfig,
+    this.baseSlotConfig = {
+      ...this.baseSlotConfig,
       ...config
     };
+    this.store.slotConfig = {
+      ...this.baseSlotConfig
+    };
   }
   getSlotConfig() {
     return { ...this.store.slotConfig };
@@ -986,7 +1051,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         const merged = (0, import_slotMerge.mergeConsecutiveSlots)(updatedSlots);
         if (merged.length === 1) {
           product.selling_price = merged[0].totalPrice;
-          product.payment_price = merged[0].totalPrice;
+          product.original_price = merged[0].totalPrice;
           product.metadata.price_breakdown = (0, import_slotMerge.buildPriceBreakdown)({
             group: merged[0],
             productId: mapping.productId,
@@ -1001,7 +1066,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;
-          product.payment_price = quotationPrice;
+          product.original_price = quotationPrice;
         }
       }
     }
@@ -1096,15 +1161,14 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           return rid != null && selectedResourceIds.has(rid);
         });
         if (product.discount_list.length < before) {
-          const totalDiscountAmount = product.discount_list.reduce(
+          const totalPerUnitDiscount = product.discount_list.reduce(
             (sum, pd) => sum + (pd.amount || 0),
             0
           );
-          const newPaymentPrice = new import_decimal.default(product.selling_price || 0).minus(totalDiscountAmount).toNumber();
-          const paymentStr = (0, import_utils.toPriceString)(newPaymentPrice);
-          product.payment_price = paymentStr;
+          const newSellingPrice = new import_decimal.default(product.original_price || product.selling_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+          product.selling_price = newSellingPrice;
           if (product.metadata) {
-            product.metadata.main_product_selling_price = paymentStr;
+            product.metadata.main_product_selling_price = newSellingPrice;
           }
         }
       }
@@ -1201,10 +1265,9 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;
-          if (product.original_price == null) {
-            product.original_price = quotationPrice;
-          }
-          product.payment_price = quotationPrice;
+          product.original_price = quotationPrice;
+        } else if (product.selling_price != null) {
+          product.original_price = product.selling_price;
         }
       }
       const products = await this.store.order.addProductToOrder(product);
@@ -1449,16 +1512,13 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       });
       if (productIndex === -1) {
         const sellingPrice = (0, import_utils.toPriceString)((sourceItem == null ? void 0 : sourceItem.price) ?? (sourceItem == null ? void 0 : sourceItem.selling_price), "0.00");
-        const originalPrice = (0, import_utils.toPriceString)((sourceItem == null ? void 0 : sourceItem.original_price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? sellingPrice, sellingPrice);
-        const paymentPrice = (0, import_utils.toPriceString)((sourceItem == null ? void 0 : sourceItem.payment_price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? sellingPrice, sellingPrice);
         tempOrder.products.push(
           (0, import_utils.normalizeOrderProduct)({
             product_id: productId,
             product_variant_id: productVariantId,
             num: targetQuantity,
             selling_price: sellingPrice,
-            original_price: originalPrice,
-            payment_price: paymentPrice,
+            original_price: sellingPrice,
             metadata: { item_rule_prefill: true, item_rule_id: prefillItem.ruleId },
             _origin: { ...sourceItem || {}, item_rule_prefill: true, item_rule_id: prefillItem.ruleId }
           })

package/lib/solution/VenueBooking/utils/dateSummary.d.ts

@@ -7,4 +7,5 @@ export declare function buildDateRangeSummary(params: {
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping>;
     quotationModule?: QuotationModule;
+    resolveConfig?: (date: string) => VenueBookingSlotConfig;
 }): VenueDateSummaryItem[];

package/lib/solution/VenueBooking/utils/dateSummary.js

@@ -35,22 +35,31 @@ module.exports = __toCommonJS(dateSummary_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_timeSlot = require("./timeSlot");
 function buildDateRangeSummary(params) {
-  const { startDate, endDate, config, rawResources, resourceProductMap, quotationModule } = params;
+  const {
+    startDate,
+    endDate,
+    config,
+    rawResources,
+    resourceProductMap,
+    quotationModule,
+    resolveConfig
+  } = params;
   const result = [];
   const productIds = quotationModule ? [...new Set([...resourceProductMap.values()].map((m) => m.productId))] : [];
   let cursor = (0, import_dayjs.default)(startDate);
   const end = (0, import_dayjs.default)(endDate);
   while (!cursor.isAfter(end)) {
     const date = cursor.format("YYYY-MM-DD");
+    const effectiveConfig = (resolveConfig == null ? void 0 : resolveConfig(date)) || config;
     let quotationPriceMap;
     if (quotationModule && productIds.length) {
-      const timeLabels = (0, import_timeSlot.generateTimeLabels)(config);
+      const timeLabels = (0, import_timeSlot.generateTimeLabels)(effectiveConfig);
       const timePoints = timeLabels.map((label) => `${date} ${label}`);
       quotationPriceMap = quotationModule.buildProductPriceMap({ productIds, timePoints });
     }
     const grid = (0, import_timeSlot.buildTimeSlotGrid)({
       date,
-      config,
+      config: effectiveConfig,
       rawResources,
       resourceProductMap,
       quotationPriceMap
@@ -79,7 +88,7 @@ function buildDateRangeSummary(params) {
       status = "unavailable";
     } else if (availableSlots === 0) {
       status = "sold_out";
-    } else if ((totalSlots - availableSlots) / totalSlots >= config.fewLeftThreshold) {
+    } else if ((totalSlots - availableSlots) / totalSlots >= effectiveConfig.fewLeftThreshold) {
       status = "few_left";
     } else {
       status = "available";

package/package.json

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