@pisell/pisellos 2.2.301 → 2.2.303

package/lib/modules/Order/types.js

@@ -40,7 +40,7 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
  */
 /** 未满足的促销策略（购物车底部 alert 渲染源） */
 /** 上一次 applyPromotion 计算出的赠品操作（仅供调试/读取使用） */
-/** onPromotionApplied 事件 payload */
+/** onPromotionApplied 稳定态事件 payload（促销、折扣与 summary 均已完成）。 */
 /**
  * tempOrder 上的下单客户协议字段视图。
  * 这些字段会随订单提交到后端。
@@ -59,6 +59,10 @@ let OrderHooks = exports.OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
+/**
+ * Sales Notes 乐观写入前的可恢复快照。
+ * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
+ */
 /**
  * 添加商品行时的顺序控制。
  * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，

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

@@ -0,0 +1,63 @@
+import type { OrderProduct, OrderTempOrder } from '../types';
+export interface SelectedSettlementSnapshot extends Record<string, any> {
+    settlement_type: 'legal_currency' | 'virtual_currency';
+    currency_product_id?: number;
+    price: string | number;
+    unit_label?: any;
+    symbol?: any;
+    amount_format?: string;
+}
+export interface LegalCurrencySnapshot {
+    currency_code: string;
+    currency_symbol: string;
+    currency_format: string;
+}
+export interface CurrencyDisplaySnapshot {
+    amount_format: string;
+    symbol: unknown;
+    unit_label: unknown;
+}
+export declare function buildCurrencyDisplaySnapshot(snapshot: Pick<SelectedSettlementSnapshot, 'amount_format' | 'symbol' | 'unit_label'>): CurrencyDisplaySnapshot;
+export declare function resolveSettlementDisplayValue(value: unknown): string;
+export declare class OrderSettlementConflictError extends Error {
+    readonly currentSettlementKey: string;
+    readonly incomingSettlementKey: string;
+    readonly code = "ORDER_SETTLEMENT_CONFLICT";
+    constructor(currentSettlementKey: string, incomingSettlementKey: string);
+}
+export declare class VirtualCurrencyAssetNotFoundError extends Error {
+    readonly currencyProductId: number;
+    readonly code = "VIRTUAL_CURRENCY_ASSET_NOT_FOUND";
+    constructor(currencyProductId: number);
+}
+export declare class VirtualCurrencyBalanceError extends Error {
+    readonly balance: string;
+    readonly requiredAmount: string;
+    readonly code = "VIRTUAL_CURRENCY_BALANCE_INSUFFICIENT";
+    constructor(balance: string, requiredAmount: string);
+}
+export declare function getSelectedSettlementSnapshot(product: Partial<OrderProduct> | null | undefined): SelectedSettlementSnapshot | null;
+export declare function getTempOrderSettlementSnapshot(tempOrder: OrderTempOrder | null | undefined): SelectedSettlementSnapshot | null;
+export declare function isVirtualSettlementProduct(product: Partial<OrderProduct> | null | undefined): boolean;
+export declare function getSettlementKey(snapshot: SelectedSettlementSnapshot | null | undefined): string | null;
+export declare function getTempOrderSettlementKey(tempOrder: OrderTempOrder | null | undefined): string | null;
+export declare function isVirtualSettlementOrder(tempOrder: OrderTempOrder | null | undefined): boolean;
+/**
+ * 详情展示识别同时支持已提交订单的 currency_settlement_config。
+ * cart_settlement_* 是交易过程内部状态，服务端详情不保证返回。
+ */
+export declare function isVirtualSettlementDisplayOrder(tempOrder: OrderTempOrder | null | undefined): boolean;
+/**
+ * 将购物车锁定的结算单位提升为订单级状态。
+ * 商品行快照同时负责价格归一化和生成订单级多语言展示快照；
+ * 交易中的即时展示仍统一读取 tempOrder.currency_*。
+ */
+export declare function applyTempOrderSettlementState(tempOrder: OrderTempOrder, snapshot: SelectedSettlementSnapshot): void;
+/** 清空购物车结算锁，并恢复进入虚拟币结算前的店铺法币。 */
+export declare function releaseTempOrderSettlementState(tempOrder: OrderTempOrder): void;
+/**
+ * 将已选择虚拟币的订单商品行固化为最终价语义。
+ * 函数幂等，可安全用于加车、合并、hydrate 和提交前兜底。
+ */
+export declare function normalizeVirtualSettlementOrderProduct<T extends Partial<OrderProduct>>(product: T): T;
+export declare function normalizeVirtualSettlementProducts<T extends Partial<OrderProduct>>(products: T[]): T[];

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

