付款时间也改为发生额

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

@@ -1385,8 +1385,6 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
                 dtstart = shipstart;
                 dtend = shipend;
-
-                listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD");
             }
             else
             {
@@ -1396,8 +1394,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             ebayADFee = _service.EbayFeeCount(companyid, dtstart, dtend, ADfeeType, "", "", currency.ToUpper() == "USD");
             ebayPutAway = _service.EbayFeeCount(companyid, dtstart, dtend, PutAwayFeeType, "", "", currency.ToUpper() == "USD");
             var amazonAD = _service.ListAmazonADSkuCount("", dtstart, dtend, companyid, currency.ToUpper() == "USD");
+            listRefund = _service.ListPlatformRefund(dtstart, dtend, companyid, platform, website, currency.ToUpper() == "USD");
 
-            
             foreach (var item in result)
             {
                 item.adfee = 0;
@@ -1421,18 +1419,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     item.profit_rate = Math.Round((item.profit_total / item.amount_sales), 2);
                 }
 
-                if (shipstart.HasValue || shipend.HasValue)
+                item.amount_refund = 0;
+                item.amount_refund_rate = 0;
+                var objRefund = listRefund.Where(a => a.platform_type.ToLower() == item.platform_type.ToLower()).FirstOrDefault();
+                if (objRefund != null)
                 {
-                    item.amount_refund = 0;
-                    item.amount_refund_rate = 0;
-                    var objRefund = listRefund.Where(a => a.platform_type.ToLower() == item.platform_type.ToLower()).FirstOrDefault();
-                    if (objRefund != null)
-                    {
-                        item.amount_refund = objRefund.amount_refund;
-                        item.amount_refund_rate = (item.amount_sales > 0 ? item.amount_refund / item.amount_sales : 0);
-                    }
+                    item.amount_refund = objRefund.amount_refund;
+                    item.amount_refund_rate = (item.amount_sales > 0 ? item.amount_refund / item.amount_sales : 0);
                 }
-                
+
                 //利润减去退款
                 item.profit_total = (item.profit_total - item.amount_refund);
                 item.profit_rate = Math.Round((item.profit_total / item.amount_sales), 2);

Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformProfitCount.cshtml

@@ -15,7 +15,7 @@
         <div style="float:right;width:100%;">
             <div id="rightcontain">
                 <div class="alert alert-warning">
-                    说明：退款数据按发货时间统计时，统计的是时间段内的退款发生额，并且排除已取消订单的退款；按付款时间时，关联订单取退款数据，并去掉取消和拦截的订单退款。
+                    说明：退款数据统计的是时间段内的退款发生额，并且排除已取消订单的退款。
                 </div>
                 
                 <div class="ibox-content m-b-sm border-bottom">