@pisell/pisellos 2.2.308 → 2.2.310

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/weighedProduct.d.ts

@@ -0,0 +1,12 @@
+/** Only pricing/measurement fields participate; display and option data do not. */
+export declare function getWeighedProductPriceFingerprint(sku?: Record<string, any>): string;
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+export declare function resolveWeighedSourcePrice(sku?: Record<string, any>, weighing?: Record<string, any>): string | undefined;
+/** Original bundle totals must use the nested options before manual distribution. */
+export declare function withOriginalBundleOptionPrices(bundles?: Array<Record<string, any>>): {
+    option: any;
+}[] | undefined;

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

@@ -0,0 +1,94 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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 Decimal from 'decimal.js';
+var UNIT_GRAMS = {
+  kg: '1000',
+  KILOGRAMS: '1000',
+  g: '1',
+  GRAMS: '1',
+  lb: '453.59237',
+  POUNDS: '453.59237',
+  oz: '28.349523125',
+  OUNCES: '28.349523125'
+};
+function nonNegative(value) {
+  if (value === null || value === undefined || value === '') return undefined;
+  try {
+    var result = new Decimal(value);
+    return result.isFinite() && result.gte(0) ? result : undefined;
+  } catch (_unused) {
+    return undefined;
+  }
+}
+function numericKey(value) {
+  var _nonNegative;
+  return (_nonNegative = nonNegative(value)) === null || _nonNegative === void 0 ? void 0 : _nonNegative.toString();
+}
+function unitKey(value) {
+  return UNIT_GRAMS[String(value)] || (value == null ? undefined : String(value));
+}
+function snapshotKey(snapshot) {
+  var _snapshot$unit_value;
+  return [numericKey(snapshot === null || snapshot === void 0 ? void 0 : snapshot.price), unitKey(snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit), numericKey((_snapshot$unit_value = snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit_value) !== null && _snapshot$unit_value !== void 0 ? _snapshot$unit_value : 1)];
+}
+
+/** Only pricing/measurement fields participate; display and option data do not. */
+export function getWeighedProductPriceFingerprint(sku) {
+  var _sku$unit_weight;
+  if (Number(sku === null || sku === void 0 ? void 0 : sku.open_sold_weight) !== 1) return 'unweighed';
+  return JSON.stringify([1, numericKey(sku === null || sku === void 0 ? void 0 : sku.net_weight), unitKey(sku === null || sku === void 0 ? void 0 : sku.unit), numericKey(sku === null || sku === void 0 ? void 0 : sku.unit_price), numericKey((_sku$unit_weight = sku === null || sku === void 0 ? void 0 : sku.unit_weight) !== null && _sku$unit_weight !== void 0 ? _sku$unit_weight : 1), snapshotKey(sku === null || sku === void 0 ? void 0 : sku.unit_data_snapshot)]);
+}
+
+/**
+ * A weighed line's source is the amount for its net weight, never its catalog unit price.
+ * Persisted SKU measurements and the full catalog snapshot take priority over runtime
+ * _extend.weighing, which can survive repricing with an obsolete total_amount.
+ */
+export function resolveWeighedSourcePrice(sku, weighing) {
+  var _snapshot$unit_value2, _weighing$unit_weight, _sku$unit_weight2, _measurement$unit_wei;
+  if ((sku === null || sku === void 0 ? void 0 : sku.open_sold_weight) != null && Number(sku.open_sold_weight) !== 1) return undefined;
+  if (Number(sku === null || sku === void 0 ? void 0 : sku.open_sold_weight) !== 1 && !weighing) return undefined;
+  var hasSkuMeasurement = (sku === null || sku === void 0 ? void 0 : sku.net_weight) !== undefined && (sku === null || sku === void 0 ? void 0 : sku.net_weight) !== null;
+  var measurement = hasSkuMeasurement ? sku : weighing;
+  var netWeight = nonNegative(measurement === null || measurement === void 0 ? void 0 : measurement.net_weight);
+  if (netWeight === undefined) return undefined;
+  var snapshot = hasSkuMeasurement ? sku === null || sku === void 0 ? void 0 : sku.unit_data_snapshot : weighing === null || weighing === void 0 ? void 0 : weighing.scalePriceProduct;
+  var snapshotPrice = nonNegative(snapshot === null || snapshot === void 0 ? void 0 : snapshot.price);
+  var snapshotUnits = nonNegative((_snapshot$unit_value2 = snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit_value) !== null && _snapshot$unit_value2 !== void 0 ? _snapshot$unit_value2 : 1);
+  var sourceGrams = UNIT_GRAMS[String(snapshot === null || snapshot === void 0 ? void 0 : snapshot.unit)];
+  var targetGrams = UNIT_GRAMS[String(measurement === null || measurement === void 0 ? void 0 : measurement.unit)];
+  if (snapshotPrice && snapshotUnits !== null && snapshotUnits !== void 0 && snapshotUnits.gt(0) && sourceGrams && targetGrams) {
+    return snapshotPrice.mul(netWeight).mul(targetGrams).div(sourceGrams).div(snapshotUnits).toFixed(2);
+  }
+
+  // Legacy callers may only retain the native scale's amount. Do not let an old
+  // amount overwrite a changed SKU measurement, unit price, or pricing snapshot.
+  var runtimeAmount = nonNegative(weighing === null || weighing === void 0 ? void 0 : weighing.total_amount);
+  var runtimeMatchesSku = !hasSkuMeasurement || numericKey(weighing === null || weighing === void 0 ? void 0 : weighing.net_weight) === numericKey(sku === null || sku === void 0 ? void 0 : sku.net_weight) && unitKey(weighing === null || weighing === void 0 ? void 0 : weighing.unit) === unitKey(sku === null || sku === void 0 ? void 0 : sku.unit) && numericKey(weighing === null || weighing === void 0 ? void 0 : weighing.unit_price) === numericKey(sku === null || sku === void 0 ? void 0 : sku.unit_price) && numericKey((_weighing$unit_weight = weighing === null || weighing === void 0 ? void 0 : weighing.unit_weight) !== null && _weighing$unit_weight !== void 0 ? _weighing$unit_weight : 1) === numericKey((_sku$unit_weight2 = sku === null || sku === void 0 ? void 0 : sku.unit_weight) !== null && _sku$unit_weight2 !== void 0 ? _sku$unit_weight2 : 1) && JSON.stringify(snapshotKey(weighing === null || weighing === void 0 ? void 0 : weighing.scalePriceProduct)) === JSON.stringify(snapshotKey(sku === null || sku === void 0 ? void 0 : sku.unit_data_snapshot));
+  if (runtimeAmount && runtimeMatchesSku) return runtimeAmount.toFixed(2);
+
+  // Older persisted orders have only a rounded per-scale-unit price.
+  var unitPrice = nonNegative(measurement === null || measurement === void 0 ? void 0 : measurement.unit_price);
+  var unitWeight = nonNegative((_measurement$unit_wei = measurement === null || measurement === void 0 ? void 0 : measurement.unit_weight) !== null && _measurement$unit_wei !== void 0 ? _measurement$unit_wei : 1);
+  if (!unitPrice || !(unitWeight !== null && unitWeight !== void 0 && unitWeight.gt(0))) return undefined;
+  return netWeight.div(unitWeight).mul(unitPrice).toFixed(2);
+}
+
+/** Original bundle totals must use the nested options before manual distribution. */
+export function withOriginalBundleOptionPrices(bundles) {
+  return bundles === null || bundles === void 0 ? void 0 : bundles.map(function (bundle) {
+    var _bundle$option;
+    return _objectSpread(_objectSpread({}, bundle), {}, {
+      option: (_bundle$option = bundle.option) === null || _bundle$option === void 0 ? void 0 : _bundle$option.map(function (option) {
+        var _ref, _option$original_pric;
+        return _objectSpread(_objectSpread({}, option), {}, {
+          add_price: (_ref = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref !== void 0 ? _ref : option.price
+        });
+      })
+    });
+  });
+}

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 单价"。
@@ -159,7 +171,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