调整利润数据

Bailun.DC.Services/OrdersServices.cs

@@ -1700,7 +1700,7 @@ namespace Bailun.DC.Services
                     }
                 }
 
-                sql += " where t3.bailun_order_status!='Canceled' and ((t3.platform_type!='FBA' and t3.bailun_order_status!='CantHandle') or t3.platform_type='FBA') and t3.has_scalp=0 and t3.has_innersale=0 and t3.bailun_interception_status in ('None','Failed') and t3.has_delete=0  ";
+                sql += " where t3.bailun_order_status!='Canceled' and ((t3.platform_type!='FBA' and t3.bailun_order_status!='CantHandle') or t3.platform_type='FBA') and t3.has_scalp=0 and t3.has_innersale=0 and t3.bailun_interception_status in ('None','Failed') and t3.has_delete=0 ";
                 if (companyid.HasValue && companyid.Value > 0)
                 {
                     sql += " and t3.company_id=" + companyid.Value;    //增加公司id过滤
@@ -1788,11 +1788,9 @@ namespace Bailun.DC.Services
             }
 
 
-            sql += "  where tb.bailun_order_status!='Canceled' and ((tb.platform_type!='FBA' and tb.bailun_order_status!='CantHandle') or tb.platform_type='FBA') and tb.has_scalp=0 and tb.has_innersale=0 and tb.bailun_interception_status in ('None','Failed') ";
-
+            sql += "  where tb.bailun_order_status!='Canceled' and ((tb.platform_type!='FBA' and tb.bailun_order_status!='CantHandle') or tb.platform_type='FBA') and tb.has_scalp=0 and tb.has_innersale=0 and tb.bailun_interception_status in ('None','Failed') and tb.has_delete=0 ";
             
 
-
             if (shippingstrategy.HasValue)  //1专线;2中国发货;3海外仓; 4FBA仓
             {
                 var listSpecialLogistics = CommonServices.ListLogisticsConfig(1);

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

@@ -3016,7 +3016,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 {
                     success = true,
                     msg = "",
-                    data = listval,
+                    data = listval.Select(a=> new {
+                        start = a.start.ToString("N2"),
+                        end = a.end.ToString("N2"),
+                        a.diff,
+                        diffval = a.diffval.ToString("N2"),
+                        a.onelevelname,
+                        a.sencondlevelname,
+                    
+                    }),
                     start = start.ToString("yyyy-MM-dd"),
                     end = end.ToString("yyyy-MM-dd")
                 });