@pisell/pisellos 2.2.198 → 2.2.199

package/lib/solution/ScanOrder/utils.js

@@ -75,6 +75,7 @@ function createEmptySummary() {
     shipping_tax_fee: "0.00",
     tax_fee: "0.00",
     surcharge_fee: "0.00",
+    surcharges: [],
     discount_amount: "0.00",
     deposit_amount: "0.00",
     expect_amount: "0.00",
@@ -436,16 +437,33 @@ function normalizeOrderProduct(product) {
       };
     });
   }
-  const normalizedBundle = bundleInput.map((item) => ({
-    ...item,
-    bundle_id: item.bundle_id ?? item.id,
-    bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
-    bundle_group_id: item.bundle_group_id ?? item.group_id,
-    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
-    price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
-    price_type: item.price_type ?? item.custom_price_type ?? "",
-    price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
-  }));
+  const normalizedBundle = bundleInput.map((item) => {
+    const magnitudeSource = {
+      ...item,
+      // 计算 markdown 净额时，只把真实毛价交给 helper；若只有 bundle_selling_price，
+      // helper 会按历史净额兜底，避免 option 二次扣减。
+      price: item.price ?? item.custom_price
+    };
+    const normalizedItem = {
+      ...item,
+      bundle_id: item.bundle_id ?? item.id,
+      bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
+      bundle_group_id: item.bundle_group_id ?? item.group_id,
+      // price 保留毛价（markdown 仍为 5），由 price_type 决定符号。
+      price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
+      price_type: item.price_type ?? item.custom_price_type ?? "",
+      price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
+    };
+    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if (normalizedItem.price_type === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    if ((normalizedItem.price_type === "markdown" || normalizedItem.price_type === "markup") && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      delete normalizedItem.original_total;
+    }
+    return normalizedItem;
+  });
   const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
   const productSku = {

package/lib/solution/VenueBooking/index.js

@@ -1395,7 +1395,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   getOrderProducts() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.getOrderProducts();
+    const products = this.store.order.getOrderProducts();
+    return products;
   }
   async getSummary() {
     this.logMethodStart("getSummary");

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.198",
+  "version": "2.2.199",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",