@pisell/pisellos 0.0.568 → 0.0.570

package/lib/modules/Order/types.js

@@ -9,9 +9,57 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
   OrderHooks["OnOrderUpdate"] = "order:onOrderUpdate";
   OrderHooks["OnOrderCancel"] = "order:onOrderCancel";
   OrderHooks["OnOrderStatusChange"] = "order:onOrderStatusChange";
+  OrderHooks["OnOrderCustomerChange"] = "order:onOrderCustomerChange";
+  OrderHooks["OnPromotionApplied"] = "order:onPromotionApplied";
   return OrderHooks;
 }({});
-/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
+/**
+ * 促销评估器协议（OS 与 PromotionEvaluator 之间的桥接接口）。
+ *
+ * 与 `pisell_os/src/model/strategy/adapter/promotion/evaluator.ts` 中的
+ * `PromotionEvaluator` 实例结构保持兼容。SalesSdkProvider 会从 `appHelper.utils.promotionEvaluator`
+ * 读取实例并通过 `setPromotionEvaluator` 注入到 OrderModule。
+ *
+ * 这里只声明 OrderModule 需要调用的子集，避免反向依赖具体 evaluator 实现。
+ */
+/** 赠品解析回调 context（OS → SDK 的请求体） */
+/**
+ * 赠品 resolver 返回值。
+ *
+ * @example
+ * return { products: [giftProduct], bookings: [giftBooking] };
+ */
+/**
+ * 赠品解析回调签名（SDK → OS 的返回值）。
+ *
+ * - 单选项：SDK 内部自动构造商品，不弹窗
+ * - 多选项：SDK 弹窗等用户确认后构造
+ * - 用户取消：抛错或返回空数组（OS 视为放弃本次添加）
+ *
+ * 返回数组时沿用旧协议，只写 tempOrder.products；返回对象时可同时写入预约 bookings。
+ */
+/** 未满足的促销策略（购物车底部 alert 渲染源） */
+/** 上一次 applyPromotion 计算出的赠品操作（仅供调试/读取使用） */
+/** onPromotionApplied 事件 payload */
+/**
+ * tempOrder 上的下单客户协议字段视图。
+ * 这些字段会随订单提交到后端。
+ *
+ * customer_id 与 OrderTempOrder.customer_id 保持一致（number | null），
+ * 调用方若持有 string id（如 ICustomer.id 联合类型），需自行 Number() 转型。
+ */
+/**
+ * 写入下单客户的协议字段输入。
+ * `customer_id` 必传（null 表示无客户）；其余字段缺省视为「清空」（全量覆盖语义）。
+ */
+/**
+ * 下单客户变更事件 payload。
+ * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
+ * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
+ * 清空时整个 payload 为 null。
+ */
+/** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
+/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 /**
  * 订单信息
  */
@@ -21,6 +69,12 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
 /**
  * Checkout 专用订单创建参数
  */
+/**
+ * 取消订单参数
+ */
+/**
+ * 变更预约状态参数
+ */
 /**
  * 订单模块 API
  */

package/lib/modules/Order/utils/bundleDiscountHydration.d.ts

@@ -0,0 +1,5 @@
+import type { OrderProductDiscountItem } from '../types';
+declare type NormalizeDiscountList = (discountList?: unknown[] | null) => OrderProductDiscountItem[];
+export declare function restoreHydratedBundleDiscounts<T extends Record<string, any>>(product: T, normalizeDiscountList: NormalizeDiscountList): T;
+export declare function expandHydratedProductsForDiscountCollection(products: any[] | undefined | null): any[];
+export {};

package/lib/modules/Order/utils/bundleDiscountHydration.js

