@pisell/pisellos 0.10.7 → 0.10.9

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -366,9 +366,33 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
+function hasGoodPassDiscount(product) {
+  var _a, _b;
+  const productBundle = Array.isArray(product == null ? void 0 : product.product_bundle) ? product.product_bundle : [];
+  const extendedBundle = Array.isArray((_b = (_a = product == null ? void 0 : product._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) ? product._extend.other.bundle : [];
+  const discountLists = [
+    product == null ? void 0 : product.discount_list,
+    ...productBundle.map((item) => item == null ? void 0 : item.discount_list),
+    ...extendedBundle.map((item) => item == null ? void 0 : item.discount_list)
+  ];
+  return discountLists.some(
+    (discountList) => Array.isArray(discountList) && discountList.some(
+      (item) => (item == null ? void 0 : item.type) === "good_pass" || (item == null ? void 0 : item.tag) === "good_pass"
+    )
+  );
+}
 function getPromotionLineMergeBoundary(product) {
-  var _a;
-  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_edit_for_runtime) !== true)
+  var _a, _b;
+  if ((product == null ? void 0 : product.product_id) === void 0 || (product == null ? void 0 : product.product_id) === null) {
+    return `custom:${getOrderProductUid(product)}`;
+  }
+  if (hasGoodPassDiscount(product)) {
+    return `good-pass:${getOrderProductUid(product)}`;
+  }
+  if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
+    return `weighing:${getOrderProductUid(product)}`;
+  }
+  if (((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_edit_for_runtime) !== true)
     return "";
   return `edit:${getOrderProductUid(product)}`;
 }

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts

