@pisell/pisellos 0.10.14 → 0.10.16

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

@@ -12,6 +12,12 @@ export interface LegalCurrencySnapshot {
     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;
@@ -43,7 +49,8 @@ export declare function isVirtualSettlementOrder(tempOrder: OrderTempOrder | nul
 export declare function isVirtualSettlementDisplayOrder(tempOrder: OrderTempOrder | null | undefined): boolean;
 /**
  * 将购物车锁定的结算单位提升为订单级状态。
- * 商品行快照只负责价格归一化；展示与提交统一读取 tempOrder.currency_*。
+ * 商品行快照同时负责价格归一化和生成订单级多语言展示快照；
+ * 交易中的即时展示仍统一读取 tempOrder.currency_*。
  */
 export declare function applyTempOrderSettlementState(tempOrder: OrderTempOrder, snapshot: SelectedSettlementSnapshot): void;
 /** 清空购物车结算锁，并恢复进入虚拟币结算前的店铺法币。 */

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

@@ -1,178 +1,159 @@
-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/modules/Order/utils/virtualSettlement.ts
-var virtualSettlement_exports = {};
-__export(virtualSettlement_exports, {
-  OrderSettlementConflictError: () => OrderSettlementConflictError,
-  VirtualCurrencyAssetNotFoundError: () => VirtualCurrencyAssetNotFoundError,
-  VirtualCurrencyBalanceError: () => VirtualCurrencyBalanceError,
-  applyTempOrderSettlementState: () => applyTempOrderSettlementState,
-  getSelectedSettlementSnapshot: () => getSelectedSettlementSnapshot,
-  getSettlementKey: () => getSettlementKey,
-  getTempOrderSettlementKey: () => getTempOrderSettlementKey,
-  getTempOrderSettlementSnapshot: () => getTempOrderSettlementSnapshot,
-  isVirtualSettlementDisplayOrder: () => isVirtualSettlementDisplayOrder,
-  isVirtualSettlementOrder: () => isVirtualSettlementOrder,
-  isVirtualSettlementProduct: () => isVirtualSettlementProduct,
-  normalizeVirtualSettlementOrderProduct: () => normalizeVirtualSettlementOrderProduct,
-  normalizeVirtualSettlementProducts: () => normalizeVirtualSettlementProducts,
-  releaseTempOrderSettlementState: () => releaseTempOrderSettlementState,
-  resolveSettlementDisplayValue: () => resolveSettlementDisplayValue
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(virtualSettlement_exports);
-var import_decimal = __toESM(require("decimal.js"));
+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 === void 0 || value === null)
-    return "";
-  if (typeof value === "string" || typeof value === "number") {
+  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"] ?? ""
-  );
+  return String(localized.auto ?? localized.default ?? localized.original ?? localized.en ?? localized['zh-CN'] ?? localized['zh-HK'] ?? '');
 }
-var OrderSettlementConflictError = class extends Error {
+class OrderSettlementConflictError extends Error {
+  code = 'ORDER_SETTLEMENT_CONFLICT';
   constructor(currentSettlementKey, incomingSettlementKey) {
-    super("Different currencies and WalletPass units cannot be mixed in one cart.");
+    super('Different currencies and WalletPass units cannot be mixed in one cart.');
     this.currentSettlementKey = currentSettlementKey;
     this.incomingSettlementKey = incomingSettlementKey;
-    this.code = "ORDER_SETTLEMENT_CONFLICT";
-    this.name = "OrderSettlementConflictError";
+    this.name = 'OrderSettlementConflictError';
   }
-};
-var VirtualCurrencyAssetNotFoundError = class extends Error {
+}
+exports.OrderSettlementConflictError = OrderSettlementConflictError;
+class VirtualCurrencyAssetNotFoundError extends Error {
+  code = 'VIRTUAL_CURRENCY_ASSET_NOT_FOUND';
   constructor(currencyProductId) {
-    super("No matching virtual currency card is available.");
+    super('No matching virtual currency card is available.');
     this.currencyProductId = currencyProductId;
-    this.code = "VIRTUAL_CURRENCY_ASSET_NOT_FOUND";
-    this.name = "VirtualCurrencyAssetNotFoundError";
+    this.name = 'VirtualCurrencyAssetNotFoundError';
   }
-};
-var VirtualCurrencyBalanceError = class extends Error {
+}
+exports.VirtualCurrencyAssetNotFoundError = VirtualCurrencyAssetNotFoundError;
+class VirtualCurrencyBalanceError extends Error {
+  code = 'VIRTUAL_CURRENCY_BALANCE_INSUFFICIENT';
   constructor(balance, requiredAmount) {
-    super("Insufficient virtual currency balance.");
+    super('Insufficient virtual currency balance.');
     this.balance = balance;
     this.requiredAmount = requiredAmount;
-    this.code = "VIRTUAL_CURRENCY_BALANCE_INSUFFICIENT";
-    this.name = "VirtualCurrencyBalanceError";
+    this.name = 'VirtualCurrencyBalanceError';
   }
-};
+}
+exports.VirtualCurrencyBalanceError = VirtualCurrencyBalanceError;
 function getSelectedSettlementSnapshot(product) {
-  var _a;
-  const snapshot = (_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.selected_settlement_snapshot;
-  if (!snapshot || typeof snapshot !== "object")
-    return null;
-  if (snapshot.settlement_type !== "legal_currency" && snapshot.settlement_type !== "virtual_currency") {
+  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) {
-  var _a, _b;
-  const snapshot = (_a = tempOrder == null ? void 0 : tempOrder.metadata) == null ? void 0 : _a.cart_settlement_snapshot;
-  if (snapshot && typeof snapshot === "object" && (snapshot.settlement_type === "legal_currency" || snapshot.settlement_type === "virtual_currency")) {
+  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((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b[0]);
+  return getSelectedSettlementSnapshot(tempOrder?.products?.[0]);
 }
 function isVirtualSettlementProduct(product) {
-  var _a;
-  return ((_a = getSelectedSettlementSnapshot(product)) == null ? void 0 : _a.settlement_type) === "virtual_currency";
+  return getSelectedSettlementSnapshot(product)?.settlement_type === 'virtual_currency';
 }
 function getSettlementKey(snapshot) {
-  if (!snapshot)
-    return null;
-  if (snapshot.settlement_type === "legal_currency")
-    return "legal_currency";
+  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) {
-  var _a, _b;
-  if (!((_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.length))
-    return null;
-  const storedKey = (_b = tempOrder.metadata) == null ? void 0 : _b.cart_settlement_key;
-  if (typeof storedKey === "string" && storedKey)
-    return storedKey;
-  return getSettlementKey(getTempOrderSettlementSnapshot(tempOrder)) || "legal_currency";
+  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) {
-  var _a;
-  return ((_a = getTempOrderSettlementKey(tempOrder)) == null ? void 0 : _a.startsWith("virtual_currency:")) === true;
+  return getTempOrderSettlementKey(tempOrder)?.startsWith('virtual_currency:') === true;
 }
+
+/**
+ * 详情展示识别同时支持已提交订单的 currency_settlement_config。
+ * cart_settlement_* 是交易过程内部状态，服务端详情不保证返回。
+ */
 function isVirtualSettlementDisplayOrder(tempOrder) {
-  var _a, _b;
-  return ((_b = (_a = tempOrder == null ? void 0 : tempOrder.metadata) == null ? void 0 : _a.currency_settlement_config) == null ? void 0 : _b.settlement_type) === "virtual_currency" || isVirtualSettlementOrder(tempOrder);
+  return tempOrder?.metadata?.currency_settlement_config?.settlement_type === 'virtual_currency' || isVirtualSettlementOrder(tempOrder);
 }
 function getLegalCurrencySnapshot(tempOrder) {
-  var _a;
-  const snapshot = (_a = tempOrder.metadata) == null ? void 0 : _a.legal_currency_snapshot;
-  if (!snapshot || typeof snapshot !== "object")
-    return null;
+  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")
+    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;
+  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")
+    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") {
+  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] : []
+      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.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"
-  );
+  tempOrder.currency_format = String(snapshot.amount_format || tempOrder.currency_format || 'symbol_first');
 }
+
+/** 清空购物车结算锁，并恢复进入虚拟币结算前的店铺法币。 */
 function releaseTempOrderSettlementState(tempOrder) {
   tempOrder.metadata = tempOrder.metadata || {};
   const legalCurrency = getLegalCurrencySnapshot(tempOrder);
@@ -187,23 +168,21 @@ function releaseTempOrderSettlementState(tempOrder) {
 }
 function toMoney(value) {
   try {
-    return new import_decimal.default(String(value ?? 0)).toDecimalPlaces(2).toFixed(2);
+    return new _decimal.default(String(value ?? 0)).toDecimalPlaces(2).toFixed(2);
   } catch {
-    return "0.00";
+    return '0.00';
   }
 }
 function zeroOptions(options) {
-  if (!Array.isArray(options))
-    return [];
-  return options.map((option) => ({
+  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) => ({
+  if (!Array.isArray(bundles)) return [];
+  return bundles.map(bundle => ({
     ...bundle,
     price: 0,
     custom_price: 0,
@@ -215,37 +194,40 @@ function zeroBundles(bundles) {
     is_charge_tax: 0,
     discount_list: [],
     relation_surcharge_ids: [],
-    option: zeroOptions(bundle == null ? void 0 : bundle.option),
+    option: zeroOptions(bundle?.option),
     metadata: {
-      ...(bundle == null ? void 0 : bundle.metadata) || {},
-      surcharge_fee: "0.00",
+      ...(bundle?.metadata || {}),
+      surcharge_fee: '0.00',
       relation_surcharge_ids: [],
-      product_discount_difference: "",
-      tax_fee_rounding_remainder: "0.00",
-      surcharge_rounding_remainder: "0.00"
+      product_discount_difference: '',
+      tax_fee_rounding_remainder: '0.00',
+      surcharge_rounding_remainder: '0.00'
     }
   }));
 }
+
+/**
+ * 将已选择虚拟币的订单商品行固化为最终价语义。
+ * 函数幂等，可安全用于加车、合并、hydrate 和提交前兜底。
+ */
 function normalizeVirtualSettlementOrderProduct(product) {
-  var _a;
   const snapshot = getSelectedSettlementSnapshot(product);
-  if ((snapshot == null ? void 0 : snapshot.settlement_type) !== "virtual_currency")
-    return product;
+  if (snapshot?.settlement_type !== 'virtual_currency') return product;
   const virtualPrice = toMoney(snapshot.price);
   const metadata = {
-    ...product.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",
+    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: "",
+    average_discount_amount_rate: '1',
+    product_discount_difference: '',
     discountable_flag: 0,
     price_schema_version: 2,
     selected_settlement_snapshot: {
@@ -260,41 +242,21 @@ function normalizeVirtualSettlementOrderProduct(product) {
     payment_price: virtualPrice,
     discount_list: [],
     is_charge_tax: 0,
-    tax_fee: "0.00",
+    tax_fee: '0.00',
     original_tax_fee: 0,
     tax_fee_rounding_remainder: 0,
     original_tax_fee_rounding_remainder: 0,
-    surcharge_fee: "0.00",
+    surcharge_fee: '0.00',
     surcharge_rounding_remainder: 0,
     relation_surcharge_ids: [],
     product_sku: {
-      ...product.product_sku || {},
-      option: zeroOptions((_a = product.product_sku) == null ? void 0 : _a.option)
+      ...(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)
-  );
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  OrderSettlementConflictError,
-  VirtualCurrencyAssetNotFoundError,
-  VirtualCurrencyBalanceError,
-  applyTempOrderSettlementState,
-  getSelectedSettlementSnapshot,
-  getSettlementKey,
-  getTempOrderSettlementKey,
-  getTempOrderSettlementSnapshot,
-  isVirtualSettlementDisplayOrder,
-  isVirtualSettlementOrder,
-  isVirtualSettlementProduct,
-  normalizeVirtualSettlementOrderProduct,
-  normalizeVirtualSettlementProducts,
-  releaseTempOrderSettlementState,
-  resolveSettlementDisplayValue
-});
+  return (products || []).map(product => normalizeVirtualSettlementOrderProduct(product));
+}