@@ -0,0 +1,106 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.expandHydratedProductsForDiscountCollection = expandHydratedProductsForDiscountCollection;
+exports.restoreHydratedBundleDiscounts = restoreHydratedBundleDiscounts;
+const BUNDLE_MAP_ID_KEY = 'custom_product_bundle_map_id';
+function getBundleMapId(bundle) {
+  const metadataMapId = bundle?.metadata?.[BUNDLE_MAP_ID_KEY];
+  if (metadataMapId !== undefined && metadataMapId !== null && metadataMapId !== '') {
+    return String(metadataMapId);
+  }
+  if (bundle?._id !== undefined && bundle._id !== null && bundle._id !== '') {
+    return String(bundle._id);
+  }
+  return null;
+}
+function getDiscountBundleMapId(discount) {
+  const mapId = discount?.metadata?.[BUNDLE_MAP_ID_KEY];
+  if (mapId === undefined || mapId === null || mapId === '') return null;
+  return String(mapId);
+}
+function hasSameBundleDiscount(discountList, discount) {
+  const targetOrderDiscountId = discount.order_discount_id;
+  if (targetOrderDiscountId !== undefined && targetOrderDiscountId !== null) {
+    return discountList.some(item => item?.order_discount_id === targetOrderDiscountId);
+  }
+  const targetResourceId = discount?.discount?.resource_id ?? discount?.resource_id ?? discount?.discount_id;
+  const targetMapId = getDiscountBundleMapId(discount);
+  return discountList.some(item => {
+    const resourceId = item?.discount?.resource_id ?? item?.resource_id ?? item?.discount_id;
+    return resourceId === targetResourceId && String(item?.amount ?? '') === String(discount?.amount ?? '') && getDiscountBundleMapId(item) === targetMapId;
+  });
+}
+function restoreHydratedBundleDiscounts(product, normalizeDiscountList) {
+  if (!Array.isArray(product.product_bundle) || !Array.isArray(product.discount_list)) {
+    return product;
+  }
+  const bundleByMapId = new Map();
+  product.product_bundle.forEach(bundle => {
+    if (!bundle || typeof bundle !== 'object') return;
+    const mapId = getBundleMapId(bundle);
+    if (mapId) bundleByMapId.set(mapId, bundle);
+  });
+  if (!bundleByMapId.size) return product;
+  const mainDiscountList = [];
+  const bundleDiscounts = [];
+  product.discount_list.forEach(discount => {
+    const mapId = getDiscountBundleMapId(discount);
+    if (mapId && bundleByMapId.has(mapId)) {
+      bundleDiscounts.push({
+        mapId,
+        discount
+      });
+    } else {
+      mainDiscountList.push(discount);
+    }
+  });
+  if (!bundleDiscounts.length) return product;
+  return {
+    ...product,
+    discount_list: normalizeDiscountList(mainDiscountList),
+    product_bundle: product.product_bundle.map(bundle => {
+      if (!bundle || typeof bundle !== 'object') return bundle;
+      const mapId = getBundleMapId(bundle);
+      if (!mapId) return bundle;
+      const matchedDiscounts = bundleDiscounts.filter(item => item.mapId === mapId).map(item => item.discount);
+      if (!matchedDiscounts.length) return bundle;
+      const currentDiscountList = Array.isArray(bundle.discount_list) ? [...bundle.discount_list] : [];
+      for (const discount of matchedDiscounts) {
+        if (!hasSameBundleDiscount(currentDiscountList, discount)) {
+          currentDiscountList.push(discount);
+        }
+      }
+      return {
+        ...bundle,
+        discount_list: normalizeDiscountList(currentDiscountList),
+        metadata: {
+          ...(bundle.metadata || {}),
+          [BUNDLE_MAP_ID_KEY]: mapId
+        }
+      };
+    })
+  };
+}
+function expandHydratedProductsForDiscountCollection(products) {
+  const expanded = [];
+  for (const product of products || []) {
+    expanded.push(product);
+    for (const bundle of product?.product_bundle || []) {
+      if (!Array.isArray(bundle?.discount_list) || bundle.discount_list.length === 0) continue;
+      expanded.push({
+        ...product,
+        product_id: bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? product?.product_id,
+        num: bundle.num ?? bundle.quantity ?? product?.num,
+        product_quantity: bundle.quantity ?? bundle.num ?? product?.product_quantity,
+        original_price: bundle.original_price ?? bundle.product_price ?? bundle.price,
+        selling_price: bundle.bundle_selling_price ?? bundle.price,
+        is_charge_tax: bundle.is_charge_tax ?? product?.is_charge_tax,
+        discount_list: bundle.discount_list
+      });
+    }
+  }
+  return expanded;
+}

package/lib/modules/Order/utils/manualProductDiscount.d.ts

