@pisell/pisellos 2.2.162 → 2.2.164

package/dist/solution/BaseSales/types.d.ts

@@ -1,4 +1,4 @@
-import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
+import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 /**
@@ -203,6 +203,52 @@ export interface BaseSalesSubmitPayload extends Omit<BaseSalesTempOrder, 'platfo
     }>;
     products: BaseSalesSubmitProduct[];
 }
+export interface BaseSalesQuotationDurationConfig {
+    type: string;
+    value: number;
+    flexible_config?: {
+        is_enable_minimum_duration?: 0 | 1;
+        warning_threshold?: number;
+        block_threshold?: number;
+    };
+}
+export interface BaseSalesCalculateProductBookingPriceParams {
+    product: Record<string, any>;
+    booking?: {
+        start_date?: string;
+        start_time?: string;
+        end_date?: string;
+        end_time?: string;
+        [key: string]: any;
+    };
+    duration?: BaseSalesQuotationDurationConfig;
+    customer_id?: number | string;
+    fallback_price?: number | string;
+    datetime?: string;
+    channel?: string;
+}
+export type BaseSalesProductBookingPriceSegmentSource = 'quotation' | 'fallback';
+export interface BaseSalesProductBookingPriceSegment {
+    start_datetime: string;
+    end_datetime?: string;
+    time_point: string;
+    unit_price: string;
+    quantity: number;
+    total_price: string;
+    quotation_shelf_id: number;
+    source: BaseSalesProductBookingPriceSegmentSource;
+}
+export interface BaseSalesProductBookingPriceResult {
+    product_id: number | null;
+    product_variant_id: number;
+    customer_id?: number | string;
+    unit_price: string;
+    total_price: string;
+    quantity: number;
+    duration?: BaseSalesQuotationDurationConfig;
+    quotation_shelf_id: number;
+    segments: BaseSalesProductBookingPriceSegment[];
+}
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {
     policy?: string | null;
@@ -281,6 +327,7 @@ export interface BaseSalesState {
     error: string | null;
     products?: ProductList;
     order?: OrderModule;
+    quotation?: QuotationModule;
     salesSummary?: SalesSummaryModule;
     baseSalesLogger?: BaseSalesLoggerModule;
     schedule?: ScheduleModule;

package/dist/solution/BaseSales/utils/quotationPrice.d.ts

@@ -0,0 +1,7 @@
+import type { QuotationModule } from '../../../modules/Quotation';
+import type { BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult } from '../types';
+interface BuildBaseSalesQuotationPriceParams extends BaseSalesCalculateProductBookingPriceParams {
+    quotation?: Pick<QuotationModule, 'getPriceForProduct' | 'getQuotationShelfId'> | null;
+}
+export declare function calculateBaseSalesProductBookingPrice(params: BuildBaseSalesQuotationPriceParams): BaseSalesProductBookingPriceResult;
+export {};

package/dist/solution/BaseSales/utils/quotationPrice.js

@@ -0,0 +1,159 @@
+import dayjs from 'dayjs';
+import Decimal from 'decimal.js';
+function toFiniteNumber(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var parsedValue = Number(value);
+  if (!Number.isFinite(parsedValue)) return fallback;
+  return parsedValue;
+}
+function toPositiveInt(value) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var parsedValue = Math.floor(Number(value));
+  if (!Number.isFinite(parsedValue) || parsedValue < 1) return fallback;
+  return parsedValue;
+}
+function toPriceString(value) {
+  return new Decimal(Number(value) || 0).toDecimalPlaces(2).toFixed(2);
+}
+function normalizeDateTime(value) {
+  if (typeof value !== 'string' || !value.trim()) return null;
+  var normalized = value.includes(':') ? value : "".concat(value, " 00:00:00");
+  var datetime = dayjs(normalized);
+  if (!datetime.isValid()) return null;
+  return datetime;
+}
+function buildBookingDateTime(date, time) {
+  if (typeof date !== 'string' || !date.trim()) return null;
+  var timeText = typeof time === 'string' && time.trim() ? time.trim() : '00:00';
+  var datetime = dayjs("".concat(date.trim(), " ").concat(timeText));
+  if (!datetime.isValid()) return null;
+  return datetime;
+}
+function getDurationUnit(type) {
+  var normalizedType = String(type || '').toLowerCase();
+  if (normalizedType === 'day' || normalizedType === 'days') return 'day';
+  if (normalizedType === 'minute' || normalizedType === 'minutes') return 'minute';
+  return null;
+}
+function getProductId(product) {
+  var _product$product_id;
+  var productId = toFiniteNumber((_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product.id, NaN);
+  if (!Number.isFinite(productId)) return null;
+  return productId;
+}
+function getProductVariantId(product) {
+  var _product$product_vari;
+  var variantId = toFiniteNumber((_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : product.variant_id, 0);
+  if (!Number.isFinite(variantId) || variantId <= 0) return undefined;
+  return variantId;
+}
+function getFallbackPrice(params) {
+  var _ref, _ref2, _ref3, _params$fallback_pric;
+  var product = params.product || {};
+  return toPriceString((_ref = (_ref2 = (_ref3 = (_params$fallback_pric = params.fallback_price) !== null && _params$fallback_pric !== void 0 ? _params$fallback_pric : product.price) !== null && _ref3 !== void 0 ? _ref3 : product.selling_price) !== null && _ref2 !== void 0 ? _ref2 : product.original_price) !== null && _ref !== void 0 ? _ref : 0);
+}
+function getProductQuantity(product) {
+  var _product$num;
+  return toPositiveInt((_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.quantity, 1);
+}
+function shouldSplitByDuration(duration, start, end) {
+  if (!duration) return false;
+  if (!start || !end || !end.isAfter(start)) return false;
+  var unit = getDurationUnit(duration.type);
+  var value = toFiniteNumber(duration.value);
+  return !!unit && value > 0;
+}
+function buildTimeSegments(params) {
+  var booking = params.booking || {};
+  var explicitDatetime = normalizeDateTime(params.datetime);
+  var bookingStart = buildBookingDateTime(booking.start_date, booking.start_time);
+  var start = bookingStart || explicitDatetime || dayjs();
+  var bookingEnd = buildBookingDateTime(booking.end_date, booking.end_time);
+  if (!shouldSplitByDuration(params.duration, start, bookingEnd)) {
+    return [{
+      start: start
+    }];
+  }
+  var unit = getDurationUnit(params.duration.type);
+  var value = toFiniteNumber(params.duration.value);
+  var segments = [];
+  var cursor = start;
+  var guard = 0;
+  while (cursor.isBefore(bookingEnd) && guard < 10000) {
+    var next = cursor.add(value, unit);
+    segments.push({
+      start: cursor,
+      end: next.isBefore(bookingEnd) ? next : bookingEnd !== null && bookingEnd !== void 0 ? bookingEnd : undefined
+    });
+    cursor = next;
+    guard += 1;
+  }
+  return segments.length ? segments : [{
+    start: start
+  }];
+}
+function formatTimePoint(datetime) {
+  return datetime.format('YYYY-MM-DD HH:mm:ss');
+}
+function buildPriceSegment(params) {
+  var timePoint = formatTimePoint(params.segment.start);
+  var quotedPrice = params.quotation && params.productId !== null ? params.quotation.getPriceForProduct({
+    productId: params.productId,
+    variantId: params.variantId,
+    datetime: timePoint,
+    customer_id: params.customerId
+  }) : null;
+  var unitPrice = toPriceString(quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : params.fallbackPrice);
+  var quotationShelfId = quotedPrice !== null && params.quotation && params.productId !== null ? params.quotation.getQuotationShelfId({
+    productId: params.productId,
+    variantId: params.variantId,
+    datetime: timePoint,
+    customer_id: params.customerId
+  }) : 0;
+  return {
+    start_datetime: timePoint,
+    end_datetime: params.segment.end ? formatTimePoint(params.segment.end) : undefined,
+    time_point: timePoint,
+    unit_price: unitPrice,
+    quantity: 1,
+    total_price: unitPrice,
+    quotation_shelf_id: quotationShelfId,
+    source: quotedPrice !== null ? 'quotation' : 'fallback'
+  };
+}
+export function calculateBaseSalesProductBookingPrice(params) {
+  var _segments$find;
+  var product = params.product || {};
+  var productId = getProductId(product);
+  var variantId = getProductVariantId(product);
+  var productQuantity = getProductQuantity(product);
+  var fallbackPrice = getFallbackPrice(params);
+  var segments = buildTimeSegments(params).map(function (segment) {
+    return buildPriceSegment({
+      quotation: params.quotation,
+      productId: productId,
+      variantId: variantId,
+      customerId: params.customer_id,
+      fallbackPrice: fallbackPrice,
+      segment: segment
+    });
+  });
+  var unitPrice = segments.reduce(function (total, segment) {
+    return total.plus(segment.total_price);
+  }, new Decimal(0));
+  var totalPrice = unitPrice.times(productQuantity);
+  var quotationShelfId = ((_segments$find = segments.find(function (segment) {
+    return segment.quotation_shelf_id;
+  })) === null || _segments$find === void 0 ? void 0 : _segments$find.quotation_shelf_id) || 0;
+  return {
+    product_id: productId,
+    product_variant_id: variantId !== null && variantId !== void 0 ? variantId : 0,
+    customer_id: params.customer_id,
+    unit_price: unitPrice.toDecimalPlaces(2).toFixed(2),
+    total_price: totalPrice.toDecimalPlaces(2).toFixed(2),
+    quantity: productQuantity,
+    duration: params.duration,
+    quotation_shelf_id: quotationShelfId,
+    segments: segments
+  };
+}

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -1,10 +1,15 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketState, IGetCustomerListParams, ICustomer, ILoadProductsParams, ILoadProductDetailParams, IScanResult } from './types';
 import type { ProductData } from '../../modules';
+import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
 import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
+import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
+import { type BuildCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildCacheItemFromOrderLine';
+import { type BuildNormalProductCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine';
+import type { AddProductBookingInput, OrderProduct, OrderProductIdentity, UpdateOrderProductParams } from '../../modules/Order/types';
 export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -17,9 +22,11 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private scan;
     private productCatalog;
     /**
-     * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer。
+     * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
+     * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
      */
     protected getRegisteredModuleNames(): readonly string[];
