@pisell/pisellos 2.2.302 → 2.2.304

package/lib/modules/Order/utils.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "buildManualProductDiscountItem", {
     return _manualProductDiscount.buildManualProductDiscountItem;
   }
 });
+exports.buildPointCardSnapshotFromWalletPassList = buildPointCardSnapshotFromWalletPassList;
 exports.buildSubmitPayload = buildSubmitPayload;
 exports.calculateOrderProductsDeposit = calculateOrderProductsDeposit;
 exports.clearTempOrderHolderAssignments = clearTempOrderHolderAssignments;
@@ -67,7 +68,9 @@ exports.mergeOrderProductDisplayFields = mergeOrderProductDisplayFields;
 exports.mergeRelationForms = void 0;
 exports.normalizeBookingIsAll = normalizeBookingIsAll;
 exports.normalizeBookingSubType = normalizeBookingSubType;
+exports.normalizeOrderMetaList = normalizeOrderMetaList;
 exports.normalizeOrderProductDiscountList = normalizeOrderProductDiscountList;
+exports.normalizePointCardSnapshotItem = normalizePointCardSnapshotItem;
 exports.normalizeProductSkuOptions = normalizeProductSkuOptions;
 exports.normalizeSubmitBooking = normalizeSubmitBooking;
 exports.normalizeSubmitCollectPaxValue = normalizeSubmitCollectPaxValue;