@@ -0,0 +1,106 @@
+/** 解析商品行数量（checkout 协议 product_num 语义 = 当前行 num） */
+export declare function resolveSafeProductNum(num?: number | null): number;
+/**
+ * 将 discount_list 中 type=product 项的 product_num 同步为当前商品数量。
+ *
+ * @example
+ * syncManualProductDiscountProductNum(line.discount_list, line.num);
+ */
+export declare function syncManualProductDiscountProductNum(discountList: any[] | undefined | null, productNum?: number | null): any[];
+/** 从多源解析改价前行总价（与 cacheItem._extend.origin_total 语义一致） */
+export declare function resolveManualDiscountOriginTotal(sources: {
+    originTotal?: unknown;
+    extendOriginTotal?: unknown;
+    originExtendOriginTotal?: unknown;
+    sourceExtendOriginTotal?: unknown;
+    catalogUnitPrice?: unknown;
+    quantity?: number;
+}): number;
+/** 从 payload / extend / origin 解析手动折扣原因 */
+export declare function resolveManualDiscountReasonFromSources(sources: {
+    discountReason?: unknown;
+    extendDiscountReason?: unknown;
+    originExtendDiscountReason?: unknown;
+}): string;
+/** 是否带手动改价标记（price_override / is_manual_discount） */
+export declare function hasManualProductDiscountFlag(metadata?: Record<string, any> | null): boolean;
+/**
+ * normalize 兜底：手动改价但 discount_list 缺 type=product 时，按行级原价/折后价补写。
+ *
+ * @example
+ * ensureManualProductDiscountList({
+ *   discountList: [],
+ *   metadata: { price_override: '5', is_manual_discount: 1 },
+ *   originalPrice: '11.00',
+ *   sellingPrice: '5.00',
+ *   quantity: 1,
+ * });
+ */
+export declare function ensureManualProductDiscountList(params: {
+    discountList?: any[] | null;
+    metadata?: Record<string, any> | null;
+    originalPrice: string | number;
+    sellingPrice: string | number;
+    quantity?: number;
+}): any[];
+/** 商品手动折扣 discount_list 项（checkout 协议，type = product） */
+export interface ManualProductDiscountItem {
+    amount: number;
+    type: 'product';
+    discount: {
+        message: string;
+        discountway: string;
+        product_num: number;
+        discount_per: string;
+        discount_type: 'discount' | 'change_price';
+    };
+}
+/**
+ * 从 discount_list 中取手动改价项（type = product）。
+ *
+ * @example
+ * const manual = findManualProductDiscountItem(product.discount_list);
+ * manual?.discount.message; // 折扣原因
+ */
+export declare function findManualProductDiscountItem(discountList?: any[] | null): ManualProductDiscountItem | undefined;
+/**
+ * 解析折扣原因：优先 discount_list[type=product].discount.message。
+ *
+ * @example
+ * resolveManualDiscountMessage(line.discount_list, line.metadata?.legacy_reason);
+ */
+export declare function resolveManualDiscountMessage(discountList?: any[] | null, fallback?: string): string;
+/** 去掉 discount_list 中已有的手动改价项，避免重复叠加 */
+export declare function stripManualProductDiscountItems(discountList?: any[] | null): any[];
+/**
+ * 由改价前后行总价构建手动折扣项；amount = |originTotal - sellingTotal|（行级差额）。
+ *
+ * @example
+ * buildManualProductDiscountItem({
+ *   originTotal: 11,
+ *   sellingTotal: 4,
+ *   quantity: 1,
+ *   message: 'VIP',
+ * });
+ */
+export declare function buildManualProductDiscountItem(params: {
+    originTotal: number;
+    sellingTotal: number;
+    quantity?: number;
+    message?: string;
+    discountway?: string;
+    discount_per?: string;
+}): ManualProductDiscountItem;
+/**
+ * 将手动改价项合并进 discount_list（替换已有 type=product 项）。
+ *
+ * @example
+ * mergeManualProductDiscountIntoList(coupons, manualItem);
+ */
+export declare function mergeManualProductDiscountIntoList(discountList: any[] | undefined | null, manualItem: ManualProductDiscountItem | null | undefined): any[];
+/** 是否应写入手动改价 discount_list 项 */
+export declare function shouldBuildManualProductDiscount(params: {
+    hasPriceOverride?: boolean;
+    originTotal?: number;
+    sellingTotal?: number;
+}): boolean;

package/lib/modules/Order/utils/manualProductDiscount.js