@@ -0,0 +1,262 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.VirtualCurrencyBalanceError = exports.VirtualCurrencyAssetNotFoundError = exports.OrderSettlementConflictError = void 0;
+exports.applyTempOrderSettlementState = applyTempOrderSettlementState;
+exports.buildCurrencyDisplaySnapshot = buildCurrencyDisplaySnapshot;
+exports.getSelectedSettlementSnapshot = getSelectedSettlementSnapshot;
+exports.getSettlementKey = getSettlementKey;
+exports.getTempOrderSettlementKey = getTempOrderSettlementKey;
+exports.getTempOrderSettlementSnapshot = getTempOrderSettlementSnapshot;
+exports.isVirtualSettlementDisplayOrder = isVirtualSettlementDisplayOrder;
+exports.isVirtualSettlementOrder = isVirtualSettlementOrder;
+exports.isVirtualSettlementProduct = isVirtualSettlementProduct;
+exports.normalizeVirtualSettlementOrderProduct = normalizeVirtualSettlementOrderProduct;
+exports.normalizeVirtualSettlementProducts = normalizeVirtualSettlementProducts;
+exports.releaseTempOrderSettlementState = releaseTempOrderSettlementState;
+exports.resolveSettlementDisplayValue = resolveSettlementDisplayValue;
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _lodashEs = require("lodash-es");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function buildCurrencyDisplaySnapshot(snapshot) {
+  return (0, _lodashEs.cloneDeep)({
+    amount_format: String(snapshot.amount_format || '').trim(),
+    symbol: snapshot.symbol ?? {},
+    unit_label: snapshot.unit_label ?? {}
+  });
+}
+function resolveSettlementDisplayValue(value) {
+  if (value === undefined || value === null) return '';
+  if (typeof value === 'string' || typeof value === 'number') {
+    return String(value);
+  }
+  const localized = value;
+  return String(localized.auto ?? localized.default ?? localized.original ?? localized.en ?? localized['zh-CN'] ?? localized['zh-HK'] ?? '');
+}
+class OrderSettlementConflictError extends Error {
+  code = 'ORDER_SETTLEMENT_CONFLICT';
+  constructor(currentSettlementKey, incomingSettlementKey) {
+    super('Different currencies and WalletPass units cannot be mixed in one cart.');
+    this.currentSettlementKey = currentSettlementKey;
+    this.incomingSettlementKey = incomingSettlementKey;
+    this.name = 'OrderSettlementConflictError';
+  }
+}
+exports.OrderSettlementConflictError = OrderSettlementConflictError;
+class VirtualCurrencyAssetNotFoundError extends Error {
+  code = 'VIRTUAL_CURRENCY_ASSET_NOT_FOUND';
+  constructor(currencyProductId) {
+    super('No matching virtual currency card is available.');
+    this.currencyProductId = currencyProductId;
+    this.name = 'VirtualCurrencyAssetNotFoundError';
+  }
+}
+exports.VirtualCurrencyAssetNotFoundError = VirtualCurrencyAssetNotFoundError;
+class VirtualCurrencyBalanceError extends Error {
+  code = 'VIRTUAL_CURRENCY_BALANCE_INSUFFICIENT';
+  constructor(balance, requiredAmount) {
+    super('Insufficient virtual currency balance.');
+    this.balance = balance;
+    this.requiredAmount = requiredAmount;
+    this.name = 'VirtualCurrencyBalanceError';
+  }
+}
+exports.VirtualCurrencyBalanceError = VirtualCurrencyBalanceError;
+function getSelectedSettlementSnapshot(product) {
+  const snapshot = product?.metadata?.selected_settlement_snapshot;
+  if (!snapshot || typeof snapshot !== 'object') return null;
+  if (snapshot.settlement_type !== 'legal_currency' && snapshot.settlement_type !== 'virtual_currency') {
+    return null;
+  }
+  return snapshot;
+}
+function getTempOrderSettlementSnapshot(tempOrder) {
+  const snapshot = tempOrder?.metadata?.cart_settlement_snapshot;
+  if (snapshot && typeof snapshot === 'object' && (snapshot.settlement_type === 'legal_currency' || snapshot.settlement_type === 'virtual_currency')) {
+    return snapshot;
+  }
+  return getSelectedSettlementSnapshot(tempOrder?.products?.[0]);
+}
+function isVirtualSettlementProduct(product) {
+  return getSelectedSettlementSnapshot(product)?.settlement_type === 'virtual_currency';
+}
+function getSettlementKey(snapshot) {
+  if (!snapshot) return null;
+  if (snapshot.settlement_type === 'legal_currency') return 'legal_currency';
+  const currencyProductId = Number(snapshot.currency_product_id);
+  return Number.isFinite(currencyProductId) && currencyProductId > 0 ? `virtual_currency:${currencyProductId}` : null;
+}
+function getTempOrderSettlementKey(tempOrder) {
+  if (!tempOrder?.products?.length) return null;
+  const storedKey = tempOrder.metadata?.cart_settlement_key;
+  if (typeof storedKey === 'string' && storedKey) return storedKey;
+  return getSettlementKey(getTempOrderSettlementSnapshot(tempOrder)) || 'legal_currency';
+}
+function isVirtualSettlementOrder(tempOrder) {
+  return getTempOrderSettlementKey(tempOrder)?.startsWith('virtual_currency:') === true;
+}
+
+/**
+ * 详情展示识别同时支持已提交订单的 currency_settlement_config。
+ * cart_settlement_* 是交易过程内部状态，服务端详情不保证返回。
+ */
+function isVirtualSettlementDisplayOrder(tempOrder) {
+  return tempOrder?.metadata?.currency_settlement_config?.settlement_type === 'virtual_currency' || isVirtualSettlementOrder(tempOrder);
+}
+function getLegalCurrencySnapshot(tempOrder) {
+  const snapshot = tempOrder.metadata?.legal_currency_snapshot;
+  if (!snapshot || typeof snapshot !== 'object') return null;
+  return {
+    currency_code: String(snapshot.currency_code || ''),
+    currency_symbol: String(snapshot.currency_symbol || ''),
+    currency_format: String(snapshot.currency_format || 'symbol_first')
+  };
+}
+function captureLegalCurrencySnapshot(tempOrder) {
+  tempOrder.metadata = tempOrder.metadata || {};
+  if (getLegalCurrencySnapshot(tempOrder)) return;
+  tempOrder.metadata.legal_currency_snapshot = {
+    currency_code: String(tempOrder.currency_code || ''),
+    currency_symbol: String(tempOrder.currency_symbol || ''),
+    currency_format: String(tempOrder.currency_format || 'symbol_first')
+  };
+}
+
+/**
+ * 将购物车锁定的结算单位提升为订单级状态。
+ * 商品行快照同时负责价格归一化和生成订单级多语言展示快照；
+ * 交易中的即时展示仍统一读取 tempOrder.currency_*。
+ */
+function applyTempOrderSettlementState(tempOrder, snapshot) {
+  tempOrder.metadata = tempOrder.metadata || {};
+  const settlementKey = getSettlementKey(snapshot) || 'legal_currency';
+  if (snapshot.settlement_type === 'virtual_currency') {
+    captureLegalCurrencySnapshot(tempOrder);
+    const currencyProductId = Number(snapshot.currency_product_id);
+    const existingDisplaySnapshot = tempOrder.metadata.currency_settlement_config?.currency_display_snapshot;
+    tempOrder.metadata.currency_settlement_config = {
+      settlement_type: 'virtual_currency',
+      settlement_ids: Number.isFinite(currencyProductId) && currencyProductId > 0 ? [currencyProductId] : [],
+      currency_display_snapshot: existingDisplaySnapshot ? (0, _lodashEs.cloneDeep)(existingDisplaySnapshot) : buildCurrencyDisplaySnapshot(snapshot)
+    };
+  } else {
+    delete tempOrder.metadata.currency_settlement_config;
+  }
+  tempOrder.metadata.cart_settlement_key = settlementKey;
+  tempOrder.metadata.cart_settlement_snapshot = {
+    ...snapshot
+  };
+  tempOrder.currency_code = resolveSettlementDisplayValue(snapshot.unit_label) || tempOrder.currency_code;
+  tempOrder.currency_symbol = resolveSettlementDisplayValue(snapshot.symbol) || tempOrder.currency_symbol;
+  tempOrder.currency_format = String(snapshot.amount_format || tempOrder.currency_format || 'symbol_first');
+}
+
+/** 清空购物车结算锁，并恢复进入虚拟币结算前的店铺法币。 */
+function releaseTempOrderSettlementState(tempOrder) {
+  tempOrder.metadata = tempOrder.metadata || {};
+  const legalCurrency = getLegalCurrencySnapshot(tempOrder);
+  if (legalCurrency) {
+    tempOrder.currency_code = legalCurrency.currency_code;
+    tempOrder.currency_symbol = legalCurrency.currency_symbol;
+    tempOrder.currency_format = legalCurrency.currency_format;
+  }
+  delete tempOrder.metadata.cart_settlement_key;
+  delete tempOrder.metadata.cart_settlement_snapshot;
+  delete tempOrder.metadata.currency_settlement_config;
+}
+function toMoney(value) {
+  try {
+    return new _decimal.default(String(value ?? 0)).toDecimalPlaces(2).toFixed(2);
+  } catch {
+    return '0.00';
+  }
+}
+function zeroOptions(options) {
+  if (!Array.isArray(options)) return [];
+  return options.map(option => ({
+    ...option,
+    add_price: 0
+  }));
+}
+function zeroBundles(bundles) {
+  if (!Array.isArray(bundles)) return [];
+  return bundles.map(bundle => ({
+    ...bundle,
+    price: 0,
+    custom_price: 0,
+    bundle_selling_price: 0,
+    bundle_payment_price: 0,
+    surcharge_fee: 0,
+    tax_fee: 0,
+    original_tax_fee: 0,
+    is_charge_tax: 0,
+    discount_list: [],
+    relation_surcharge_ids: [],
+    option: zeroOptions(bundle?.option),
+    metadata: {
+      ...(bundle?.metadata || {}),
+      surcharge_fee: '0.00',
+      relation_surcharge_ids: [],
+      product_discount_difference: '',
+      tax_fee_rounding_remainder: '0.00',
+      surcharge_rounding_remainder: '0.00'
+    }
+  }));
+}
+
+/**
+ * 将已选择虚拟币的订单商品行固化为最终价语义。
+ * 函数幂等，可安全用于加车、合并、hydrate 和提交前兜底。
+ */
+function normalizeVirtualSettlementOrderProduct(product) {
+  const snapshot = getSelectedSettlementSnapshot(product);
+  if (snapshot?.settlement_type !== 'virtual_currency') return product;
+  const virtualPrice = toMoney(snapshot.price);
+  const metadata = {
+    ...(product.metadata || {}),
+    source_product_price: virtualPrice,
+    main_product_original_price: virtualPrice,
+    main_product_selling_price: virtualPrice,
+    main_product_attached_bundle_selling_price: virtualPrice,
+    main_product_attached_bundle_payment_price: virtualPrice,
+    main_product_attached_bundle_surcharge_fee: '0.00',
+    main_product_attached_bundle_tax_fee: '0.00',
+    surcharge_rounding_remainder: '0.00',
+    tax_fee_rounding_remainder: '0.00',
+    relation_surcharge_ids: [],
+    average_discount_amount_rate: '1',
+    product_discount_difference: '',
+    discountable_flag: 0,
+    price_schema_version: 2,
+    selected_settlement_snapshot: {
+      ...snapshot,
+      price: virtualPrice
+    }
+  };
+  return {
+    ...product,
+    selling_price: virtualPrice,
+    original_price: virtualPrice,
+    payment_price: virtualPrice,
+    discount_list: [],
+    is_charge_tax: 0,
+    tax_fee: '0.00',
+    original_tax_fee: 0,
+    tax_fee_rounding_remainder: 0,
+    original_tax_fee_rounding_remainder: 0,
+    surcharge_fee: '0.00',
+    surcharge_rounding_remainder: 0,
+    relation_surcharge_ids: [],
+    product_sku: {
+      ...(product.product_sku || {}),
+      option: zeroOptions(product.product_sku?.option)
+    },
+    product_bundle: zeroBundles(product.product_bundle),
+    metadata
+  };
+}
+function normalizeVirtualSettlementProducts(products) {
+  return (products || []).map(product => normalizeVirtualSettlementOrderProduct(product));
+}

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import type { CartItem } from "../Cart";
-import type { OrderProductDiscountItem, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderProductDiscountItem, OrderMetaList, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder, PointCardSnapshotItem } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 import { createUuidV4 } from './utils/orderCollectionIdentity';
@@ -16,6 +16,9 @@ export interface OrderProductsDepositSummary {
     hasDeposit: boolean;
 }
 import type { WindowPlugin } from '../../plugins';
+export declare function normalizePointCardSnapshotItem(value: unknown): PointCardSnapshotItem | null;
+export declare function buildPointCardSnapshotFromWalletPassList(value: unknown): PointCardSnapshotItem[];
+export declare function normalizeOrderMetaList(value: unknown): OrderMetaList | undefined;
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -232,6 +235,7 @@ export declare function buildSubmitPayload(params: {
     type?: string;
     summary?: OrderSummary | null;
     request_unique_idempotency_token?: string;
+    includePaymentStatus?: boolean;
     enhance?: SubmitPayloadEnhancer;
 }): OrderSubmitPayload;
 export declare function mapPaymentItemToOrderPayment(paymentItem: OrderPaymentSource): OrderPaymentData;