@@ -126,8 +129,58 @@ var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+var _salesNotes = require("./salesNotes");
 var _manualProductDiscount = require("./utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const POINT_CARD_SNAPSHOT_TAG = 'point_card';
+function isPlainObject(value) {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+function normalizeSnapshotScalar(value) {
+  if (value === undefined || value === null) return undefined;
+  if (typeof value === 'string') return value.trim() ? value : undefined;
+  if (typeof value === 'number') return Number.isFinite(value) ? value : undefined;
+  return undefined;
+}
+function normalizePointCardSnapshotItem(value) {
+  if (!isPlainObject(value)) return null;
+  const id = normalizeSnapshotScalar(value.id);
+  if (id === undefined) return null;
+  if (String(value.tag || '').trim().toLowerCase() !== POINT_CARD_SNAPSHOT_TAG) {
+    return null;
+  }
+  const snapshot = {
+    id,
+    tag: 'point_card',
+    product_name: String(value.product_name ?? ''),
+    par_value: String(value.par_value ?? ''),
+    used_par_value: String(value.used_par_value ?? '')
+  };
+  const productId = normalizeSnapshotScalar(value.product_id);
+  if (productId !== undefined) {
+    snapshot.product_id = productId;
+  }
+  return snapshot;
+}
+function buildPointCardSnapshotFromWalletPassList(value) {
+  if (!Array.isArray(value)) return [];
+  return value.reduce((result, item) => {
+    const normalized = normalizePointCardSnapshotItem(item);
+    if (normalized) result.push(normalized);
+    return result;
+  }, []);
+}
+function normalizeOrderMetaList(value) {
+  if (value === undefined) return undefined;
+  if (!isPlainObject(value)) return undefined;
+  const normalized = {};
+  if (Object.prototype.hasOwnProperty.call(value, 'point_cards_snapshot')) {
+    normalized.point_cards_snapshot = buildPointCardSnapshotFromWalletPassList(value.point_cards_snapshot);
+  }
+  if (Object.keys(normalized).length > 0) return normalized;
+  return {};
+}
+
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -863,7 +916,7 @@ function normalizeSubmitProductionCode(value) {
 }
 
 // 后端 checkout 协议字段 option_group_item_id；tempOrder 内部也保持同一字段名。
-function formatSubmitOptionItems(options) {
+function formatSubmitOptionItems(options, formatOptions = {}) {
   if (!Array.isArray(options)) return [];
   return options.map(d => {
     const option = {
@@ -876,7 +929,11 @@ function formatSubmitOptionItems(options) {
     delete option.production_code;
     if (productionCode !== undefined) option.production_code = productionCode;
     const addPrice = d?.add_price ?? d?.price;
-    if (addPrice !== undefined) option.add_price = String(addPrice);
+    if (formatOptions.virtualSettlementMode) {
+      option.add_price = 0;
+    } else if (addPrice !== undefined) {
+      option.add_price = String(addPrice);
+    }
     delete option.price;
     return option;
   });
@@ -893,7 +950,7 @@ function toMoneyString(value) {
 }
 
 // 出站补齐：只输出后端 checkout 协议字段，运行时/详情展示字段不进入 bundle payload。
-function formatSubmitBundleItems(bundle) {
+function formatSubmitBundleItems(bundle, formatOptions = {}) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(b => {
     const rawBundle = b && typeof b === 'object' ? b : {};
@@ -905,10 +962,10 @@ function formatSubmitBundleItems(bundle) {
 
     // bundle_selling_price 出站存「正净额」：markdown 为 |price| − Σoptions（如 3.70），
     // markup/原价维持原值；与后端口径一致（price 仍为毛价）。
-    const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    const sellingPrice = formatOptions.virtualSettlementMode ? '0.00' : getBundleSellingMagnitude(rawBundle).toFixed(2);
     // payment 价由整单折扣均摊层产出；缺省（无折扣）时与 selling 净额同义。
-    const paymentPrice = rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
-    const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
+    const paymentPrice = formatOptions.virtualSettlementMode ? '0.00' : rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
+    const priceValue = formatOptions.virtualSettlementMode ? 0 : rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toMoneyString(rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee);
     const productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -917,7 +974,7 @@ function formatSubmitBundleItems(bundle) {
     const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
     const productionCode = normalizeSubmitProductionCode(rawBundle.production_code);
     return {
-      is_charge_tax: rawBundle.is_charge_tax ?? 0,
+      is_charge_tax: formatOptions.virtualSettlementMode ? 0 : rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
       ...(productionCode !== undefined ? {
         production_code: productionCode
@@ -931,7 +988,7 @@ function formatSubmitBundleItems(bundle) {
       price_type_ext: rawBundle.price_type_ext ?? rawBundle.custom_price_type_ext ?? '',
       bundle_selling_price: sellingPrice,
       bundle_payment_price: paymentPrice,
-      option: formatSubmitOptionItems(rawBundle.option),
+      option: formatSubmitOptionItems(rawBundle.option, formatOptions),
       bundle_group_id: rawBundle?.bundle_group_id ?? rawBundle?.group_id,
       bundle_id: rawBundle?.bundle_id ?? rawBundle?.id,
       bundle_product_id: rawBundle?.bundle_product_id ?? rawBundle?._bundle_product_id,
@@ -941,9 +998,9 @@ function formatSubmitBundleItems(bundle) {
         ...(hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
           custom_product_bundle_map_id: bundleMapId
         } : {}),
-        surcharge_fee: surchargeFee,
-        relation_surcharge_ids: relationSurchargeIds,
-        product_discount_difference: productDiscountDifference
+        surcharge_fee: formatOptions.virtualSettlementMode ? '0.00' : surchargeFee,
+        relation_surcharge_ids: formatOptions.virtualSettlementMode ? [] : relationSurchargeIds,
+        product_discount_difference: formatOptions.virtualSettlementMode ? '' : productDiscountDifference
       }
     };
   });
@@ -963,9 +1020,9 @@ function formatSubmitBundleItems(bundle) {
  * - `metadata.main_product_selling_price`：含 option、含主商品折扣。
  * - `metadata.price_schema_version`：schema 版本号（当前 = 2），用于跨端协商价格口径。
  *
- * 本函数不再改造价格字段形状，仅做字段/metadata 裁剪。
+ * 法币仅做字段/metadata 裁剪；虚拟币在出站前再次执行零加价与固定单价断言。
  */
-function normalizeSubmitProduct(product) {
+function normalizeSubmitProduct(product, formatOptions = {}) {
   const {
     unique_identification_number: _runtimeUid,
     ...submitProduct
@@ -993,7 +1050,7 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
   }
-  const priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'main_product_attached_bundle_selling_price', 'main_product_attached_bundle_payment_price', 'average_discount_amount_rate', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'parent_unique_identification_number', 'product_add_schedule_time'];
+  const priceMetaKeys = ['main_product_original_price', 'main_product_selling_price', 'main_product_attached_bundle_selling_price', 'main_product_attached_bundle_payment_price', 'average_discount_amount_rate', 'source_product_price', 'main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder', 'relation_surcharge_ids', 'discountable_flag', 'price_schema_version', 'parent_unique_identification_number', 'product_add_schedule_time', 'data_variant_ids'];
   for (const key of priceMetaKeys) {
     if (rawMetadata[key] !== undefined) {
       cleanMetadata[key] = rawMetadata[key];
@@ -1009,12 +1066,36 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.holder_config !== undefined) {
     cleanMetadata.holder_config = rawMetadata.holder_config;
   }
+  const virtualPrice = toMoneyString(rawMetadata.selected_settlement_snapshot?.price ?? submitProduct.selling_price);
+  if (formatOptions.virtualSettlementMode) {
+    Object.assign(cleanMetadata, {
+      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
+    });
+  }
   const productSku = {
     ...(submitProduct.product_sku && typeof submitProduct.product_sku === 'object' ? submitProduct.product_sku : {}),
-    option: formatSubmitOptionItems(submitProduct.product_sku?.option)
+    option: formatSubmitOptionItems(submitProduct.product_sku?.option, formatOptions)
   };
   return {
     ...productRest,
+    ...(formatOptions.virtualSettlementMode ? {
+      selling_price: virtualPrice,
+      original_price: virtualPrice,
+      is_charge_tax: 0
+    } : {}),
     ...(productionCode !== undefined ? {
       production_code: productionCode
     } : {}),
@@ -1026,12 +1107,12 @@ function normalizeSubmitProduct(product) {
     } : {}),
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: collectSubmitProductDiscountList(submitProduct),
-    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
+    discount_list: formatOptions.virtualSettlementMode ? [] : collectSubmitProductDiscountList(submitProduct),
+    product_bundle: formatSubmitBundleItems(submitProduct.product_bundle, formatOptions),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
     // 由整单折扣均摊层产出；缺省（无折扣）时与 selling_price 同义。
-    payment_price: submitProduct.payment_price ?? submitProduct.selling_price
+    payment_price: formatOptions.virtualSettlementMode ? virtualPrice : submitProduct.payment_price ?? submitProduct.selling_price
   };
 }
 const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
@@ -1128,6 +1209,7 @@ function createDefaultTempOrder(params) {
     request_unique_idempotency_token: '',
     vouchers: [],
     products: [],
+    notes: [],
     bookings: [],
     payments: [],
     surcharges: [],
@@ -1137,7 +1219,11 @@ function createDefaultTempOrder(params) {
     holder: null,
     metadata: {},
     _extend: {
-      productsByUid: {}
+      productsByUid: {},
+      salesNotesState: {
+        loaded: true,
+        dirty: false
+      }
     }
   };
 }
@@ -1199,6 +1285,7 @@ function buildSubmitPayload(params) {
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const bookingUuid = (0, _orderCollectionIdentity.createUuidV4)();
+  const virtualSettlementMode = tempOrder.metadata?.currency_settlement_config?.settlement_type === 'virtual_currency';
   const {
     _extend: _extend,
     relation_id: _relationId,
@@ -1213,14 +1300,18 @@ function buildSubmitPayload(params) {
     start_time: _startTime,
     customer: _customer,
     discount_list: _discountList,
+    order_meta_list: _orderMetaList,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
     create_date: _createDate,
     holder_id: _holderId,
+    payment_status: _paymentStatus,
+    notes: _notes,
     ...tempOrderRest
   } = tempOrder;
   const resolvedBusinessCode = businessCode ?? tempOrder.business_code;
+  const normalizedOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
   const submitType = resolveSubmitOrderType({
     requestedType: type,
     tempOrderType: tempOrder.type,
@@ -1246,7 +1337,9 @@ function buildSubmitPayload(params) {
     sales_channel: tempOrder.sales_channel || 'my_pisel',
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? 'online_store',
     status: tempOrder.status || 'normal',
-    payment_status: tempOrder.payment_status || 'payment_processing',
+    ...(params.includePaymentStatus !== false ? {
+      payment_status: tempOrder.payment_status || 'payment_processing'
+    } : {}),
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
     is_price_include_tax: tempOrder.is_price_include_tax ?? 1,
     currency_format: tempOrder.currency_format || 'symbol_first',
@@ -1269,13 +1362,26 @@ function buildSubmitPayload(params) {
       const {
         collect_pax: _collectPax,
         table_occupancy_duration: _tableOccupancyDuration,
+        cart_settlement_key: _cartSettlementKey,
+        cart_settlement_snapshot: _cartSettlementSnapshot,
+        legal_currency_snapshot: _legalCurrencySnapshot,
         ...rest
       } = tempOrder.metadata || {};
       return {
         ...rest
       };
     })(),
-    products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product))
+    ...(tempOrder._extend?.salesNotesState?.dirty ? {
+      notes: (0, _salesNotes.encodeSalesNotes)(tempOrder.notes || [], {
+        allowUnresolvedOrderTarget: true
+      })
+    } : {}),
+    products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product, {
+      virtualSettlementMode
+    })),
+    ...(normalizedOrderMetaList !== undefined ? {
+      order_meta_list: normalizedOrderMetaList
+    } : {})
   };
   if (!enhance) return payload;
   const enhancedPayload = enhance(payload, {

package/lib/modules/Payment/cashRecommendationAlgorithm.d.ts

@@ -2,10 +2,9 @@
  * 现金支付推荐算法
  *
  * 核心原理：
- * 1. 每个推荐金额都应该是独立的最优组合
- * 2. 不推荐在已有最优解基础上添加额外面额的组合
- * 3. 优先推荐使用不同数量币种的组合
- * 4. 根据组合判断去重，避免扩展组合
+ * 1. 第一项始终是精确应付金额
+ * 2. 其余推荐只能是严格大于应付金额的真实币种面额
+ * 3. 最多推荐三个更高面额
  */
 /**
  * 常见国家货币面额配置
@@ -13,7 +12,7 @@
 export declare const CURRENCY_DENOMINATIONS: Record<string, number[]>;
 /**
  * 最优支付金额推荐算法
- * 推荐通过不同数量面额组合刚好足够支付的最小金额
+ * 返回精确应付金额，以及最多三个更高的真实币种面额
  *
  * @param targetAmount 目标金额
  * @param denominations 币种面值数组