+    protected getSubmitOrderSalesChannel(): string;
     /**
      * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
      * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -186,6 +193,16 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 清空下单客户（协议字段 + snapshot）。
      */
     clearOrderCustomer(): void;
+    /**
+     * 重置 tempOrder，并同步清空下单客户运行态。
+     *
+     * OrderModule.restoreOrder 会重建空单（customer_id 已为 null），但不会：
+     *  - emit BookingTicket `onOrderCustomerChange`
+     *  - 重置 CustomerModule.selectedCustomer（老路 getActiveCustomer）
+     *
+     * 因此在 super.restoreOrder 之后显式清客户，保证 SalesSdk / ticketBooking 订阅方与 tempOrder 一致。
+     */
+    restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
     /**
@@ -291,6 +308,109 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * @returns 其他参数
      */
     getOtherParams(): Promise<Record<string, any>>;
+    /** 拉取 board config 并写入 BookingContext。 */
+    loadBookingConfig(params?: LoadBookingConfigParams): Promise<BookingContextConfig | null>;
+    /** 拉取资源全集并写入 BookingContext。 */
+    loadBookingResources(params?: LoadBookingResourcesParams): Promise<BookingContextResource[]>;
+    /** 初始化 BookingContext（date + config + resources）。 */
+    initBookingContext(params?: InitBookingContextParams): Promise<BookingContextState>;
+    /** 当前 store 是否已具备与入参等价的 config / resources（无需再请求接口）。 */
+    isBookingContextReady(params?: InitBookingContextParams): boolean;
+    /** 写入 booking config（来源：`/core/board/management/config`）。 */
+    setBookingConfig(config: BookingContextConfig | null): void;
+    /** 读取当前 booking config。 */
+    getBookingConfig(): BookingContextConfig | null;
+    /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
+    setResources(resources: BookingContextResource[] | null | undefined): void;
+    /** 读取资源全集（浅克隆）。 */
+    getResourcesOrigin(): BookingContextResource[];
+    /** 读取资源全集 map（id → resource）。 */
+    getResourcesOriginMap(): BookingContextResourceMap;
+    /** 写入当前选择的日期；支持 dayjs / Date / string。 */
+    setBookingDate(date: BookingContextDateInput): void;
+    /** 读取当前选择的日期（统一 string）。 */
+    getBookingDate(): string | null;
+    /** 读取 BookingContext 完整 store（调试 / 测试 / 透传给 SDK 使用）。 */
+    getBookingContextState(): BookingContextState;
+    /** 清空 BookingContext（切租户 / destroy 场景）。 */
+    clearBookingContext(): void;
+    /**
+     * 构造 BookingContext 计算上下文（供 getProductExtend / getResourceByIds 等读 API 复用）。
+     */
+    private buildBookingCalcContext;
+    /**
+     * 取商品当前可选资源列表（透传 OS BookingContext utils#getResourceByIds）。
+     * `extraResources` 用于把拖入未绑定的资源也展示出来。
+     */
+    getResourcesForProduct(product: any, options?: {
+        extraResources?: Array<{
+            form_id: number | string;
+            id: number;
+        }>;
+    }): any[];
+    /**
+     * 拼装 cacheItem 的 _extend / _data（资源 / 容量 / timeObj），与 info2 `getProductExtend` 等价。
+     */
+    getProductExtend(cacheItem: any, extra?: Partial<BookingCalcContext>): any;
+    /**
+     * 取资源不可用原因列表（结构化 enum + params，i18n 文案由 UI 渲染）。
+     */
+    getResourceErrors(resource: any, cacheItem: any): ResourceError[];
+    /**
+     * 拼装 addProductDecision 通用上下文（从 store 自取）。
+     */
+    private buildAddProductCtx;
+    /**
+     * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
+     * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
+     */
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    /** 规格弹窗 callback 后的第二段决策。 */
+    decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    /**
+     * @deprecated 请用 `decideAddProduct`；`autoClose=true` 仅当 action=add。
+     */
+    decideAutoClose(item: any, options?: Partial<AddProductDecideContext>): {
+        autoClose: boolean;
+        cacheItem?: any;
+    };
+    /** 替代 info2 `getIsEject`：商品是否需要弹窗（0/1）。 */
+    getIsEject(item: any, type?: 'select' | 'detail'): 0 | 1;
+    /** 仅 session 商品（无 variant/option/package）→ true。 */
+    getIsOnlySession(item: any): boolean;
+    /**
+     * 拼装 requiresDetail payload（给 SDK 直接 return 给 UI 用）。
+     */
+    buildRequiresDetailPayload(item: any, options?: Partial<AddProductDecideContext>): AddProductRequiresDetailPayload;
+    /**
+     * 把 detail 弹窗回调结果（e, extension_type, detail）转换为 `(product, booking)` 入参。
+     * 内部会先拼 cacheItem，再走 cacheItemToBookingInput 严格协议对齐。
+     */
+    transformDetailToProductAndBooking(input: {
+        item: any;
+        cacheItem?: any;
+        detailResult?: {
+            e: any;
+            extension_type?: any;
+            detail?: any;
+        };
+        options?: Partial<AddProductDecideContext>;
+    }): {
+        product: Partial<OrderProduct> & OrderProductIdentity;
+        booking?: AddProductBookingInput;
+        cacheItem: any;
+    };
+    /**
+     * 从已加车的 order line + booking 反查资源编辑抽屉所需的 cacheItem。
+     * 供 SalesSdk「编辑资源」等场景使用；字段语义与 buildCacheItemFromDetail 产出对齐。
+     */
+    buildCacheItemFromOrderLine(input: BuildCacheItemFromOrderLineInput): Record<string, any>;
+    /**
+     * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
+     */
+    buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;
+    /** 文档别名：与 OrderModule.updateOrderProduct 一致。 */
+    updateProductInOrder(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。