@pisell/pisellos 2.2.162 → 2.2.164

package/lib/solution/BookingTicket/utils/addProductDecision.d.ts

@@ -0,0 +1,111 @@
+import { BookingCalcContext } from '../../../modules/BookingContext';
+import type { ProductData } from '../../../modules/Product/types';
+import type { OrderProduct, OrderProductIdentity, AddProductBookingInput } from '../../../modules/Order/types';
+/**
+ * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
+ *
+ * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（门禁：`getIsAutoClose` on prepared cacheItem）
+ * 3. `add`：两关均通过，直接 transform + 加车
+ */
+export type AddProductDecision = {
+    action: 'add';
+    cacheItem: any;
+} | {
+    action: 'requiresDetail';
+    payload: AddProductRequiresDetailPayload;
+} | {
+    action: 'requiresBookingEdit';
+    cacheItem: any;
+    payload: AddProductRequiresBookingEditPayload;
+};
+/** 资源 / 时间编辑抽屉所需的最小 payload。 */
+export interface AddProductRequiresBookingEditPayload {
+    cacheItem: any;
+    customerId?: number | string;
+    date: string | null;
+}
+/**
+ * 加车主决策：对齐 `handleSelectProduct` 两段分支。
+ */
+export declare function decideAddProduct(item: any, ctx?: AddProductDecideContext): AddProductDecision;
+/**
+ * 规格弹窗 callback 后的第二段决策（对齐 `handleBooking4Service` 内 `cacheItem.autoClose` 分支）。
+ */
+export declare function decideAfterDetail(cacheItem: any, ctx?: AddProductDecideContext): AddProductDecision;
+/**
+ * @deprecated 请用 `decideAddProduct`；保留兼容：autoClose=true 仅表示可直接加车（action=add）。
+ */
+export interface AddProductRequiresDetailPayload {
+    item: ProductData | Record<string, any>;
+    /** UI 需展示的子弹窗开关。 */
+    showConfig: {
+        option: boolean;
+        session: boolean;
+        variant: boolean;
+        package: boolean;
+        number: boolean;
+    };
+    /** 仅 session 商品（且无 variant/option/package）→ true，UI 可只渲染 session 选择。 */
+    isOnlySession: boolean;
+    /** 0/1，与 info2 `getIsEject` 等价含义。 */
+    isEject: 0 | 1;
+    /** 当前选中客户 id（透传给 detail 弹窗用）。 */
+    customerId?: number | string;
+    /** 当前选择的日期。 */
+    date: string | null;
+    /** 透传完整商品数据，UI 渲染时直接用。 */
+    productData: ProductData | Record<string, any>;
+}
+export interface AddProductDecideContext extends BookingCalcContext {
+    type?: 'select' | 'detail';
+    quantity?: number;
+    customerId?: number | string;
+}
+/**
+ * 统一补齐预约商品的运行态字段。
+ *
+ * 新链路不再让决策和提交各自重建 cacheItem；这里作为唯一入口补齐
+ * `_extend.resource / capacity / startDate / endDate` 等后续 booking mapper 需要的字段。
+ */
+export declare function prepareBookingCacheItem(cacheItem: any, ctx?: AddProductDecideContext): any;
+export declare function decideAutoClose(item: any, ctx?: AddProductDecideContext): {
+    autoClose: boolean;
+    cacheItem?: any;
+};
+/**
+ * 替代 info2 `getIsEject`：商品是否需要弹窗（含 type='detail' / option_group / bundle_group / variant / session / sold_by_weight）。
+ */
+export declare function getIsEject(item: any, type?: 'select' | 'detail'): 0 | 1;
+/** 仅 session 商品（且没有 variant/option/package）。 */
+export declare function getIsOnlySession(item: any): boolean;
+/**
+ * 拼装 requiresDetail payload；showConfig 与 info2 弹窗内部判断一致。
+ */
+export declare function buildRequiresDetailPayload(item: any, ctx?: AddProductDecideContext): AddProductRequiresDetailPayload;
+/**
+ * 用 item.cartDetailValue 拼装一个 cacheItem 雏形（与 info2 `handleDirectAddService` 等价路径）。
+ * 这里只补 `_extend.start_date / quantity / other` 等运行态字段；后续走 getProductExtend 才会补齐资源 / 时间。
+ */
+export declare function buildCacheItemFromCartDetail(item: any, ctx?: AddProductDecideContext): any;
+/**
+ * 用 Info2 callback 的 (e, extension_type, detail) 拼装一个 cacheItem。
+ * 与 info2 `addService.tsx#handleSelectProduct.callback` 内的拼装等价（剥 pricing）。
+ */
+export declare function buildCacheItemFromDetail(item: any, detailResult: {
+    e: any;
+    extension_type?: any;
+    detail?: any;
+}, ctx?: AddProductDecideContext): any;
+/**
+ * `transformDetailToProductAndBooking`：把 cacheItem 拆成 OS `addProductToOrder` 所需的 `(product, booking)`。
+ *
+ * - `product` 走 `transformBaseProductToOrderProduct`（沿用 BaseSales 现有 mapper）。
+ * - `booking` 走 `cacheItemToBookingInput`（严格按 TEMP_ORDER_FIELDS_SUMMARY.md 协议）。
+ * - 普通商品（无 duration / 无 schedules）不产 booking，与 info2 一致。
+ */
+export declare function transformDetailToProductAndBooking(cacheItem: any, ctx?: AddProductDecideContext): {
+    product: Partial<OrderProduct> & OrderProductIdentity;
+    booking?: AddProductBookingInput;
+    cacheItem: any;
+};

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

