@pisell/pisellos 2.2.309 → 2.2.311

package/dist/modules/Order/types.d.ts

@@ -199,12 +199,27 @@ export interface PointCardSnapshotItem {
     id: number | string;
     tag: 'point_card';
     product_id?: number | string;
+    code?: string;
     product_name: string;
     par_value: string;
     used_par_value: string;
 }
+export interface PointCardSnapshotMergeContext {
+    customerId?: number | string | null;
+    orderIdentity?: OrderIdentitySnapshot | null;
+}
+export interface VirtualCurrencySnapshotItem {
+    id: number | string;
+    tag: 'virtual_currency';
+    product_id?: number | string;
+    product_name: string;
+    par_value: string;
+    used_par_value: string;
+    name: Record<string, string>;
+}
 export interface OrderMetaList {
     point_cards_snapshot?: PointCardSnapshotItem[];
+    virtual_currency_snapshot?: VirtualCurrencySnapshotItem[];
 }
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
@@ -964,6 +979,8 @@ export interface OrderModuleAPI {
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
     getAvailableWalletIds: () => number[];
+    getCustomerWalletPrepareConfigEpoch: () => number;
+    mergePointCardSnapshotCodes: (walletPassList: unknown, context?: PointCardSnapshotMergeContext) => PointCardSnapshotItem[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

package/dist/modules/Order/utils/orderCollectionIdentity.js

@@ -12,6 +12,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { cloneDeep } from 'lodash-es';
+import { isFullCoveragePass } from "../../Discount/entitlementPass";
 var IDENTITY_CONFIG = {
   product: {
     persistentIdField: 'order_detail_id',
@@ -74,22 +75,25 @@ export function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
-function getGoodPassResourceId(product) {
-  var _ref, _ref2, _goodPass$discount$re, _goodPass$discount;
-  var goodPass = (product.discount_list || []).find(function (item) {
-    var _item$discount, _item$discount2;
-    var type = (item === null || item === void 0 ? void 0 : item.type) || (item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.type) || (item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.tag);
-    return type === 'good_pass';
+function getFullCoveragePassIdentity(product) {
+  var _ref, _ref2, _pass$discount$resour, _pass$discount;
+  var pass = (product.discount_list || []).find(function (item) {
+    return isFullCoveragePass(item);
   });
-  if (!goodPass) return null;
-  var resourceId = (_ref = (_ref2 = (_goodPass$discount$re = (_goodPass$discount = goodPass.discount) === null || _goodPass$discount === void 0 ? void 0 : _goodPass$discount.resource_id) !== null && _goodPass$discount$re !== void 0 ? _goodPass$discount$re : goodPass.resource_id) !== null && _ref2 !== void 0 ? _ref2 : goodPass.discount_id) !== null && _ref !== void 0 ? _ref : goodPass.id;
-  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+  if (!pass) return null;
+  var resourceId = (_ref = (_ref2 = (_pass$discount$resour = (_pass$discount = pass.discount) === null || _pass$discount === void 0 ? void 0 : _pass$discount.resource_id) !== null && _pass$discount$resour !== void 0 ? _pass$discount$resour : pass.resource_id) !== null && _ref2 !== void 0 ? _ref2 : pass.discount_id) !== null && _ref !== void 0 ? _ref : pass.id;
+  if (isBlankOrderCollectionIdentity(resourceId)) return null;
+  return {
+    type: String(pass.type || pass.tag),
+    resourceId: String(resourceId)
+  };
 }
 function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
   var encodedOriginalUid = encodeURIComponent(originalUid);
-  var resourceId = getGoodPassResourceId(product);
-  if (resourceId) {
-    return "os-split:product:".concat(encodedOriginalUid, ":good-pass:").concat(encodeURIComponent(resourceId), ":").concat(duplicateOrdinal);
+  var passIdentity = getFullCoveragePassIdentity(product);
+  if (passIdentity) {
+    var passType = passIdentity.type === 'good_pass' ? 'good-pass' : 'entitlement-pass';
+    return "os-split:product:".concat(encodedOriginalUid, ":").concat(passType, ":").concat(encodeURIComponent(passIdentity.resourceId), ":").concat(duplicateOrdinal);
   }
   return "os-split:product:".concat(encodedOriginalUid, ":duplicate:").concat(duplicateOrdinal);
 }

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import type { CartItem } from "../Cart";
-import type { OrderProductDiscountItem, OrderMetaList, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder, PointCardSnapshotItem } from './types';
+import type { OrderProductDiscountItem, OrderMetaList, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder, PointCardSnapshotItem, VirtualCurrencySnapshotItem } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 import { createUuidV4 } from './utils/orderCollectionIdentity';
@@ -18,6 +18,18 @@ export interface OrderProductsDepositSummary {
 import type { WindowPlugin } from '../../plugins';
 export declare function normalizePointCardSnapshotItem(value: unknown): PointCardSnapshotItem | null;
 export declare function buildPointCardSnapshotFromWalletPassList(value: unknown): PointCardSnapshotItem[];
+export declare function collectPointCardSnapshotCodeCandidates(value: unknown): Array<{
+    id: string;
+    code: string;
+}>;
+/**
+ * Payment 的 WalletPass 列表包含实例 code，而 prepare/config 通常只提供
+ * 卡名称和余额。按实例 ID 仅补齐 Snapshot 缺失的 code，避免后到的运行态
+ * 数据覆盖下单时已经冻结的卡名称和余额。
+ */
+export declare function mergePointCardSnapshotCodes(snapshotsValue: unknown, walletPassesValue: unknown): PointCardSnapshotItem[];
+export declare function normalizeVirtualCurrencySnapshotItem(value: unknown): VirtualCurrencySnapshotItem | null;
+export declare function buildVirtualCurrencySnapshotFromList(value: unknown): VirtualCurrencySnapshotItem[];
 export declare function normalizeOrderMetaList(value: unknown): OrderMetaList | undefined;
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
@@ -109,8 +121,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   = `metadata.main_product_original_price` + Σ(bundle 原价 × num)。
  * - `metadata.source_product_price`：主商品/variant 基础价（已应用报价单），不含 option、
  *   不含折扣。**权威源**。
- * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
- * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
+ * - `product_sku.option[].add_price` 保留单规格折前单价；Rules 的 option.price 只用于本次计算。
+ * - `metadata.main_product_original_price` = source + Σ(option.add_price × option.num)（含 option、不含折扣）。
+ * - `metadata.main_product_selling_price` = main_original − 行内 per-unit amount（含主商品及 option 优惠）。
  * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
@@ -119,8 +132,9 @@ export declare function getBundleSellingMagnitude(bundle: Record<string, any> |
  *   `getProductOriginTotalPrice` 会自行叠加 option + bundle，喂 source 可避免 option 双加。
  * - `getProduct.total` = `selling_price × num`（行 composite × num），与 Rules 内部产出的
  *   total（source + option + bundle）对齐。
+ * - `getProduct.options` 用单规格原价参与重算；主商品折后价从 main_selling 减去 option 折后合计反推。
  * - `setProduct` 反向流程：把 Rules 返回的 source-level `main_product_selling_price` / `price`
- *   加回 Σoptions，重新合成含 option 的 main_product_* 并派生 composite。
+ *   加回单规格原价合计，再减去 optionDiscountAmount；保留订单单规格原价供取消折扣及后续重算。
  *   优先级：
  *     1. `values.main_product_selling_price`（券应用分支，per-unit 券后 source-level 主价）
  *     2. `values.price`（还原分支 `restoredPrice`、good_pass 归零）
@@ -159,7 +173,7 @@ export declare function resolveManualOverrideLineOriginalPrice(params: {
  * // => -4
  */
 export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
-export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
+export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings']): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
  * @param {CartItem} cartItem