调整利润率，改为利润率=利润/(销售额-预收金额)

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

@@ -2027,7 +2027,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                         item.putawayfee = (ebayPutAway != null ? ebayPutAway.gross_amount_rmb : 0)+ (ebayPutAwayNew != null ? ebayPutAwayNew.value_rmb : 0);
 
                         item.profit_total = (item.profit_total - (item.adfee ?? 0) - (item.putawayfee ?? 0));
-                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / item.amount_sales), 2) : 0;
+                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / (item.amount_sales-item.amount_prepaid)), 2) : 0;
                     }
 
                     else if (item.platform_type.ToLower() == "fba")  //亚马逊广告费
@@ -2035,27 +2035,27 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                         item.adfee = amazonAD != null ? amazonAD.cost_rmb : 0;
 
                         item.profit_total = (item.profit_total - item.adfee ?? 0);
-                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / item.amount_sales), 2) : 0;
+                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / (item.amount_sales - item.amount_prepaid)), 2) : 0;
                     }
 
                     else if (item.platform_type.ToLower() == "wish")   //Wish广告费
                     {
                         item.adfee = wishAD != null ? wishAD.daily_total_campaign_spend : 0;
                         item.profit_total = (item.profit_total - item.adfee ?? 0);
-                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / item.amount_sales), 2) : 0;
+                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / (item.amount_sales - item.amount_prepaid)), 2) : 0;
                     }
 
                     else if (item.platform_type.ToLower() == "aliexpress")  //速卖通广告费
                     {
                         item.adfee = aliexpressAD != null ? aliexpressAD.cost_fee : 0;
                         item.profit_total = (item.profit_total - item.adfee ?? 0);
-                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / item.amount_sales), 2) : 0;
+                        item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / (item.amount_sales - item.amount_prepaid)), 2) : 0;
                     }
                 }
                 else if (statistictype == 1)
                 {
                     item.profit_total = item.profit_total - (item.adfee ?? 0) - (item.putawayfee ?? 0);
-                    item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / item.amount_sales), 2) : 0;
+                    item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / (item.amount_sales - item.amount_prepaid)), 2) : 0;
                 }
                 else if (statistictype == 2) //sku来源
                 {
@@ -2083,7 +2083,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                         item.profit_total -= _objAmazonAD.cost_rmb;
                     }
 
-                    item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / item.amount_sales), 2) : 0;
+                    item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / (item.amount_sales - item.amount_prepaid)), 2) : 0;
                 }
 
                 if (statistictype != 1)
@@ -2099,11 +2099,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                     //利润减去退款
                     item.profit_total = (item.profit_total - item.amount_refund);
-                    item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / item.amount_sales), 2) : 0;
+                    item.profit_rate = item.amount_sales != 0 ? Math.Round((item.profit_total / (item.amount_sales - item.amount_prepaid)), 2) : 0;
 
                 }
 
-
                 if (statistictype == 2)
                 {
                     item.platform_type = Enum.GetName(typeof(SkuSource), int.Parse(item.platform_type));
@@ -2151,7 +2150,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     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),
-                    profit_rate = result.Sum(a => a.amount_sales) > 0 ? result.Sum(a => a.amount_sales) / result.Sum(a => a.amount_sales) : 0,
+                    profit_rate = result.Sum(a => a.amount_sales) > 0 ? result.Sum(a => a.profit_total) / result.Sum(a => a.amount_sales-a.amount_prepaid) : 0,
                     amount_refund = result.Sum(a => a.amount_refund),
                     amount_refund_rate = result.Sum(a => a.amount_sales) > 0 ? (result.Sum(a => a.amount_refund) / result.Sum(a => a.amount_sales) * 100) : 0,
                     cost_first = result.Sum(a => a.cost_first),
@@ -2177,7 +2176,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 order_count = p.order_count.ToString("N0"),
                 cost_platform_fee = p.cost_platform_fee > 0 ? p.cost_platform_fee.ToString("N2") : "0",
                 profit_total = p.profit_total.ToString("N2"),
-                profit_rate = (p.amount_sales > 0 ? p.profit_total * 100 / p.amount_sales : 0).ToString("N2"),
+                profit_rate = (p.amount_sales > 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.amount_sales.ToString("N2"),