@pisell/pisellos 2.2.197 → 2.2.199

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

@@ -194,6 +194,7 @@ export interface OrderSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

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

@@ -1,5 +1,5 @@
 import Decimal from 'decimal.js';
-import { CartItem } from "../Cart";
+import type { CartItem } from "../Cart";
 import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
@@ -21,10 +21,20 @@ export declare function composeLinePrice(params: {
     bundle?: Array<{
         bundle_selling_price?: any;
         price?: any;
+        custom_price?: any;
         num?: any;
         quantity?: any;
         original_price?: any;
         product_price?: any;
+        price_type?: any;
+        price_type_ext?: any;
+        custom_price_type?: any;
+        custom_price_type_ext?: any;
+        option?: Array<{
+            add_price?: any;
+            price?: any;
+            num?: any;
+        }>;
     }> | null;
     useOriginalBundle?: boolean;
 }): string;
@@ -43,6 +53,27 @@ export declare function sumOptionUnitPrice(options?: Array<{
     price?: any;
     num?: any;
 }> | null): Decimal;
+/**
+ * 判定套餐子商品是否为 markdown（减价）类型。
+ * 与后端口径一致：price_type='markdown' 且 price_type_ext 非 'product_price'（原价子商品）。
+ */
+export declare function isMarkdownBundle(bundle: Record<string, any> | null | undefined): boolean;
+/**
+ * 套餐子商品对「行价」的带符号单位贡献（与后端 markdown 口径对齐）。
+ *
+ * - markdown（减价）：净额 = |catalog 毛价| − Σ(option.add_price×num)，**取负**（行内减）。
+ *   catalog 毛价优先 `price`/`custom_price`（避免读已落净额的 `bundle_selling_price` 造成 option 二次扣减）；
+ *   仅当毛价缺失（历史/hydrate 仅剩净额）时退回 `bundle_selling_price`，且此时不再扣 option。
+ * - markup（加价）/原价子商品：维持 `+(bundle_selling_price ?? price)`，行为不变。
+ */
+export declare function getBundleSignedUnit(bundle: Record<string, any> | null | undefined, options?: {
+    useOriginal?: boolean;
+}): Decimal;
+/**
+ * 套餐子商品 `bundle_selling_price` 的存储净额（正值幅度）。
+ * markdown 取净额绝对值（3.70）；markup/原价维持原值。
+ */
+export declare function getBundleSellingMagnitude(bundle: Record<string, any> | null | undefined): Decimal;
 /**
  * OrderModule 默认 Rules 钩子工厂。
  *
@@ -55,7 +86,7 @@ export declare function sumOptionUnitPrice(options?: Array<{
  *   不含折扣。**权威源**。
  * - `metadata.main_product_original_price` = source + Σ(option.price × option.num)（含 option、不含折扣）。
  * - `metadata.main_product_selling_price` = main_original − 主商品券 per-unit amount（含 option、含折扣）。
- * - `payment_price`：出站 payload 中由 `selling_price` 派生以兼容后端（composite）。
+ * - `payment_price`：出站 payload 中为行 composite 已减整单折扣均摊价（无折扣时与 `selling_price` 同义）。
  *
  * Rules 钩子契约（hook_adapt 方案，Rules 内部保持不变）：
  * - `getProduct.price` / `getProduct.original_price` 回传 **source-level 主价**

package/lib/modules/Order/utils.js

@@ -44,11 +44,14 @@ __export(utils_exports, {
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
+  getBundleSellingMagnitude: () => getBundleSellingMagnitude,
+  getBundleSignedUnit: () => getBundleSignedUnit,
   getOrderProductLineUid: () => getOrderProductLineUid,
   getProductSkuOptions: () => getProductSkuOptions,
   hasAssignedHolderId: () => hasAssignedHolderId,
   indexOrderProductsByUid: () => indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
+  isMarkdownBundle: () => isMarkdownBundle,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
@@ -85,11 +88,10 @@ function composeLinePrice(params) {
   let total = new import_decimal.default(Number(mainPrice) || 0);
   if (Array.isArray(bundle)) {
     for (const item of bundle) {
-      const rawPrice = useOriginalBundle ? (item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price) : (item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price);
-      const price = new import_decimal.default(Number(rawPrice) || 0);
+      const signedUnit = getBundleSignedUnit(item, { useOriginal: useOriginalBundle });
       const rawNum = (item == null ? void 0 : item.num) ?? (item == null ? void 0 : item.quantity) ?? 1;
       const num = new import_decimal.default(Number(rawNum) || 0);
-      total = total.plus(price.times(num));
+      total = total.plus(signedUnit.times(num));
     }
   }
   return total.toDecimalPlaces(2).toFixed(2);
@@ -129,6 +131,33 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function isMarkdownBundle(bundle) {
+  if (!bundle || typeof bundle !== "object")
+    return false;
+  const ext = bundle.price_type_ext ?? bundle.custom_price_type_ext;
+  const type = bundle.price_type ?? bundle.custom_price_type;
+  return type === "markdown" && ext !== "product_price";
+}
+function getBundleSignedUnit(bundle, options) {
+  if (!bundle || typeof bundle !== "object")
+    return new import_decimal.default(0);
+  const useOriginal = (options == null ? void 0 : options.useOriginal) ?? false;
+  if (isMarkdownBundle(bundle)) {
+    const catalog = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.custom_price ?? bundle.base_price ?? bundle.price : bundle.custom_price ?? bundle.product_price ?? bundle.original_price ?? bundle.base_price ?? bundle.price;
+    if (catalog !== void 0 && catalog !== null && catalog !== "") {
+      const raw = new import_decimal.default(Number(catalog) || 0);
+      if (raw.lt(0))
+        return raw;
+      return raw.minus(sumOptionUnitPrice(bundle.option)).negated();
+    }
+    return new import_decimal.default(Number(bundle.bundle_selling_price) || 0).abs().negated();
+  }
+  const rawPrice = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.price : bundle.bundle_selling_price ?? bundle.price;
+  return new import_decimal.default(Number(rawPrice) || 0);
+}
+function getBundleSellingMagnitude(bundle) {
+  return getBundleSignedUnit(bundle).abs();
+}
 function resolveRulesManualDiscountFlag(metadata) {
   if (!metadata)
     return void 0;
@@ -472,9 +501,8 @@ function formatSubmitBundleItems(bundle) {
   return bundle.map((b) => {
     const rawBundle = b && typeof b === "object" ? b : {};
     const existedMetadata = rawBundle.metadata && typeof rawBundle.metadata === "object" ? rawBundle.metadata : {};
-    const sellingPrice = toMoneyString(
-      rawBundle.bundle_selling_price ?? rawBundle.price
-    );
+    const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    const paymentPrice = rawBundle.bundle_payment_price !== void 0 && 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 relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toMoneyString(
@@ -496,6 +524,7 @@ function formatSubmitBundleItems(bundle) {
       price_type: rawBundle.price_type ?? rawBundle.custom_price_type ?? "",
       price_type_ext: rawBundle.price_type_ext ?? rawBundle.custom_price_type_ext ?? "",
       bundle_selling_price: sellingPrice,
+      bundle_payment_price: paymentPrice,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: (rawBundle == null ? void 0 : rawBundle.bundle_group_id) ?? (rawBundle == null ? void 0 : rawBundle.group_id),
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
@@ -532,6 +561,9 @@ function normalizeSubmitProduct(product) {
   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",
@@ -566,9 +598,9 @@ function normalizeSubmitProduct(product) {
     discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
-    // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
-    // 新语义下 selling_price 是 composite（含 option/bundle），payment_price 同语义。
-    payment_price: submitProduct.selling_price
+    // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
+    // 由整单折扣均摊层产出；缺省（无折扣）时与 selling_price 同义。
+    payment_price: submitProduct.payment_price ?? submitProduct.selling_price
   };
 }
 var SUBMIT_BOOKING_METADATA_WHITELIST = [
@@ -953,11 +985,14 @@ function indexOrderProductsByUid(products) {
   formatV1Product,
   generateDuration,
   getAllDiscountList,
+  getBundleSellingMagnitude,
+  getBundleSignedUnit,
   getOrderProductLineUid,
   getProductSkuOptions,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
+  isMarkdownBundle,
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,

package/lib/modules/Payment/walletpass.js

@@ -296,18 +296,22 @@ var WalletPassPaymentImpl = class {
     return (0, import_utils.formatWalletPassList2PreparePayments)(list);
   }
   async getUserIdentificationCodeListAsync(params) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       const newParams = {
         ...this.walletParams,
         ...params
       };
+      if (!((_a = newParams.products) == null ? void 0 : _a.length)) {
+        this.paymentModule.logInfo("[WalletPass] 商品列表为空，跳过获取用户识别码列表");
+        return [];
+      }
       this.paymentModule.logInfo("[WalletPass] 开始获取用户识别码列表", {
         customer_id: newParams.customer_id,
         available: newParams.available,
-        prepare_payments_count: ((_a = newParams.prepare_payments) == null ? void 0 : _a.length) || 0,
+        prepare_payments_count: ((_b = newParams.prepare_payments) == null ? void 0 : _b.length) || 0,
         filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
-        payment_order_id: (_b = this.walletParams) == null ? void 0 : _b.payment_order_id
+        payment_order_id: (_c = this.walletParams) == null ? void 0 : _c.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction",