@pisell/pisellos 0.0.493 → 0.0.495

package/lib/solution/VenueBooking/index.js

@@ -50,6 +50,7 @@ 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_Order = require("../../modules/Order");
 var import_types4 = require("../RegisterAndLogin/types");
 __reExport(VenueBooking_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = [
@@ -59,7 +60,8 @@ var OPEN_DATA_SECTION_CODES = [
   "sale",
   "menu",
   "availability",
-  "workflow"
+  "workflow",
+  "checkout"
 ];
 function cloneCustomDepositData(customDepositData) {
   if (!customDepositData || typeof customDepositData !== "object")
@@ -416,6 +418,10 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
       await ((_h = this.store.order) == null ? void 0 : _h.recalculateSummary({ createIfMissing: false }));
       (_i = this.store.order) == null ? void 0 : _i.persistTempOrder();
       await this.loadRuntimeConfigs();
+      if (this.store.schedule) {
+        await this.store.schedule.loadAllSchedule();
+        this.injectScheduleResolverToQuotation();
+      }
       await this.refreshItemRuleQuantityLimits();
       this.store.status = "ready";
       console.log("[VenueBooking] 初始化完成");
@@ -491,52 +497,54 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     return this.store.cartValidation || { passed: null, failures: [] };
   }
   // ─── 场地商品 & 附加商品 ───
-  async loadVenueProducts(params) {
-    this.logMethodStart("loadVenueProducts", { productIds: params.productIds });
+  async loadAllProducts() {
+    var _a, _b, _c;
+    this.logMethodStart("loadAllProducts");
     try {
       if (!this.store.venueProducts)
         throw new Error("venueProducts 模块未初始化");
-      const res = await this.store.venueProducts.loadProducts({
-        product_ids: params.productIds,
-        cacheId: this.cacheId,
-        schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
-        schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-      });
-      const products = Array.isArray(res) ? res : [];
-      this.resourceProductMap = (0, import_resource.buildResourceProductMap)(products);
-      this.logMethodSuccess("loadVenueProducts", {
-        productCount: products.length,
-        resourceCount: this.resourceProductMap.size
-      });
-      return products;
-    } catch (error) {
-      this.logMethodError("loadVenueProducts", error);
-      throw error;
-    }
-  }
-  async loadAddonProducts(params) {
-    this.logMethodStart("loadAddonProducts");
-    try {
       if (!this.store.addonProducts)
         throw new Error("addonProducts 模块未初始化");
-      const res = await this.store.addonProducts.loadProducts({
-        category_ids: params.categoryIds || [],
-        product_ids: params.productIds || [],
-        collection: (params.collectionIds || []).map(String),
+      const associatedMenus = ((_b = (_a = this.otherParams) == null ? void 0 : _a.openData) == null ? void 0 : _b["menu.associated_menus"]) || [];
+      if (!associatedMenus.length) {
+        throw new Error("未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置");
+      }
+      const menuListIds = associatedMenus.map((n) => Number(n.value));
+      const allProducts = await this.store.venueProducts.loadProducts({
+        menu_list_ids: menuListIds,
         cacheId: this.cacheId,
         schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
         schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
       });
-      const products = Array.isArray(res) ? res : [];
-      this.logMethodSuccess("loadAddonProducts", {
-        productCount: products.length
+      const list = Array.isArray(allProducts) ? allProducts : [];
+      const venueList = list.filter((p) => p.duration != null);
+      const addonList = list.filter((p) => p.duration == null);
+      const venueStore = (_c = this.store.venueProducts) == null ? void 0 : _c.store;
+      if (venueStore) {
+        venueStore.list = venueList.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+      }
+      this.store.addonProducts.addProduct(addonList);
+      this.resourceProductMap = (0, import_resource.buildResourceProductMap)(venueList);
+      this.logMethodSuccess("loadAllProducts", {
+        total: list.length,
+        venueCount: venueList.length,
+        addonCount: addonList.length,
+        resourceCount: this.resourceProductMap.size
       });
-      return products;
+      return { venueProducts: venueList, addonProducts: addonList };
     } catch (error) {
-      this.logMethodError("loadAddonProducts", error);
+      this.logMethodError("loadAllProducts", error);
       throw error;
     }
   }
+  async loadVenueProducts() {
+    const result = await this.loadAllProducts();
+    return result.venueProducts;
+  }
+  async loadAddonProducts() {
+    const result = await this.loadAllProducts();
+    return result.addonProducts;
+  }
   getVenueProducts() {
     var _a, _b;
     return ((_b = (_a = this.store.venueProducts) == null ? void 0 : _a.store) == null ? void 0 : _b.list) || [];
@@ -799,7 +807,12 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
             start_time: group.startTime,
             end_time: group.endTime,
             slot_count: group.slotCount,
-            booking_uid: bookingUuid
+            booking_uid: bookingUuid,
+            price_breakdown: (0, import_slotMerge.buildPriceBreakdown)({
+              group,
+              productId: mapping.productId,
+              quotation: this.store.quotation
+            })
           },
           _origin: {
             name: mapping.productTitle,
@@ -830,7 +843,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
               main_field: mapping.resourceName,
               form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
               relation_id: resourceId,
-              capacity: (rawResource == null ? void 0 : rawResource.capacity) ?? 0,
+              capacity: 1,
               metadata: {}
             }],
             schedule_id: 0,
@@ -878,12 +891,20 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
       if (!this.store.schedule)
         throw new Error("schedule 模块未初始化");
       await this.store.schedule.loadAllSchedule();
+      this.injectScheduleResolverToQuotation();
       this.logMethodSuccess("loadSchedules");
     } catch (error) {
       this.logMethodError("loadSchedules", error);
       throw error;
     }
   }
+  injectScheduleResolverToQuotation() {
+    if (this.store.quotation && this.store.schedule) {
+      this.store.quotation.setScheduleResolver(
+        (id) => this.store.schedule.getScheduleListByIds([id])[0]
+      );
+    }
+  }
   getScheduleListByIds(ids) {
     if (!this.store.schedule)
       return [];
@@ -949,8 +970,12 @@ 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.original_price = merged[0].totalPrice;
           product.payment_price = merged[0].totalPrice;
+          product.metadata.price_breakdown = (0, import_slotMerge.buildPriceBreakdown)({
+            group: merged[0],
+            productId: mapping.productId,
+            quotation: this.store.quotation
+          });
         }
       } else if (product.product_id != null) {
         const quotationPrice = this.store.quotation.getPriceForProduct({
@@ -960,7 +985,6 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;
-          product.original_price = quotationPrice;
           product.payment_price = quotationPrice;
         }
       }
@@ -1031,9 +1055,20 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
         }
         if (result == null ? void 0 : result.discountList) {
           nextDiscountList = result.discountList;
-          await (discountModule == null ? void 0 : discountModule.setDiscountList(result.discountList));
+          if (!params.isSelected) {
+            const beforeSelectedIds = new Set(
+              updated.filter((d) => d.isSelected).map((d) => d.id)
+            );
+            for (const d of nextDiscountList) {
+              if (d.isSelected && !beforeSelectedIds.has(d.id)) {
+                d.isSelected = false;
+              }
+            }
+          }
         }
       }
+      import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
+      await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
       tempOrder.discount_list = (nextDiscountList || []).filter((d) => d.isSelected);
       const afterApplyTarget = this.store.order.getDiscountList().find((d) => d.id === params.discountId) || null;
       await this.store.order.recalculateSummary({ createIfMissing: true });
@@ -1121,7 +1156,9 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
         });
         if (quotationPrice !== null) {
           product.selling_price = quotationPrice;
-          product.original_price = quotationPrice;
+          if (product.original_price == null) {
+            product.original_price = quotationPrice;
+          }
           product.payment_price = quotationPrice;
         }
       }
@@ -1178,37 +1215,11 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async getProductList() {
-    var _a, _b, _c, _d, _e, _f, _g;
-    this.logMethodStart("getProductList");
-    const cachedList = (_b = (_a = this.store.products) == null ? void 0 : _a.store) == null ? void 0 : _b.list;
-    if (Array.isArray(cachedList) && cachedList.length > 0) {
-      const formattedRes = (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
-        cachedList,
-        this.store.itemRuleQuantityLimits || []
-      );
-      this.logMethodSuccess("getProductList", { fromCache: true });
-      return formattedRes;
-    }
-    const menuListIds = ((_c = this.otherParams) == null ? void 0 : _c.menuListIds) || ((_f = (_e = (_d = this.otherParams) == null ? void 0 : _d.dineInConfig) == null ? void 0 : _e["menu.associated_menus"]) == null ? void 0 : _f.map((n) => Number(n.value))) || [];
-    try {
-      const res = await ((_g = this.store.products) == null ? void 0 : _g.loadProducts({
-        menu_list_ids: menuListIds,
-        cacheId: this.cacheId,
-        schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
-        schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-      }));
-      const formattedRes = (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
-        res,
-        this.store.itemRuleQuantityLimits || []
-      );
-      this.logMethodSuccess("getProductList", {
-        menuCount: menuListIds.length
-      });
-      return formattedRes;
-    } catch (error) {
-      this.logMethodError("getProductList", error);
-      throw error;
-    }
+    const result = await this.loadAllProducts();
+    return (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
+      result.addonProducts,
+      this.store.itemRuleQuantityLimits || []
+    );
   }
   // ─── ItemRule 引擎 ───
   async loadOpenDataConfig() {
@@ -1219,7 +1230,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
       target: "venue_booking+online_store",
       section_code: [...OPEN_DATA_SECTION_CODES]
     });