@@ -43,6 +43,7 @@ export interface BaseProductDetailPayload {
     original_price?: number | string;
     tax_fee?: number | string;
     is_charge_tax?: number;
+    metadata?: Record<string, any>;
     note?: string;
     [key: string]: any;
 }

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -56,6 +56,25 @@ function isBlankValue(value) {
 function firstNonBlank(...values) {
   return values.find((value) => !isBlankValue(value));
 }
+function cloneFirstDataVariantIds(...values) {
+  const ids = values.find((value) => Array.isArray(value));
+  return Array.isArray(ids) ? [...ids] : void 0;
+}
+function appendDataVariantIds(base, ...values) {
+  const result = Array.isArray(base) ? [...base] : [];
+  const seen = new Set(result.map((id) => String(id)));
+  for (const value of values) {
+    const candidates = Array.isArray(value) ? value : [value];
+    for (const candidate of candidates) {
+      const id = Number(candidate);
+      if (!Number.isFinite(id) || id <= 0 || seen.has(String(id)))
+        continue;
+      result.push(id);
+      seen.add(String(id));
+    }
+  }
+  return Array.isArray(base) || result.length ? result : void 0;
+}
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
@@ -112,7 +131,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -131,6 +150,32 @@ function transformBaseProductToOrderProduct(params) {
     ...sourceProduct || {},
     ...callbackOrigin || {}
   };
+  const authoritativeDataVariantIds = cloneFirstDataVariantIds(
+    (_c = payload.metadata) == null ? void 0 : _c.data_variant_ids,
+    (_d = sourceProduct == null ? void 0 : sourceProduct.metadata) == null ? void 0 : _d.data_variant_ids,
+    (_e = callbackOrigin == null ? void 0 : callbackOrigin.metadata) == null ? void 0 : _e.data_variant_ids,
+    (_f = origin == null ? void 0 : origin.metadata) == null ? void 0 : _f.data_variant_ids
+  );
+  const selectedSettlementSnapshot = firstNonBlank(
+    payload.selected_settlement_snapshot,
+    (_g = payload.metadata) == null ? void 0 : _g.selected_settlement_snapshot,
+    (_i = (_h = payload._extend) == null ? void 0 : _h.metadata) == null ? void 0 : _i.selected_settlement_snapshot,
+    (_j = sourceProduct == null ? void 0 : sourceProduct.metadata) == null ? void 0 : _j.selected_settlement_snapshot,
+    (_l = (_k = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _k.metadata) == null ? void 0 : _l.selected_settlement_snapshot,
+    (_m = callbackOrigin == null ? void 0 : callbackOrigin.metadata) == null ? void 0 : _m.selected_settlement_snapshot,
+    (_o = (_n = callbackOrigin == null ? void 0 : callbackOrigin._extend) == null ? void 0 : _n.metadata) == null ? void 0 : _o.selected_settlement_snapshot
+  );
+  const locallyAppliedVariantIds = authoritativeDataVariantIds === void 0 ? cloneFirstDataVariantIds(
+    (_p = payload._dataVariant) == null ? void 0 : _p.appliedVariantIds,
+    (_q = sourceProduct == null ? void 0 : sourceProduct._dataVariant) == null ? void 0 : _q.appliedVariantIds,
+    (_r = callbackOrigin == null ? void 0 : callbackOrigin._dataVariant) == null ? void 0 : _r.appliedVariantIds,
+    (_s = origin == null ? void 0 : origin._dataVariant) == null ? void 0 : _s.appliedVariantIds
+  ) : void 0;
+  const dataVariantIds = appendDataVariantIds(
+    authoritativeDataVariantIds,
+    locallyAppliedVariantIds,
+    selectedSettlementSnapshot == null ? void 0 : selectedSettlementSnapshot.data_variant_id
+  );
   const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
   const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const catalogSourcePrice = (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price);
@@ -138,12 +183,12 @@ function transformBaseProductToOrderProduct(params) {
     hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice,
     "0.00"
   );
-  const explicitLineTotal = payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total);
+  const explicitLineTotal = payload.line_total ?? payload.total ?? ((_t = payload._extend) == null ? void 0 : _t.total);
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
-      ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item
+      ((_u = payload.product_sku) == null ? void 0 : _u.option) ?? payload.option ?? payload.options ?? payload.product_option_item
     )
   );
   const productBundle = normalizeBundleItems(
@@ -154,19 +199,19 @@ function transformBaseProductToOrderProduct(params) {
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
   const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,
-    extendOriginTotal: (_e = payload._extend) == null ? void 0 : _e.origin_total,
-    originExtendOriginTotal: (_f = origin == null ? void 0 : origin._extend) == null ? void 0 : _f.origin_total,
-    sourceExtendOriginTotal: (_g = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _g.origin_total,
+    extendOriginTotal: (_v = payload._extend) == null ? void 0 : _v.origin_total,
+    originExtendOriginTotal: (_w = origin == null ? void 0 : origin._extend) == null ? void 0 : _w.origin_total,
+    sourceExtendOriginTotal: (_x = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _x.origin_total,
     catalogUnitPrice: (origin == null ? void 0 : origin.base_price) ?? (origin == null ? void 0 : origin.price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price),
     quantity: resolvedQuantity
   });
   const sellingTotal = Number(
-    payload.line_total ?? payload.total ?? ((_h = payload._extend) == null ? void 0 : _h.total) ?? lineCompositeTotal
+    payload.line_total ?? payload.total ?? ((_y = payload._extend) == null ? void 0 : _y.total) ?? lineCompositeTotal
   );
   const discountReason = (0, import_manualProductDiscount.resolveManualDiscountReasonFromSources)({
     discountReason: payload.discount_reason,
-    extendDiscountReason: (_i = payload._extend) == null ? void 0 : _i.discount_reason,
-    originExtendDiscountReason: (_j = origin == null ? void 0 : origin._extend) == null ? void 0 : _j.discount_reason
+    extendDiscountReason: (_z = payload._extend) == null ? void 0 : _z.discount_reason,
+    originExtendDiscountReason: (_A = origin == null ? void 0 : origin._extend) == null ? void 0 : _A.discount_reason
   });
   const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
   const manualDiscountList = (0, import_manualProductDiscount.shouldBuildManualProductDiscount)({
@@ -180,8 +225,8 @@ function transformBaseProductToOrderProduct(params) {
       sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
       quantity: resolvedQuantity,
       message: discountReason,
-      discountway: (_k = payload._extend) == null ? void 0 : _k.discountway,
-      discount_per: (_l = payload._extend) == null ? void 0 : _l.discount_per
+      discountway: (_B = payload._extend) == null ? void 0 : _B.discountway,
+      discount_per: (_C = payload._extend) == null ? void 0 : _C.discount_per
     })
   ) : payload.discount_list || [];
   const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
@@ -206,6 +251,10 @@ function transformBaseProductToOrderProduct(params) {
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
     holder_config: sourceProduct == null ? void 0 : sourceProduct.holder_config,
+    ...dataVariantIds !== void 0 ? { data_variant_ids: dataVariantIds } : {},
+    ...selectedSettlementSnapshot ? {
+      selected_settlement_snapshot: selectedSettlementSnapshot
+    } : {},
     ...hasPriceOverride ? {
       price_override: String(payload.price_override),
       is_manual_discount: 1
@@ -217,7 +266,7 @@ function transformBaseProductToOrderProduct(params) {
   }
   const productTitle = {
     ...(sourceProduct == null ? void 0 : sourceProduct.title_i18n) || {},
-    original: (sourceProduct == null ? void 0 : sourceProduct.title) || ""
+    original: (sourceProduct == null ? void 0 : sourceProduct.original_title) || (sourceProduct == null ? void 0 : sourceProduct.title) || ""
   };
   return {
     product_id: productId,
@@ -230,6 +279,7 @@ function transformBaseProductToOrderProduct(params) {
     },
     product_bundle: productBundle,
     discount_list: manualDiscountList,
+    ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {},
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
     original_price: lineOriginalPrice,

package/lib/solution/BaseSales/utils.js

@@ -60,33 +60,44 @@ function createEmptySummary() {
   };
 }
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  const normalizedOpts = optArr.map((item) => ({
-    option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
-    option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
-  })).sort((p, q) => {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id)
-      return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num)
-      return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  const normalizeOptions = (options) => {
+    const optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map((item) => ({
+      option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
+      option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
+      num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    })).sort((p, q) => {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num)
+        return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  const normalizedOpts = normalizeOptions(productOptionItem);
   const bundleArr = Array.isArray(productBundle) ? productBundle : [];
   const normalizedBundles = bundleArr.map((item) => ({
     bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
     product_id: Number(item == null ? void 0 : item.product_id) || 0,
-    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item == null ? void 0 : item.option)
   })).sort((p, q) => {
     if (p.bundle_id !== q.bundle_id)
       return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id)
       return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

package/lib/solution/BookingByStep/index.d.ts

@@ -67,7 +67,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 通过 schedule 来读取商品，适用于 session 类商品
      *
@@ -87,7 +87,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         product_ids?: number[];
         category_ids?: number[];
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
      *
@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 2 | 1 | 6 | 4 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -64,6 +64,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;
@@ -126,7 +128,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     loadProducts(params?: ILoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
-    }): Promise<any>;
+    }): Promise<ProductData[]>;
     /**
      * 获取加时商品列表。
      *
@@ -285,6 +287,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private buildOrderCustomerPayload;
     protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
     protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
+    protected prepareProductPriceQueryContext(customerId?: number | string): Promise<void>;
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     /**
      * 获取客户分页信息
      * @returns 分页信息

package/lib/solution/BookingTicket/index.js

@@ -399,7 +399,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return null;
   }
-  async resolveCustomerByDiscountCustomerId(customerId) {
+  async resolveCustomerById(customerId) {
     var _a;
     const localCustomers = this.store.customer.getCustomers();
     const localCustomer = this.findCustomerById(localCustomers, customerId);
@@ -413,7 +413,23 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       num: 1
     });
     const remoteCustomer = this.findCustomerById((result == null ? void 0 : result.list) || [], customerId) || ((_a = result == null ? void 0 : result.list) == null ? void 0 : _a[0]) || null;
-    return remoteCustomer ? this.normalizeCustomer(remoteCustomer) : null;
+    if (remoteCustomer) {
+      return this.normalizeCustomer(remoteCustomer);
+    }
+    try {
+      const detailCustomer = await this.store.customer.queryCustomerDetail(customerId);
+      return detailCustomer ? this.normalizeCustomer(detailCustomer) : null;
+    } catch (error) {
+      console.warn(
+        "[BookingTicket] resolveCustomerById detail request failed",
+        { customerId, error }
+      );
+      return null;
+    }
+  }
+  /** 兼容既有优惠码扫码逻辑。 */
+  resolveCustomerByDiscountCustomerId(customerId) {
+    return this.resolveCustomerById(customerId);
   }
   findCustomerById(customers = [], customerId) {
     return customers.find((customer) => {
@@ -1020,6 +1036,18 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   waitForOrderCustomerPromotionRefresh() {
     return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
   }
+  async prepareProductPriceQueryContext(customerId) {
+    await Promise.resolve();
+    const normalizedCustomerId = Number(customerId || 0);
+    const refreshTask = this.orderCustomerDiscountRefreshInFlight;
+    const shouldWait = normalizedCustomerId > 1 && this.orderCustomerDiscountRefreshCustomerId === normalizedCustomerId && Boolean(refreshTask);
+    if (shouldWait && refreshTask) {
+      await refreshTask;
+    }
+  }
+  preferAuthoritativeProductQueryPrice() {
+    return true;
+  }
   /**
    * 获取客户分页信息
    * @returns 分页信息
@@ -1599,10 +1627,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       });
     }
     if (typeof this.store.order.addProductsToOrder === "function") {
-      return this.store.order.addProductsToOrder(orderLines, {
-        skipEditDiscountConfigRefresh: true,
-        skipDiscountRecalculation: true
-      });
+      return this.store.order.addProductsToOrder(orderLines);
     }
     const result = [];
     for (const line of orderLines) {

package/lib/solution/BookingTicket/types.d.ts

@@ -118,12 +118,15 @@ export interface BookingTicketCartBookingView extends ISalesBooking {
         canAddTime: boolean;
     };
 }
+export type BookingTicketCartLineView = BookingTicketCartBookingView | BookingTicketCartItemView;
 /**
  * BookingTicket 面向 UI 的购物车视图。
  */
 export interface BookingTicketCartView {
     bookings: BookingTicketCartBookingView[];
     items: BookingTicketCartItemView[];
+    /** 以 tempOrder.products 为唯一顺序真源的统一购物车行（旧到新）。 */
+    lines: BookingTicketCartLineView[];
 }
 /**
  * BookingTicket 面向 UI 的客户展示视图。

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -277,7 +277,7 @@ function transformDetailToProductAndBooking(cacheItem, ctx) {
   return { product: productInput, booking, cacheItem: preparedCacheItem };
 }
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const other = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.other) || {};
   const quantity = (ctx == null ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? 1;
   const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
@@ -304,6 +304,7 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     bundle_edit: extend == null ? void 0 : extend.bundle_edit,
     discount_reason: extend == null ? void 0 : extend.discount_reason,
     discount_list: cacheItem == null ? void 0 : cacheItem.discount_list,
+    selected_settlement_snapshot: ((_e = cacheItem == null ? void 0 : cacheItem.metadata) == null ? void 0 : _e.selected_settlement_snapshot) ?? ((_f = extend == null ? void 0 : extend.metadata) == null ? void 0 : _f.selected_settlement_snapshot),
     _extend: extend
   };
 }

package/lib/solution/BookingTicket/utils/cartView.js

@@ -86,29 +86,27 @@ function isGiftProductLine(line) {
 function buildCartView(lines, bookings, options = {}) {
   const productLines = Array.isArray(lines) ? lines : [];
   const bookingList = Array.isArray(bookings) ? bookings : [];
+  const childBookings = bookingList.filter((booking) => booking.parent_id !== 0);
+  const bookingsByProductUid = indexBookingsByProductUid(childBookings);
   const linesByUid = indexProductsByUid(productLines);
   const addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);
-  const claimedUids = /* @__PURE__ */ new Set();
   const claimedAddTimeLines = /* @__PURE__ */ new Set();
-  const cartBookings = bookingList.filter((booking) => booking.parent_id !== 0).reduce((acc, booking) => {
-    const uid = booking == null ? void 0 : booking.product_uid;
+  childBookings.forEach((booking) => {
+    const bookingUid = getBookingUid(booking);
+    if (!bookingUid)
+      return;
+    (addTimeLinesByBookingUid[bookingUid] || []).forEach((line) => {
+      claimedAddTimeLines.add(line);
+    });
+  });
+  const claimedBookings = /* @__PURE__ */ new Set();
+  const cartBookings = [];
+  const items = [];
+  const orderedLines = [];
+  const buildBookingView = (booking, product) => {
     const bookingUid = getBookingUid(booking);
-    let product = null;
-    if (uid !== void 0 && uid !== null && uid !== "") {
-      const key = String(uid);
-      if (!claimedUids.has(key)) {
-        const line = linesByUid[key];
-        if (isGiftProductLine(line))
-          return acc;
-        if (line) {
-          claimedUids.add(key);
-          product = line;
-        }
-      }
-    }
     const addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
-    addTimeProduct.forEach((line) => claimedAddTimeLines.add(line));
-    acc.push({
+    return {
       ...booking,
       _extend: {
         product,
@@ -122,21 +120,36 @@ function buildCartView(lines, bookings, options = {}) {
           shopOpeningHours: options.shopOpeningHours
         })
       }
-    });
-    return acc;
-  }, []);
-  const items = productLines.filter((line) => {
+    };
+  };
+  productLines.forEach((line) => {
     var _a;
-    if (isGiftProductLine(line))
-      return false;
-    if (claimedAddTimeLines.has(line))
-      return false;
+    if (isGiftProductLine(line) || claimedAddTimeLines.has(line))
+      return;
     const uid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
-    if (uid === void 0 || uid === null || uid === "")
-      return true;
-    return !claimedUids.has(String(uid));
+    const matchedBooking = uid === void 0 || uid === null || uid === "" ? void 0 : (bookingsByProductUid[String(uid)] || []).find(
+      (booking) => !claimedBookings.has(booking)
+    );
+    if (matchedBooking) {
+      claimedBookings.add(matchedBooking);
+      const bookingView = buildBookingView(matchedBooking, line);
+      cartBookings.push(bookingView);
+      orderedLines.push(bookingView);
+      return;
+    }
+    items.push(line);
+    orderedLines.push(line);
+  });
+  childBookings.forEach((booking) => {
+    if (claimedBookings.has(booking))
+      return;
+    const uid = booking == null ? void 0 : booking.product_uid;
+    const linkedProduct = uid === void 0 || uid === null || uid === "" ? null : linesByUid[String(uid)] || null;
+    if (isGiftProductLine(linkedProduct))
+      return;
+    cartBookings.push(buildBookingView(booking, null));
   });
-  return { bookings: cartBookings, items };
+  return { bookings: cartBookings, items, lines: orderedLines };
 }
 function isWalkInCustomer(customer) {
   if (!customer)

package/lib/solution/Sales/index.d.ts

@@ -95,6 +95,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**

package/lib/solution/Sales/index.js

@@ -316,8 +316,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
    * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
    * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
    * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+   * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
    */
-  pickBookingsForCurrentPoint(current, bookings) {
+  pickBookingsForCurrentPoint(current, bookings, options = {}) {
     if (bookings.length === 0)
       return [];
     const currentDayStart = current.startOf("day");
@@ -334,6 +335,13 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const appendNextStartGroupIfNeeded = (selectedBookings) => {
       if (selectedBookings.length === 0)
         return selectedBookings;
+      if (options.includeAllFuture) {
+        const allFutureBookings = dayScopedBookings.filter((booking) => {
+          const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+          return startAt.isValid() && startAt.isAfter(current);
+        });
+        return [...selectedBookings, ...allFutureBookings];
+      }
       const shouldAppendNextGroup = selectedBookings.some(
         (booking) => booking.status === "reserved" || booking.status === "occupied"
       );
@@ -384,6 +392,8 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, "day");
     });
     if (upcoming.length > 0) {
+      if (options.includeAllFuture)
+        return upcoming;
       const firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
       const upcomingStartGroup = upcoming.filter((booking) => {
         const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
@@ -638,7 +648,8 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const unpaidBookingList = matchedBookingList.filter((booking) => this.isUnpaidBooking(booking));
     const bookings = this.pickBookingsForCurrentPoint(
       current,
-      this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)
+      this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList),
+      { includeAllFuture: true }
     );
     const completedBookings = completedBookingList.map((booking) => {
       return {
@@ -654,7 +665,8 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     });
     const unpaidBookings = this.pickBookingsForCurrentPoint(
       current,
-      this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList)
+      this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList),
+      { includeAllFuture: true }
     );
     const orderCount = this.countBookingOrders(statsBookingList);
     const bookingCount = statsBookingList.length;

package/lib/solution/ScanOrder/index.js

@@ -1708,60 +1708,23 @@ var _ScanOrderImpl = class extends import_BaseSales.BaseSalesImpl {
         schedule_datetime: scheduleDatetime,
         cacheId: this.cacheId
       });
-      if (Array.isArray(loaded)) {
-        const matchedRuleProduct = (0, import_utils.findReservationRuleProductByResourceId)(
-          loaded,
-          normalizedResourceId
-        );
-        const ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
-        this.enabledReservationRuleProducts = ruleProductsForResource;
-        const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(ruleProductsForResource);
-        if (occupancyMinutes !== void 0) {
-          tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
-        }
-        if ((0, import_utils.hasCustomCapacityProduct)(ruleProductsForResource)) {
-          pendingRequestEntryPax = 1;
-          const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(ruleProductsForResource);
-          if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
-            pendingRequestPaxMin = paxBounds.min;
-          if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
-            pendingRequestPaxMax = paxBounds.max;
-        }
-      } else {
-        this.enabledReservationRuleProducts = [];
-        const error = loaded instanceof Error ? loaded : new Error("预约规则商品列表接口返回异常");
-        this.logMethodError("loadReservationRuleProducts", error, {
-          resourceId: normalizedResourceId,
-          reservationLinkIds,
-          scheduleDate,
-          scheduleDatetime,
-          cacheId: this.cacheId
-        });
-        if (Array.isArray(loaded)) {
-          this.enabledReservationRuleProducts = loaded;
-          const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(loaded);
-          if (occupancyMinutes !== void 0) {
-            tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
-          }
-          if ((0, import_utils.hasCustomCapacityProduct)(loaded)) {
-            pendingRequestEntryPax = 1;
-            const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(loaded);
-            if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
-              pendingRequestPaxMin = paxBounds.min;
-            if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
-              pendingRequestPaxMax = paxBounds.max;
-          }
-        } else {
-          this.enabledReservationRuleProducts = [];
-          const error2 = loaded instanceof Error ? loaded : new Error("预约规则商品列表接口返回异常");
-          this.logMethodError("loadReservationRuleProducts", error2, {
-            resourceId,
-            reservationLinkIds,
-            scheduleDate,
-            scheduleDatetime,
-            cacheId: this.cacheId
-          });
-        }
+      const matchedRuleProduct = (0, import_utils.findReservationRuleProductByResourceId)(
+        loaded,
+        normalizedResourceId
+      );
+      const ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+      this.enabledReservationRuleProducts = ruleProductsForResource;
+      const occupancyMinutes = (0, import_utils.pickFirstDurationMinutesFromProducts)(ruleProductsForResource);
+      if (occupancyMinutes !== void 0) {
+        tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
+      }
+      if ((0, import_utils.hasCustomCapacityProduct)(ruleProductsForResource)) {
+        pendingRequestEntryPax = 1;
+        const paxBounds = (0, import_utils.pickFirstCustomCapacityPaxBounds)(ruleProductsForResource);
+        if ((paxBounds == null ? void 0 : paxBounds.min) !== void 0)
+          pendingRequestPaxMin = paxBounds.min;
+        if ((paxBounds == null ? void 0 : paxBounds.max) !== void 0)
+          pendingRequestPaxMax = paxBounds.max;
       }
       const occupyDetails = await this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
       const occupyDetail = occupyDetails[0] ?? null;