@@ -0,0 +1,300 @@
+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);
+
+// 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
+});
+module.exports = __toCommonJS(addProductDecision_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_BookingContext = require("../../../modules/BookingContext");
+var import_transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
+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;
+  return false;
+}
+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);
+}
+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
+  };
+}
+function decideAddProduct(item, ctx) {
+  const derivedCtx = withDerivedBookingCtx(ctx);
+  if (needsSpecDetailModal(item)) {
+    return {
+      action: "requiresDetail",
+      payload: buildRequiresDetailPayload(item, derivedCtx)
+    };
+  }
+  const cacheItem = prepareBookingCacheItem(
+    buildCacheItemFromCartDetail(item, derivedCtx),
+    derivedCtx
+  );
+  if (needsBookingEdit(cacheItem, derivedCtx)) {
+    return {
+      action: "requiresBookingEdit",
+      cacheItem,
+      payload: buildRequiresBookingEditPayload(cacheItem, derivedCtx)
+    };
+  }
+  return { action: "add", cacheItem };
+}
+function decideAfterDetail(cacheItem, ctx) {
+  const derivedCtx = withDerivedBookingCtx(ctx);
+  const extended = prepareBookingCacheItem(cacheItem, derivedCtx);
+  if (needsBookingEdit(extended, derivedCtx)) {
+    return {
+      action: "requiresBookingEdit",
+      cacheItem: extended,
+      payload: buildRequiresBookingEditPayload(extended, derivedCtx)
+    };
+  }
+  return { action: "add", cacheItem: extended };
+}
+function isNormalBookingProduct(item) {
+  return !(0, import_BookingContext.isBookingProduct)(item);
+}
+function hasPreparedBookingExtend(cacheItem) {
+  var _a;
+  if ((0, import_BookingContext.productNeedsResourceExtend)(cacheItem) && !(0, import_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 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)
+  );
+  return hasResourceState || hasSessionState || hasMultiDayState || hasExplicitTimeState;
+}
+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;
+}
+function withDerivedBookingCtx(ctx) {
+  if (!ctx)
+    return {};
+  return {
+    ...ctx,
+    presetStartTime: ctx.presetStartTime ?? (0, import_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
+  );
+}
+function prepareBookingCacheItem(cacheItem, ctx) {
+  if (isNormalBookingProduct(cacheItem) || hasPreparedBookingExtend(cacheItem)) {
+    return cacheItem;
+  }
+  return (0, import_BookingContext.getProductExtend)({
+    cacheItem,
+    ctx: withDerivedBookingCtx(ctx),
+    isDisabledTime: true
+  });
+}
+function decideAutoClose(item, ctx) {
+  const decision = decideAddProduct(item, ctx);
+  if (decision.action === "add") {
+    return { autoClose: true, cacheItem: decision.cacheItem };
+  }
+  if (decision.action === "requiresBookingEdit") {
+    return { autoClose: false, cacheItem: decision.cacheItem };
+  }
+  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;
+  return need ? 1 : 0;
+}
+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;
+}
+function buildRequiresDetailPayload(item, ctx) {
+  const isOnlySession = getIsOnlySession(item);
+  const isEject = getIsEject(item, (ctx == null ? void 0 : 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)
+    },
+    isOnlySession,
+    isEject,
+    customerId: ctx == null ? void 0 : ctx.customerId,
+    date: formatBookingDateForUI(ctx == null ? void 0 : ctx.date),
+    productData: item
+  };
+}
+function buildCacheItemFromCartDetail(item, ctx) {
+  var _a;
+  const cartDetailValue = item.cartDetailValue || {};
+  const other = JSON.parse(JSON.stringify(cartDetailValue || {}));
+  other.session = cartDetailValue.session;
+  const resolvedId = item.id ?? item.product_id;
+  let extend = (0, import_BookingContext.applySessionTimesToExtend)(
+    item,
+    {
+      start_date: (ctx == null ? void 0 : ctx.date) || void 0,
+      quantity: (cartDetailValue == null ? void 0 : cartDetailValue.quantity) || (ctx == null ? void 0 : ctx.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 }
+  );
+  return {
+    ...item,
+    id: resolvedId,
+    product_id: resolvedId,
+    _key: cartDetailValue.key,
+    _extend: extend,
+    new: 1
+  };
+}
+function buildCacheItemFromDetail(item, detailResult, ctx) {
+  var _a, _b, _c;
+  const _currentItem = detailResult.detail || item;
+  const _detail = _currentItem;
+  const other = JSON.parse(JSON.stringify(detailResult.e || {}));
+  other.session = (_a = detailResult.e) == null ? void 0 : _a.session;
+  const resolvedId = _currentItem.id ?? _currentItem.product_id;
+  const mergedItem = { ...item, ..._detail, extension_type: _detail.extension_type ?? item.extension_type };
+  const extend = (0, import_BookingContext.applySessionTimesToExtend)(
+    mergedItem,
+    {
+      start_date: (ctx == null ? void 0 : ctx.date) || void 0,
+      quantity: ((_b = detailResult.e) == null ? void 0 : _b.quantity) || (ctx == null ? void 0 : ctx.quantity) || 1,
+      price: _detail == null ? void 0 : _detail.price,
+      product_name: _currentItem.title,
+      other,
+      isNormalProduct: !(0, import_BookingContext.isBookingProduct)(mergedItem)
+    },
+    { date: ctx == null ? void 0 : ctx.date }
+  );
+  return {
+    ..._detail,
+    id: resolvedId,
+    product_id: resolvedId,
+    extension_type: mergedItem.extension_type,
+    _key: (_c = detailResult.e) == null ? void 0 : _c.key,
+    _extend: extend,
+    new: 1
+  };
+}
+function transformDetailToProductAndBooking(cacheItem, ctx) {
+  const preparedCacheItem = prepareBookingCacheItem(cacheItem, withDerivedBookingCtx(ctx));
+  const payload = buildBasePayloadFromCacheItem(preparedCacheItem, ctx);
+  const productInput = (0, import_transformBaseProductToOrderProduct.transformBaseProductToOrderProduct)({
+    payload,
+    sourceProduct: preparedCacheItem
+  });
+  if (!productInput) {
+    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 });
+  }
+  return { product: productInput, booking, cacheItem: preparedCacheItem };
+}
+function buildBasePayloadFromCacheItem(cacheItem, ctx) {
+  var _a, _b, _c, _d, _e;
+  const other = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.other) || {};
+  const quantity = ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? (ctx == null ? void 0 : ctx.quantity) ?? 1;
+  const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
+  return {
+    id: (cacheItem == null ? void 0 : cacheItem.id) ?? (cacheItem == null ? void 0 : cacheItem.product_id),
+    product_id: resolvedPid,
+    variant_id: (other == null ? void 0 : other.product_variant_id) ?? (other == null ? void 0 : other.variant_id) ?? 0,
+    quantity,
+    option: (other == null ? void 0 : other.option) || [],
+    bundle: (other == null ? void 0 : other.bundle) || [],
+    unique: other == null ? void 0 : other.unique,
+    session: other == null ? void 0 : other.session,
+    note: (_c = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _c.note,
+    price: ((_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.price) ?? (cacheItem == null ? void 0 : cacheItem.price),
+    selling_price: ((_e = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _e.price) ?? (cacheItem == null ? void 0 : cacheItem.price)
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildCacheItemFromCartDetail,
+  buildCacheItemFromDetail,
+  buildRequiresDetailPayload,
+  decideAddProduct,
+  decideAfterDetail,
+  decideAutoClose,
+  getIsEject,
+  getIsOnlySession,
+  prepareBookingCacheItem,
+  transformDetailToProductAndBooking
+});

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

@@ -1,10 +1,11 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
-import type { UpdateProductInOrderParams } from '../../modules/Order/types';
+import type { UpdateOrderProductParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
+import type { ProductData } from '../../modules/Product/types';
 export * from './types';
 interface ScanOrderItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -36,11 +37,14 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private customerLoginRefreshIdInFlight;
     private static readonly PISELL1_LOGIN_SUCCESS;
     private getScanOrderLoggerContext;
+    private safeStringify;
+    private pickErrorMessage;
     private serializeError;
     private addScanOrderLog;
     private logMethodStart;
     private logMethodSuccess;
     private logMethodError;
+    private assertProductListLoaded;
     addLog(params: ScanOrderAddLogParams): Promise<void>;
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
@@ -86,10 +90,12 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
+    private findReservationRuleResource;
+    private buildScanOrderResourceMetadata;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    updateProductInOrder(params: UpdateProductInOrderParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     /**
      * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。
      * 多行同 SKU 时必须传入与删除/更新一致的 identity（如 `identity_key`）。
@@ -120,7 +126,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
         orderAmount: number;
         orderItems: any[];
     }>;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<ProductData[]>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;