-    this.otherParams.dineInConfig = openDataConfig;
+    this.otherParams.openData = openDataConfig;
     return openDataConfig;
   }
   async loadRuntimeConfigs() {

package/lib/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/lib/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/lib/solution/VenueBooking/utils/slotMerge.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/VenueBooking/utils/slotMerge.ts
 var slotMerge_exports = {};
 __export(slotMerge_exports, {
+  buildPriceBreakdown: () => buildPriceBreakdown,
   buildVenueBookingEntry: () => buildVenueBookingEntry,
   buildVenueIdentityKey: () => buildVenueIdentityKey,
   expandMergedSlotToIndividual: () => expandMergedSlotToIndividual,
@@ -79,6 +80,32 @@ function mergeConsecutiveSlots(slots) {
   });
   return groups;
 }
+function buildPriceBreakdown(params) {
+  const { group, productId, quotation } = params;
+  if (!group.slots.length)
+    return [];
+  const entries = [];
+  for (const slot of group.slots) {
+    const unitPrice = Number(slot.price || "0");
+    const shelfId = quotation ? quotation.getQuotationShelfId({ productId, datetime: slot.startTime }) : 0;
+    const startHm = (0, import_dayjs.default)(slot.startTime, "YYYY-MM-DD HH:mm").format("HH:mm");
+    const endHm = (0, import_dayjs.default)(slot.endTime, "YYYY-MM-DD HH:mm").format("HH:mm");
+    const 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
+      });
+    }
+  }
+  return entries;
+}
 function buildVenueBookingEntry(params) {
   const { group, resourceId, mapping, rawResource, bookingUuid, productUid } = params;
   const startMoment = (0, import_dayjs.default)(group.startTime, "YYYY-MM-DD HH:mm");
@@ -106,7 +133,7 @@ function buildVenueBookingEntry(params) {
       main_field: mapping.resourceName,
       form_id: (rawResource == null ? void 0 : rawResource.form_id) ?? mapping.formId,
       relation_id: resourceId,
-      capacity: (rawResource == null ? void 0 : rawResource.capacity) ?? 0,
+      capacity: 1,
       metadata: {}
     }],
     relation_products: [],
@@ -129,26 +156,53 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   const endTime = meta.end_time;
   if (!startTime || !endTime)
     return [];
-  const slotCount = meta.slot_count || 1;
-  const totalPrice = new import_decimal.default(product.selling_price || "0");
-  const perSlotPrice = slotCount > 0 ? totalPrice.div(slotCount).toFixed(2) : totalPrice.toFixed(2);
+  const breakdown = meta.price_breakdown;
+  const datePrefix = (0, import_dayjs.default)(startTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD");
   const result = [];
   let cursor = (0, import_dayjs.default)(startTime, "YYYY-MM-DD HH:mm");
   const end = (0, import_dayjs.default)(endTime, "YYYY-MM-DD HH:mm");
-  while (cursor.isBefore(end)) {
-    const slotEnd = cursor.add(slotDurationMinutes, "minute");
-    result.push({
-      resourceId,
-      startTime: cursor.format("YYYY-MM-DD HH:mm"),
-      endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
-      price: perSlotPrice
-    });
-    cursor = slotEnd;
+  if (breakdown == null ? void 0 : breakdown.length) {
+    const priceMap = /* @__PURE__ */ new Map();
+    for (const entry of breakdown) {
+      let entryCursor = (0, import_dayjs.default)(`${datePrefix} ${entry.start_time}`, "YYYY-MM-DD HH:mm");
+      const entryEnd = (0, import_dayjs.default)(`${datePrefix} ${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");
+      }
+    }
+    while (cursor.isBefore(end)) {
+      const slotEnd = cursor.add(slotDurationMinutes, "minute");
+      const hm = cursor.format("HH:mm");
+      const price = priceMap.get(hm) ?? 0;
+      result.push({
+        resourceId,
+        startTime: cursor.format("YYYY-MM-DD HH:mm"),
+        endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
+        price: new import_decimal.default(price).toFixed(2)
+      });
+      cursor = slotEnd;
+    }
+  } else {
+    const slotCount = meta.slot_count || 1;
+    const totalPrice = new import_decimal.default(product.selling_price || "0");
+    const perSlotPrice = slotCount > 0 ? totalPrice.div(slotCount).toFixed(2) : totalPrice.toFixed(2);
+    while (cursor.isBefore(end)) {
+      const slotEnd = cursor.add(slotDurationMinutes, "minute");
+      result.push({
+        resourceId,
+        startTime: cursor.format("YYYY-MM-DD HH:mm"),
+        endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
+        price: perSlotPrice
+      });
+      cursor = slotEnd;
+    }
   }
   return result;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  buildPriceBreakdown,
   buildVenueBookingEntry,
   buildVenueIdentityKey,
   expandMergedSlotToIndividual,

package/package.json

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