调整平台利润调整销售额

Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs

@@ -2192,7 +2192,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 {
                     platform_type = "总计(" + currency + ")",
                     order_count = result.Sum(a => a.order_count),
-                    amount_sales = result.Sum(a => a.amount_sales) + result.Sum(a => a.amount_adjustment),
+                    amount_sales = result.Sum(a => a.platform_type == "Fyndiq" ? (a.amount_sales * 0.8m) : (a.platform_type == "Shopify" ? (a.amount_sales + a.amount_adjustment) : a.amount_sales)),
                     customerprice = result.Sum(a => a.customerprice) / result.Count,
                     cost_platform_fee = result.Sum(a => a.cost_platform_fee),
                     profit_total = result.Sum(a => a.profit_total),
@@ -2226,7 +2226,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 profit_rate = ((p.amount_sales - p.amount_prepaid) > 0 ? p.profit_total * 100 / (p.amount_sales - p.amount_prepaid) : 0).ToString("N2"),
                 amount_refund = p.amount_refund.ToString("N2"),
                 amount_refund_rate = p.amount_sales > 0 ? (p.amount_refund * 100 / p.amount_sales).ToString("N4") : "0",
-                amount_sales = p.platform_type == "Fyndiq" ? ((p.amount_sales + p.amount_adjustment) * 0.8m).ToString("N2") : (p.amount_sales + p.amount_adjustment).ToString("N2"),
+                amount_sales = (p.platform_type == "Fyndiq" ? (p.amount_sales * 0.8m) : (p.platform_type == "Fyndiq" ? (p.amount_sales + p.amount_adjustment) : p.amount_sales)).ToString("N2"),
 
                 cost_first = p.cost_first.ToString("N2"),
                 cost_handle_bailun = p.cost_handle_bailun.ToString("N2"),