完善小简的问题调整

Bailun.DC.Services/OrdersServices.cs

@@ -729,20 +729,10 @@ namespace Bailun.DC.Services
                 var arr = skucategoryids.Split('|').Where(a => !string.IsNullOrEmpty(a)).ToList();
                 if (arr.Count > 0)
                 {
-                    //获取选中分类下所有的分类
-                    //var AllCategory = Services.CommonServices.GetCategoryList(0);
-                    //var listcategory = new List<Models.Common.CategoryDto>();
-
-                    //foreach (var item in arr)
-                    //{
-                    //    listcategory.AddRange(Services.CommonServices.GetCategoryListAll(AllCategory, int.Parse(item)));
-                    //}
-
                     var s = string.Join(",", arr);
                     if (!string.IsNullOrEmpty(s))
                     {
                         sql += " and t6.category_simple_id in (" + s + ") ";
-
                     }
                 }
             }

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

@@ -440,9 +440,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             countM.cost_shipping = Math.Round(countM.cost_shipping, 2, MidpointRounding.AwayFromZero);
             countM.cost_total = Math.Round(countM.cost_total, 2, MidpointRounding.AwayFromZero);
             countM.profit_total = Math.Round(countM.profit_total, 2, MidpointRounding.AwayFromZero);
-            countM.website = "总计：";
+            countM.cost_handle_bailun = Math.Round(countM.cost_handle_bailun, 2, MidpointRounding.AwayFromZero);
+            countM.cost_handle_platform = Math.Round(countM.cost_handle_platform, 2, MidpointRounding.AwayFromZero);
+            countM.cost_logistics = Math.Round(countM.cost_logistics, 2, MidpointRounding.AwayFromZero);
 
+            countM.website = "总计：";
 
+            //,t1.cost_handle_bailun,t1.cost_handle_platform,t1.cost_logistics
             var list = obj.Select(p => new {
                 p.bailun_order_id,
                 p.origin_order_id,
@@ -471,6 +475,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 p.salecount,
                 profit_rate = (p.profit_rate*100).ToString("N2"),
                 cost_paypal_fee = p.cost_paypal_fee.ToString("N2"),
+                cost_handle_bailun = p.cost_handle_bailun.ToString("N2"),
+                cost_handle_platform = p.cost_handle_platform.ToString("N2"),
+                cost_logistics = p.cost_logistics.ToString("N2")
 
             });
 

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

@@ -90,6 +90,7 @@
                 //{ field: 'bailun_sku', title: 'Sku', width: '100', iscount: true },
                 { field: 'amount_sales', title: '销售额', width: '100', sortable: true, iscount: true },
                 { field: 'cost_platform_fee', title: '平台费', width: '100', sortable: true, iscount: true },
+                { field: 'platform_fee_rate', title: '佣金比例%', width: '90' },
                 { field: 'amount_shipping', title: '运费收入', width: '90', sortable: true, iscount: true },
                 { field: 'cost_promotion', title: '促销费', width: '90', sortable: true, iscount: true },
                 { field: 'cost_first', title: '头程费', width: '110', sortable: true, iscount: true },
@@ -97,10 +98,9 @@
                 
                 { field: 'cost_fba_fee', title: 'fba费用', width: '100', sortable: true, iscount: true },
                 
-                { field: 'platform_fee_rate', title: '佣金比例%', width: '90' },
                 { field: 'losswithdrawal', title: '提现损耗', width: '100', sortable: true, iscount: true },
-                { field: 'amount_total', title: '总收入', width: '90', sortable: true, iscount: true },
-                { field: 'cost_total', title: '总支出', width: '90', sortable: true, iscount: true },
+                //{ field: 'amount_total', title: '总收入', width: '90', sortable: true, iscount: true },
+                //{ field: 'cost_total', title: '总支出', width: '90', sortable: true, iscount: true },
                 { field: 'paid_time', title: '付款时间', width: '140', sortable: true }
             ];
 

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

@@ -131,7 +131,9 @@
                 { field: 'cost_platform_fee', title: '平台费', width: '90', sortable: true, iscount: true },
                 { field: 'cost_product', title: '产品成本', width: '100', sortable: true, iscount: true },
                 { field: 'cost_first', title: '头程费', width: '90', sortable: true, iscount: true },
-                { field: 'cost_package', title: '包装费', width: '90', sortable: true, iscount: true },
+                { field: 'cost_logistics', title: '尾程费', width: '110', sortable: true, iscount: true },
+                { field: 'cost_handle_bailun', title: '百伦处理费', width: '110', sortable: true, iscount: true },
+                { field: 'cost_handle_platform', title: '平台操作费', width: '110', sortable: true, iscount: true },
                 { field: 'cost_fba_fee', title: 'fba费用', width: '110', sortable: true, iscount: true },
                 { field: 'cost_paypal_fee', title: 'paypal费', width: '110', sortable: true, iscount: true },
                 { field: 'cost_total', title: '总支出', width: '90', sortable: true, iscount: true },