@pisell/pisellos 2.2.282 → 2.2.284

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

@@ -1,152 +1,154 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/solution/BookingTicket/utils/addProductDecision.ts
-var addProductDecision_exports = {};
-__export(addProductDecision_exports, {
-  buildCacheItemFromCartDetail: () => buildCacheItemFromCartDetail,
-  buildCacheItemFromDetail: () => buildCacheItemFromDetail,
-  buildRequiresDetailPayload: () => buildRequiresDetailPayload,
-  decideAddProduct: () => decideAddProduct,
-  decideAfterDetail: () => decideAfterDetail,
-  decideAutoClose: () => decideAutoClose,
-  getIsEject: () => getIsEject,
-  getIsOnlySession: () => getIsOnlySession,
-  prepareBookingCacheItem: () => prepareBookingCacheItem,
-  transformDetailToProductAndBooking: () => transformDetailToProductAndBooking
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(addProductDecision_exports);
-var import_dayjs = __toESM(require("dayjs"));
-var import_BookingContext = require("../../../modules/BookingContext");
-var import_transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
-var import_weighingProductSku = require("./weighingProductSku");
+exports.buildCacheItemFromCartDetail = buildCacheItemFromCartDetail;
+exports.buildCacheItemFromDetail = buildCacheItemFromDetail;
+exports.buildRequiresDetailPayload = buildRequiresDetailPayload;
+exports.decideAddProduct = decideAddProduct;
+exports.decideAfterDetail = decideAfterDetail;
+exports.decideAutoClose = decideAutoClose;
+exports.getIsEject = getIsEject;
+exports.getIsOnlySession = getIsOnlySession;
+exports.prepareBookingCacheItem = prepareBookingCacheItem;
+exports.transformDetailToProductAndBooking = transformDetailToProductAndBooking;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _BookingContext = require("../../../modules/BookingContext");
+var _transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
+var _weighingProductSku = require("./weighingProductSku");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
+ *
+ * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（门禁：`getIsAutoClose` on prepared cacheItem）
+ * 3. `add`：两关均通过，直接 transform + 加车
+ */
+
+/** 资源 / 时间编辑抽屉所需的最小 payload。 */
+
+/**
+ * 第一段：是否需要打开规格 / SKU 详情弹窗（与 addService `handleSelectProduct` 一致，不用 `getIsEject` 做门禁）。
+ */
 function needsSpecDetailModal(item) {
-  if (item == null ? void 0 : item.open_sold_weight)
-    return true;
-  if (item == null ? void 0 : item.isOpenDetailModal)
-    return true;
-  if (!(item == null ? void 0 : item.cartDetailValue))
-    return true;
+  if (item?.open_sold_weight) return true;
+  if (item?.isOpenDetailModal) return true;
+  if (!item?.cartDetailValue) return true;
   return false;
 }
+
+/**
+ * 第二段：预约商品是否仍需打开资源 / 时间编辑（与 info2 `cacheItem.autoClose` 等价）。
+ */
 function needsBookingEdit(cacheItem, ctx) {
-  if (isNormalBookingProduct(cacheItem))
-    return false;
-  const isAutoAllocationOn = (ctx == null ? void 0 : ctx.isAutoAllocationOn) || (() => true);
-  return !(0, import_BookingContext.getIsAutoClose)(cacheItem, isAutoAllocationOn);
+  if (isNormalBookingProduct(cacheItem)) return false;
+  const isAutoAllocationOn = ctx?.isAutoAllocationOn || (() => true);
+  return !(0, _BookingContext.getIsAutoClose)(cacheItem, isAutoAllocationOn);
 }
 function buildRequiresBookingEditPayload(cacheItem, ctx) {
   return {
     cacheItem,
-    customerId: ctx == null ? void 0 : ctx.customerId,
-    date: typeof (ctx == null ? void 0 : ctx.date) === "string" ? ctx.date : null
+    customerId: ctx?.customerId,
+    date: typeof ctx?.date === 'string' ? ctx.date : null
   };
 }
+
+/**
+ * 加车主决策：对齐 `handleSelectProduct` 两段分支。
+ */
 function decideAddProduct(item, ctx) {
   const derivedCtx = withDerivedBookingCtx(ctx);
   if (needsSpecDetailModal(item)) {
     return {
-      action: "requiresDetail",
+      action: 'requiresDetail',
       payload: buildRequiresDetailPayload(item, derivedCtx)
     };
   }
-  const cacheItem = prepareBookingCacheItem(
-    buildCacheItemFromCartDetail(item, derivedCtx),
-    derivedCtx
-  );
+  const cacheItem = prepareBookingCacheItem(buildCacheItemFromCartDetail(item, derivedCtx), derivedCtx);
   if (needsBookingEdit(cacheItem, derivedCtx)) {
     return {
-      action: "requiresBookingEdit",
+      action: 'requiresBookingEdit',
       cacheItem,
       payload: buildRequiresBookingEditPayload(cacheItem, derivedCtx)
     };
   }
-  return { action: "add", cacheItem };
+  return {
+    action: 'add',
+    cacheItem
+  };
 }
+
+/**
+ * 规格弹窗 callback 后的第二段决策（对齐 `handleBooking4Service` 内 `cacheItem.autoClose` 分支）。
+ */
 function decideAfterDetail(cacheItem, ctx) {
   const derivedCtx = withDerivedBookingCtx(ctx);
   const extended = prepareBookingCacheItem(cacheItem, derivedCtx);
   if (needsBookingEdit(extended, derivedCtx)) {
     return {
-      action: "requiresBookingEdit",
+      action: 'requiresBookingEdit',
       cacheItem: extended,
       payload: buildRequiresBookingEditPayload(extended, derivedCtx)
     };
   }
-  return { action: "add", cacheItem: extended };
+  return {
+    action: 'add',
+    cacheItem: extended
+  };
 }
+
+/**
+ * @deprecated 请用 `decideAddProduct`；保留兼容：autoClose=true 仅表示可直接加车（action=add）。
+ */
+
 function isNormalBookingProduct(item) {
-  return !(0, import_BookingContext.isBookingProduct)(item);
+  return !(0, _BookingContext.isBookingProduct)(item);
 }
 function hasPreparedBookingExtend(cacheItem) {
-  var _a;
-  if ((0, import_BookingContext.productNeedsResourceExtend)(cacheItem) && !(0, import_BookingContext.hasActualResourceSelection)(cacheItem)) {
+  // 场次/时间已写入但资源仍未选中时，须继续走 getProductExtend（对齐 info2 必定调用 getProductExtend）。
+  if ((0, _BookingContext.productNeedsResourceExtend)(cacheItem) && !(0, _BookingContext.hasActualResourceSelection)(cacheItem)) {
     return false;
   }
-  const ext = (cacheItem == null ? void 0 : cacheItem._extend) || {};
-  const hasResourceState = Boolean(
-    (0, import_BookingContext.hasActualResourceSelection)(cacheItem) && ext.capacity && (ext.endDate || ext.end_date)
-  );
-  const hasSessionState = Boolean(
-    (0, import_BookingContext.isSessionProduct)(cacheItem) && ((_a = ext.other) == null ? void 0 : _a.session) && ext.start_time && (ext.end_time || ext.endDate)
-  );
+  const ext = cacheItem?._extend || {};
+  const hasResourceState = Boolean((0, _BookingContext.hasActualResourceSelection)(cacheItem) && ext.capacity && (ext.endDate || ext.end_date));
+  const hasSessionState = Boolean((0, _BookingContext.isSessionProduct)(cacheItem) && ext.other?.session && ext.start_time && (ext.end_time || ext.endDate));
   const hasMultiDayState = Boolean(isNormalBookingProduct(cacheItem) === false && isMultiDayLike(cacheItem));
-  const hasExplicitTimeState = Boolean(
-    ext.duration && (ext.start_date || ext.startDate) && ext.start_time && (ext.end_date && ext.end_time || ext.endDate)
-  );
+  const hasExplicitTimeState = Boolean(ext.duration && (ext.start_date || ext.startDate) && ext.start_time && (ext.end_date && ext.end_time || ext.endDate));
   return hasResourceState || hasSessionState || hasMultiDayState || hasExplicitTimeState;
 }
+
+/** 弹窗 / Host 使用的日历日，与 ticketBooking `state.date.format('YYYY-MM-DD')` 对齐。 */
 function formatBookingDateForUI(date) {
-  if (date == null || date === "")
-    return null;
-  const parsed = (0, import_dayjs.default)(date);
-  return parsed.isValid() ? parsed.format("YYYY-MM-DD") : null;
+  if (date == null || date === '') return null;
+  const parsed = (0, _dayjs.default)(date);
+  return parsed.isValid() ? parsed.format('YYYY-MM-DD') : null;
 }
+
+/** 补齐 presetStartTime（decideAutoClose / transform 与 BookingTicket.buildAddProductCtx 共用）。 */
 function withDerivedBookingCtx(ctx) {
-  if (!ctx)
-    return {};
+  if (!ctx) return {};
   return {
     ...ctx,
-    presetStartTime: ctx.presetStartTime ?? (0, import_BookingContext.derivePresetStartTimeFromDate)(ctx.date)
+    presetStartTime: ctx.presetStartTime ?? (0, _BookingContext.derivePresetStartTimeFromDate)(ctx.date)
   };
 }
 function isMultiDayLike(cacheItem) {
-  var _a;
-  const ext = (cacheItem == null ? void 0 : cacheItem._extend) || {};
-  return Boolean(
-    ((_a = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _a.type) === "days" && ext.duration && ext.start_date && ext.end_date
-  );
+  const ext = cacheItem?._extend || {};
+  return Boolean(cacheItem?.duration?.type === 'days' && ext.duration && ext.start_date && ext.end_date);
 }
+
+/**
+ * 统一补齐预约商品的运行态字段。
+ *
+ * 新链路不再让决策和提交各自重建 cacheItem；这里作为唯一入口补齐
+ * `_extend.resource / capacity / startDate / endDate` 等后续 booking mapper 需要的字段。
+ */
 function prepareBookingCacheItem(cacheItem, ctx) {
   if (isNormalBookingProduct(cacheItem) || hasPreparedBookingExtend(cacheItem)) {
     return cacheItem;
   }
-  return (0, import_BookingContext.getProductExtend)({
+  return (0, _BookingContext.getProductExtend)({
     cacheItem,
     ctx: withDerivedBookingCtx(ctx),
     isDisabledTime: true
@@ -154,62 +156,83 @@ function prepareBookingCacheItem(cacheItem, ctx) {
 }
 function decideAutoClose(item, ctx) {
   const decision = decideAddProduct(item, ctx);
-  if (decision.action === "add") {
-    return { autoClose: true, cacheItem: decision.cacheItem };
+  if (decision.action === 'add') {
+    return {
+      autoClose: true,
+      cacheItem: decision.cacheItem
+    };
   }
-  if (decision.action === "requiresBookingEdit") {
-    return { autoClose: false, cacheItem: decision.cacheItem };
+  if (decision.action === 'requiresBookingEdit') {
+    return {
+      autoClose: false,
+      cacheItem: decision.cacheItem
+    };
   }
-  return { autoClose: false };
+  return {
+    autoClose: false
+  };
 }
-function getIsEject(item, type = "select") {
-  const isSession = (0, import_BookingContext.isSessionProduct)(item);
-  const isSoldByWeight = Boolean(item == null ? void 0 : item.open_sold_weight);
-  const need = type === "detail" || ((item == null ? void 0 : item.bundle_group_count) || 0) > 0 || ((item == null ? void 0 : item.option_group_count) || 0) > 0 || ((item == null ? void 0 : item.is_variant) || 0) > 0 || isSession || isSoldByWeight;
+
+/**
+ * 替代 info2 `getIsEject`：商品是否需要弹窗（含 type='detail' / option_group / bundle_group / variant / session / sold_by_weight）。
+ */
+function getIsEject(item, type = 'select') {
+  const isSession = (0, _BookingContext.isSessionProduct)(item);
+  const isSoldByWeight = Boolean(item?.open_sold_weight);
+  const need = type === 'detail' || (item?.bundle_group_count || 0) > 0 || (item?.option_group_count || 0) > 0 || (item?.is_variant || 0) > 0 || isSession || isSoldByWeight;
   return need ? 1 : 0;
 }
+
+/** 仅 session 商品（且没有 variant/option/package）。 */
 function getIsOnlySession(item) {
-  const isSession = (0, import_BookingContext.isSessionProduct)(item);
-  return !(((item == null ? void 0 : item.bundle_group_count) || 0) > 0 || ((item == null ? void 0 : item.option_group_count) || 0) > 0 || ((item == null ? void 0 : item.is_variant) || 0) > 0) && isSession;
+  const isSession = (0, _BookingContext.isSessionProduct)(item);
+  return !((item?.bundle_group_count || 0) > 0 || (item?.option_group_count || 0) > 0 || (item?.is_variant || 0) > 0) && isSession;
 }
+
+/**
+ * 拼装 requiresDetail payload；showConfig 与 info2 弹窗内部判断一致。
+ */
 function buildRequiresDetailPayload(item, ctx) {
   const isOnlySession = getIsOnlySession(item);
-  const isEject = getIsEject(item, (ctx == null ? void 0 : ctx.type) || "select");
+  const isEject = getIsEject(item, ctx?.type || 'select');
   return {
     item,
     showConfig: {
-      option: ((item == null ? void 0 : item.option_group_count) || 0) > 0,
-      session: (0, import_BookingContext.isSessionProduct)(item),
-      variant: ((item == null ? void 0 : item.is_variant) || 0) > 0,
-      package: ((item == null ? void 0 : item.bundle_group_count) || 0) > 0,
-      number: Boolean(item == null ? void 0 : item.open_sold_weight)
+      option: (item?.option_group_count || 0) > 0,
+      session: (0, _BookingContext.isSessionProduct)(item),
+      variant: (item?.is_variant || 0) > 0,
+      package: (item?.bundle_group_count || 0) > 0,
+      number: Boolean(item?.open_sold_weight)
     },
     isOnlySession,
     isEject: isEject ? 1 : 0,
-    customerId: ctx == null ? void 0 : ctx.customerId,
-    date: formatBookingDateForUI(ctx == null ? void 0 : ctx.date),
+    customerId: ctx?.customerId,
+    date: formatBookingDateForUI(ctx?.date),
     productData: item
   };
 }
+
+/**
+ * 用 item.cartDetailValue 拼装一个 cacheItem 雏形（与 info2 `handleDirectAddService` 等价路径）。
+ * 这里只补 `_extend.start_date / quantity / other` 等运行态字段；后续走 getProductExtend 才会补齐资源 / 时间。
+ */
 function buildCacheItemFromCartDetail(item, ctx) {
-  var _a;
   const cartDetailValue = item.cartDetailValue || {};
   const other = JSON.parse(JSON.stringify(cartDetailValue || {}));
   other.session = cartDetailValue.session;
+  /** 列表/接口可能只带 product_id 不带 id，勿用 item.id 覆盖掉已有 product_id */
   const resolvedId = item.id ?? item.product_id;
-  let extend = (0, import_BookingContext.applySessionTimesToExtend)(
-    item,
-    {
-      start_date: (ctx == null ? void 0 : ctx.date) || void 0,
-      /** 列表连点 / 防抖合并时以 ctx.quantity 为准，避免 cartDetailValue 默认 1 盖掉合并数量 */
-      quantity: (ctx == null ? void 0 : ctx.quantity) ?? (cartDetailValue == null ? void 0 : cartDetailValue.quantity) ?? 1,
-      product_name: item.title,
-      other,
-      isNormalProduct: !(0, import_BookingContext.isBookingProduct)(item),
-      price: ((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.price) ?? (item == null ? void 0 : item.price)
-    },
-    { date: ctx == null ? void 0 : ctx.date }
-  );
+  let extend = (0, _BookingContext.applySessionTimesToExtend)(item, {
+    start_date: ctx?.date || undefined,
+    /** 列表连点 / 防抖合并时以 ctx.quantity 为准，避免 cartDetailValue 默认 1 盖掉合并数量 */
+    quantity: ctx?.quantity ?? cartDetailValue?.quantity ?? 1,
+    product_name: item.title,
+    other,
+    isNormalProduct: !(0, _BookingContext.isBookingProduct)(item),
+    price: item?._extend?.price ?? item?.price
+  }, {
+    date: ctx?.date
+  });
   return {
     ...item,
     id: resolvedId,
@@ -219,104 +242,119 @@ function buildCacheItemFromCartDetail(item, ctx) {
     new: 1
   };
 }
+
+/**
+ * 用 Info2 callback 的 (e, extension_type, detail) 拼装 cacheItem。
+ *
+ * 保留 detail._extend 中的 pricing / note（规格弹窗改价、备注等），
+ * 再叠加 session 时间、ctx.quantity 等运行态字段；other 以 callback `e` 为准。
+ */
 function buildCacheItemFromDetail(item, detailResult, ctx) {
-  var _a, _b, _c;
   const _currentItem = detailResult.detail || item;
   const _detail = _currentItem;
-  const detailExtend = (_detail == null ? void 0 : _detail._extend) || {};
+  const detailExtend = _detail?._extend || {};
   const other = JSON.parse(JSON.stringify(detailResult.e || {}));
-  other.session = (_a = detailResult.e) == null ? void 0 : _a.session;
+  other.session = detailResult.e?.session;
   const resolvedId = _currentItem.id ?? _currentItem.product_id;
-  const mergedItem = { ...item, ..._detail, extension_type: _detail.extension_type ?? item.extension_type };
-  const runtimeExtend = (0, import_BookingContext.applySessionTimesToExtend)(
-    mergedItem,
-    {
-      start_date: (ctx == null ? void 0 : ctx.date) || detailExtend.start_date || void 0,
-      quantity: (ctx == null ? void 0 : ctx.quantity) ?? ((_b = detailResult.e) == null ? void 0 : _b.quantity) ?? detailExtend.quantity ?? 1,
-      price: detailExtend.price ?? (_detail == null ? void 0 : _detail.price) ?? (item == null ? void 0 : item.price),
-      product_name: _currentItem.title ?? detailExtend.product_name,
-      other,
-      isNormalProduct: !(0, import_BookingContext.isBookingProduct)(mergedItem)
-    },
-    { date: ctx == null ? void 0 : ctx.date }
-  );
+  const mergedItem = {
+    ...item,
+    ..._detail,
+    extension_type: _detail.extension_type ?? item.extension_type
+  };
+  const runtimeExtend = (0, _BookingContext.applySessionTimesToExtend)(mergedItem, {
+    start_date: ctx?.date || detailExtend.start_date || undefined,
+    quantity: ctx?.quantity ?? detailResult.e?.quantity ?? detailExtend.quantity ?? 1,
+    price: detailExtend.price ?? _detail?.price ?? item?.price,
+    product_name: _currentItem.title ?? detailExtend.product_name,
+    other,
+    isNormalProduct: !(0, _BookingContext.isBookingProduct)(mergedItem)
+  }, {
+    date: ctx?.date
+  });
   const extend = {
     ...detailExtend,
     ...runtimeExtend,
     other
   };
-  const note = detailExtend.note ?? (_detail == null ? void 0 : _detail.note);
+  const note = detailExtend.note ?? _detail?.note;
   return {
     ..._detail,
     id: resolvedId,
     product_id: resolvedId,
     extension_type: mergedItem.extension_type,
-    _key: (_c = detailResult.e) == null ? void 0 : _c.key,
-    ...note != null && note !== "" ? { note: String(note) } : {},
+    _key: detailResult.e?.key,
+    ...(note != null && note !== '' ? {
+      note: String(note)
+    } : {}),
     _extend: extend,
     new: 1
   };
 }
+
+/**
+ * `transformDetailToProductAndBooking`：把 cacheItem 拆成 OS `addProductToOrder` 所需的 `(product, booking)`。
+ *
+ * - `product` 走 `transformBaseProductToOrderProduct`（沿用 BaseSales 现有 mapper）。
+ * - `booking` 走 `cacheItemToBookingInput`（严格按 TEMP_ORDER_FIELDS_SUMMARY.md 协议）。
+ * - 普通商品（无 duration / 无 schedules）不产 booking，与 info2 一致。
+ */
 function transformDetailToProductAndBooking(cacheItem, ctx) {
   const preparedCacheItem = prepareBookingCacheItem(cacheItem, withDerivedBookingCtx(ctx));
   const payload = buildBasePayloadFromCacheItem(preparedCacheItem, ctx);
-  const productInput = (0, import_transformBaseProductToOrderProduct.transformBaseProductToOrderProduct)({
+  const productInput = (0, _transformBaseProductToOrderProduct.transformBaseProductToOrderProduct)({
     payload,
     sourceProduct: preparedCacheItem
   });
   if (!productInput) {
-    throw new Error(
-      "[BookingTicket] transformDetailToProductAndBooking: product transform failed (missing numeric item.id / item.product_id)"
-    );
+    throw new Error('[BookingTicket] transformDetailToProductAndBooking: product transform failed (missing numeric item.id / item.product_id)');
   }
   const isNormalProduct = isNormalBookingProduct(preparedCacheItem);
   let booking;
   if (!isNormalProduct) {
-    booking = (0, import_BookingContext.cacheItemToBookingInput)(preparedCacheItem, { bookingConfig: ctx == null ? void 0 : ctx.bookingConfig });
+    booking = (0, _BookingContext.cacheItemToBookingInput)(preparedCacheItem, {
+      bookingConfig: ctx?.bookingConfig
+    });
   }
-  return { product: productInput, booking, cacheItem: preparedCacheItem };
+  return {
+    product: productInput,
+    booking,
+    cacheItem: preparedCacheItem
+  };
 }
+
+/**
+ * 把 cacheItem._extend.other 中的字段 + 顶层运行态拼成 `BaseProductDetailPayload`。
+ */
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _a, _b, _c, _d;
-  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);
-  const extend = (cacheItem == null ? void 0 : cacheItem._extend) || {};
-  const productSku = (0, import_weighingProductSku.buildProductSkuFromCacheItem)(cacheItem);
+  const other = cacheItem?._extend?.other || {};
+  const quantity = ctx?.quantity != null && ctx.quantity > 0 ? ctx.quantity : cacheItem?._extend?.quantity ?? 1;
+  const resolvedPid = cacheItem?.product_id ?? cacheItem?.id;
+  const extend = cacheItem?._extend || {};
+  const productSku = (0, _weighingProductSku.buildProductSkuFromCacheItem)(cacheItem);
   return {
-    id: (cacheItem == null ? void 0 : cacheItem.id) ?? (cacheItem == null ? void 0 : cacheItem.product_id),
+    id: cacheItem?.id ?? cacheItem?.product_id,
     product_id: resolvedPid,
-    variant_id: (other == null ? void 0 : other.product_variant_id) ?? (other == null ? void 0 : other.variant_id) ?? 0,
+    variant_id: other?.product_variant_id ?? other?.variant_id ?? 0,
     quantity,
     // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
-    product_sku: productSku ? { ...productSku, option: (other == null ? void 0 : other.option) || [] } : void 0,
-    option: (other == null ? void 0 : other.option) || [],
-    bundle: (other == null ? void 0 : other.bundle) || ((_c = extend == null ? void 0 : extend.skuValue) == null ? void 0 : _c.bundle) || ((_d = extend == null ? void 0 : extend._skuValue) == null ? void 0 : _d.bundle) || [],
-    unique: other == null ? void 0 : other.unique,
-    session: other == null ? void 0 : other.session,
-    note: extend == null ? void 0 : extend.note,
-    price: (extend == null ? void 0 : extend.price) ?? (cacheItem == null ? void 0 : cacheItem.price),
-    selling_price: (extend == null ? void 0 : extend.price) ?? (cacheItem == null ? void 0 : cacheItem.price),
-    line_total: extend == null ? void 0 : extend.total,
-    total: extend == null ? void 0 : extend.total,
-    origin_total: extend == null ? void 0 : extend.origin_total,
-    price_override: extend == null ? void 0 : extend.priceOverride,
-    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,
+    product_sku: productSku ? {
+      ...productSku,
+      option: other?.option || []
+    } : undefined,
+    option: other?.option || [],
+    bundle: other?.bundle || extend?.skuValue?.bundle || extend?._skuValue?.bundle || [],
+    unique: other?.unique,
+    session: other?.session,
+    note: extend?.note,
+    price: extend?.price ?? cacheItem?.price,
+    selling_price: extend?.price ?? cacheItem?.price,
+    line_total: extend?.total,
+    total: extend?.total,
+    origin_total: extend?.origin_total,
+    price_override: extend?.priceOverride,
+    bundle_edit: extend?.bundle_edit,
+    discount_reason: extend?.discount_reason,
+    discount_list: cacheItem?.discount_list,
     _extend: extend
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildCacheItemFromCartDetail,
-  buildCacheItemFromDetail,
-  buildRequiresDetailPayload,
-  decideAddProduct,
-  decideAfterDetail,
-  decideAutoClose,
-  getIsEject,
-  getIsOnlySession,
-  prepareBookingCacheItem,
-  transformDetailToProductAndBooking
-});
+}