@@ -0,0 +1,207 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildManualProductDiscountItem = buildManualProductDiscountItem;
+exports.ensureManualProductDiscountList = ensureManualProductDiscountList;
+exports.findManualProductDiscountItem = findManualProductDiscountItem;
+exports.hasManualProductDiscountFlag = hasManualProductDiscountFlag;
+exports.mergeManualProductDiscountIntoList = mergeManualProductDiscountIntoList;
+exports.resolveManualDiscountMessage = resolveManualDiscountMessage;
+exports.resolveManualDiscountOriginTotal = resolveManualDiscountOriginTotal;
+exports.resolveManualDiscountReasonFromSources = resolveManualDiscountReasonFromSources;
+exports.resolveSafeProductNum = resolveSafeProductNum;
+exports.shouldBuildManualProductDiscount = shouldBuildManualProductDiscount;
+exports.stripManualProductDiscountItems = stripManualProductDiscountItems;
+exports.syncManualProductDiscountProductNum = syncManualProductDiscountProductNum;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** 解析商品行数量（checkout 协议 product_num 语义 = 当前行 num） */
+function resolveSafeProductNum(num) {
+  const parsed = Number(num);
+  if (!Number.isFinite(parsed) || parsed <= 0) return 1;
+  return Math.floor(parsed);
+}
+
+/**
+ * 将 discount_list 中 type=product 项的 product_num 同步为当前商品数量。
+ *
+ * @example
+ * syncManualProductDiscountProductNum(line.discount_list, line.num);
+ */
+function syncManualProductDiscountProductNum(discountList, productNum) {
+  const quantity = resolveSafeProductNum(productNum);
+  return (discountList || []).map(item => {
+    if (item?.type !== 'product') return item;
+    return {
+      ...item,
+      discount: {
+        ...(item.discount || {}),
+        product_num: quantity
+      }
+    };
+  });
+}
+
+/** 从多源解析改价前行总价（与 cacheItem._extend.origin_total 语义一致） */
+function resolveManualDiscountOriginTotal(sources) {
+  const candidates = [sources.originTotal, sources.extendOriginTotal, sources.originExtendOriginTotal, sources.sourceExtendOriginTotal];
+  for (const candidate of candidates) {
+    if (candidate === undefined || candidate === null || candidate === '') continue;
+    const parsed = Number(candidate);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  const unit = Number(sources.catalogUnitPrice);
+  const quantity = sources.quantity ?? 1;
+  if (Number.isFinite(unit) && unit > 0) {
+    return new _decimal.default(unit).mul(quantity).toNumber();
+  }
+  return NaN;
+}
+
+/** 从 payload / extend / origin 解析手动折扣原因 */
+function resolveManualDiscountReasonFromSources(sources) {
+  for (const candidate of [sources.discountReason, sources.extendDiscountReason, sources.originExtendDiscountReason]) {
+    if (candidate != null && String(candidate).trim() !== '') {
+      return String(candidate);
+    }
+  }
+  return '';
+}
+
+/** 是否带手动改价标记（price_override / is_manual_discount） */
+function hasManualProductDiscountFlag(metadata) {
+  if (!metadata) return false;
+  const override = metadata.price_override;
+  if (override !== undefined && override !== null && override !== '') {
+    return true;
+  }
+  return metadata.is_manual_discount === 1 || metadata.is_manual_discount === true;
+}
+
+/**
+ * normalize 兜底：手动改价但 discount_list 缺 type=product 时，按行级原价/折后价补写。
+ *
+ * @example
+ * ensureManualProductDiscountList({
+ *   discountList: [],
+ *   metadata: { price_override: '5', is_manual_discount: 1 },
+ *   originalPrice: '11.00',
+ *   sellingPrice: '5.00',
+ *   quantity: 1,
+ * });
+ */
+function ensureManualProductDiscountList(params) {
+  const list = params.discountList || [];
+  const quantity = resolveSafeProductNum(params.quantity);
+  if (findManualProductDiscountItem(list)) {
+    return syncManualProductDiscountProductNum(list, quantity);
+  }
+  const metadata = params.metadata || {};
+  const originalNum = Number(params.originalPrice);
+  const sellingNum = Number(params.sellingPrice);
+  const hasPriceOverride = hasManualProductDiscountFlag(metadata);
+  const shouldBuild = shouldBuildManualProductDiscount({
+    hasPriceOverride,
+    originTotal: originalNum,
+    sellingTotal: sellingNum
+  });
+  if (!shouldBuild) {
+    return list;
+  }
+  if (!Number.isFinite(originalNum) || !Number.isFinite(sellingNum) || originalNum === sellingNum) {
+    return list;
+  }
+  const message = resolveManualDiscountMessage(list, resolveManualDiscountReasonFromSources({
+    extendDiscountReason: metadata.origin?._extend?.discount_reason,
+    originExtendDiscountReason: metadata.origin?._extend?.discount_reason
+  }));
+  return mergeManualProductDiscountIntoList(list, buildManualProductDiscountItem({
+    originTotal: originalNum,
+    sellingTotal: sellingNum,
+    quantity,
+    message,
+    discountway: metadata.origin?._extend?.discountway,
+    discount_per: metadata.origin?._extend?.discount_per
+  }));
+}
+
+/** 商品手动折扣 discount_list 项（checkout 协议，type = product） */
+
+/**
+ * 从 discount_list 中取手动改价项（type = product）。
+ *
+ * @example
+ * const manual = findManualProductDiscountItem(product.discount_list);
+ * manual?.discount.message; // 折扣原因
+ */
+function findManualProductDiscountItem(discountList) {
+  return (discountList || []).find(item => item?.type === 'product');
+}
+
+/**
+ * 解析折扣原因：优先 discount_list[type=product].discount.message。
+ *
+ * @example
+ * resolveManualDiscountMessage(line.discount_list, line.metadata?.legacy_reason);
+ */
+function resolveManualDiscountMessage(discountList, fallback) {
+  const message = findManualProductDiscountItem(discountList)?.discount?.message;
+  if (message != null && String(message).trim() !== '') {
+    return String(message);
+  }
+  return fallback ?? '';
+}
+
+/** 去掉 discount_list 中已有的手动改价项，避免重复叠加 */
+function stripManualProductDiscountItems(discountList) {
+  return (discountList || []).filter(item => item?.type !== 'product');
+}
+
+/**
+ * 由改价前后行总价构建手动折扣项；amount = |originTotal - sellingTotal|（行级差额）。
+ *
+ * @example
+ * buildManualProductDiscountItem({
+ *   originTotal: 11,
+ *   sellingTotal: 4,
+ *   quantity: 1,
+ *   message: 'VIP',
+ * });
+ */
+function buildManualProductDiscountItem(params) {
+  const origin = new _decimal.default(Number(params.originTotal) || 0);
+  const selling = new _decimal.default(Number(params.sellingTotal) || 0);
+  const diff = origin.minus(selling);
+  const quantity = resolveSafeProductNum(params.quantity);
+  return {
+    amount: diff.toDecimalPlaces(2).toNumber(),
+    type: 'product',
+    discount: {
+      message: params.message ?? '',
+      discountway: params.discountway ?? 'num',
+      product_num: quantity,
+      discount_per: params.discount_per ?? '',
+      discount_type: diff.isNegative() ? 'change_price' : 'discount'
+    }
+  };
+}
+
+/**
+ * 将手动改价项合并进 discount_list（替换已有 type=product 项）。
+ *
+ * @example
+ * mergeManualProductDiscountIntoList(coupons, manualItem);
+ */
+function mergeManualProductDiscountIntoList(discountList, manualItem) {
+  const base = stripManualProductDiscountItems(discountList);
+  if (!manualItem) return base;
+  if (manualItem.amount === 0 && !manualItem.discount.message) return base;
+  return [...base, manualItem];
+}
+
+/** 是否应写入手动改价 discount_list 项 */
+function shouldBuildManualProductDiscount(params) {
+  return Boolean(params.hasPriceOverride);
+}

package/lib/modules/Order/utils/orderCollectionIdentity.d.ts

@@ -0,0 +1,53 @@
+export declare type OrderCollectionKind = 'product' | 'booking' | 'payment';
+export interface OrderCollectionIdentityStats {
+    backfilledUidCount: number;
+    collapsedDuplicateCount: number;
+    uidConflictCount: number;
+    anonymousRowCount: number;
+}
+export interface OrderCollectionUidRemap {
+    kind: OrderCollectionKind;
+    from: string;
+    to: string;
+    persistentId: string | null;
+    /** 默认全局迁移；UID 冲突时只能迁移能由另一侧 UID 明确定位的引用。 */
+    scope?: 'global' | 'linked-owner';
+    referenceOwnerUid?: string | null;
+}
+export interface NormalizeOrderCollectionResult<T> {
+    items: T[];
+    stats: OrderCollectionIdentityStats;
+    uidRemaps: OrderCollectionUidRemap[];
+}
+export interface NormalizeOrderCollectionsResult<T> {
+    order: T;
+    stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
+    uidRemaps: OrderCollectionUidRemap[];
+}
+export declare function createUuidV4(): string;
+export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
+export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
+export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
+export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
+ */
+export declare function isSameOrderCollectionItem(kind: OrderCollectionKind, left: unknown, right: unknown): boolean;
+export declare function mergeOrderCollectionItems<T>(kind: OrderCollectionKind, currentItem: T, incomingItem: T, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): T;
+/**
+ * 规范化单一数组：强身份重复时保留首次位置、用最后一条业务字段覆盖，并统一补 UID。
+ */
+export declare function normalizeOrderCollection<T>(kind: OrderCollectionKind, items: T[] | null | undefined, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): NormalizeOrderCollectionResult<T>;
+export declare function applyOrderCollectionUidRemaps<T extends Record<string, any>>(sourceOrder: T, uidRemaps: OrderCollectionUidRemap[]): T;
+export declare function normalizeOrderCollections<T extends Record<string, any>>(sourceOrder: T, options?: {
+    ensureUid?: boolean;
+    createAnonymousUid?: () => string;
+}): NormalizeOrderCollectionsResult<T>;