@pisell/pisellos 2.3.82 → 2.3.84

package/lib/solution/VenueBooking/index.js

@@ -370,7 +370,7 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
         });
       }
       if (this.store.quotation) {
-        await this.store.quotation.loadQuotations({
+        await this.ensureQuotationsLoaded({
           channel: this.otherParams?.channel
         });
       }
@@ -566,7 +566,7 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
       if (this.store.schedule) {
         await this.store.schedule.loadAllSchedule();
         this.injectScheduleResolverToQuotation();
-        this.store.quotation?.loadQuotations({
+        this.preloadQuotations({
           channel: this.otherParams?.channel
         });
       }
@@ -720,6 +720,19 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
 
   // ─── 报价单 ───
 
+  async ensureQuotationsLoaded(params) {
+    const quotation = this.store.quotation;
+    if (!quotation) return;
+    const load = typeof quotation.ensureQuotations === 'function' ? quotation.ensureQuotations.bind(quotation) : quotation.loadQuotations.bind(quotation);
+    await load(params);
+  }
+  preloadQuotations(params) {
+    void this.ensureQuotationsLoaded(params).catch(error => {
+      this.logMethodError('preloadQuotations', error, {
+        channel: params?.channel
+      });
+    });
+  }
   async loadQuotations(params) {
     this.logMethodStart('loadQuotations');
     try {
@@ -854,6 +867,7 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
       quotationModule: this.store.quotation,
+      channel: this.otherParams?.channel,
       resolveConfig: date => this.resolveSlotConfigForDate(date)
     });
   }
@@ -866,7 +880,8 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
       const timePoints = timeLabels.map(label => `${date} ${label}`);
       quotationPriceMap = this.store.quotation.buildProductPriceMap({
         productIds,
-        timePoints
+        timePoints,
+        channel: this.otherParams?.channel
       });
     }
     return (0, _timeSlot.buildTimeSlotGrid)({
@@ -1185,7 +1200,8 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
           price_breakdown: (0, _slotMerge.buildPriceBreakdown)({
             group,
             productId: mapping.productId,
-            quotation: this.store.quotation
+            quotation: this.store.quotation,
+            channel: this.otherParams?.channel
           })
         },
         _origin: venueProductOrigin
@@ -1325,7 +1341,8 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
           productId: mapping.productId,
           price: this.store.quotation.getPriceForProduct({
             productId: mapping.productId,
-            datetime: slot.startTime
+            datetime: slot.startTime,
+            channel: this.otherParams?.channel
           }) ?? mapping.price
         }));
         const merged = (0, _slotMerge.mergeConsecutiveSlots)(updatedSlots);
@@ -1335,14 +1352,16 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
           product.metadata.price_breakdown = (0, _slotMerge.buildPriceBreakdown)({
             group: merged[0],
             productId: mapping.productId,
-            quotation: this.store.quotation
+            quotation: this.store.quotation,
+            channel: this.otherParams?.channel
           });
         }
       } else if (product.product_id != null) {
         const quotationPrice = this.store.quotation.getPriceForProduct({
           productId: product.product_id,
           variantId: product.product_variant_id ?? undefined,
-          datetime: now
+          datetime: now,
+          channel: this.otherParams?.channel
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;
@@ -1550,7 +1569,8 @@ class VenueBookingImpl extends _BaseSales.BaseSalesImpl {
         const quotationPrice = this.store.quotation.getPriceForProduct({
           productId: product.product_id,
           variantId: product.product_variant_id ?? undefined,
-          datetime: (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss')
+          datetime: (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss'),
+          channel: this.otherParams?.channel
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;

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

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

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

@@ -15,6 +15,7 @@ function buildDateRangeSummary(params) {
     rawResources,
     resourceProductMap,
     quotationModule,
+    channel,
     resolveConfig
   } = params;
   const result = [];
@@ -30,7 +31,8 @@ function buildDateRangeSummary(params) {
       const timePoints = timeLabels.map(label => `${date} ${label}`);
       quotationPriceMap = quotationModule.buildProductPriceMap({
         productIds,
-        timePoints
+        timePoints,
+        channel
       });
     }
     const grid = (0, _timeSlot.buildTimeSlotGrid)({

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

@@ -5,10 +5,12 @@ export declare function mergeConsecutiveSlots(slots: VenueSlotSelection[]): Merg
 export declare function buildPriceBreakdown(params: {
     group: MergedSlotGroup;
     productId: number;
+    channel?: string;
     quotation?: {
         getQuotationShelfId: (p: {
             productId: number;
             datetime: string;
+            channel?: string;
         }) => number;
     };
 }): PriceBreakdownEntry[];

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

@@ -57,6 +57,7 @@ function buildPriceBreakdown(params) {
   const {
     group,
     productId,
+    channel,
     quotation
   } = params;
   if (!group.slots.length) return [];
@@ -65,7 +66,8 @@ function buildPriceBreakdown(params) {
     const unitPrice = Number(slot.price || '0');
     const shelfId = quotation ? quotation.getQuotationShelfId({
       productId,
-      datetime: slot.startTime
+      datetime: slot.startTime,
+      channel
     }) : 0;
     const startHm = (0, _dayjs.default)(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
     const endHm = (0, _dayjs.default)(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');

package/package.json

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