解决异常

Bailun.DC.DailyPlatformReceivable/Services.cs

@@ -28,16 +28,16 @@ namespace Bailun.DC.DailyPlatformReceivable
                 var objBefore = cn.QueryFirstOrDefault<dc_daily_receivable>(sql);
                 //本期收款
                 sql = $"select sum(amount_sales*seller_order_exchange_rate) amount from dc_base_oms_order where platform_type='Ebay' and paid_time>='{day.ToString("yyyy-MM-dd")}' and paid_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' and company_id=1 and bailun_order_status!='Canceled' and has_scalp=0 and has_innersale=0";
-                var EbaySales = cn.QueryFirstOrDefault<decimal>(sql);
+                var EbaySales = cn.QueryFirstOrDefault<decimal?>(sql)??0;
                 //发货金额
                 sql = $@"select sum(t1.amount_sales*t2.quantity_shipped*t1.seller_order_exchange_rate) amount 
                         from dc_base_oms_pick t2
                         join dc_base_oms_sku t1 on t1.bailun_order_id=t2.bailun_order_id and t1.bailun_sku=t2.bailun_sku and t1.has_scalp=0 and t1.has_delete=0 and t1.has_innersale=0 and t1.bailun_order_status!='Canceled' and t1.has_innersale=0 and t1.company_id=1 and t1.platform_type='Ebay'
                         where t2.has_delete=0 and t2.shipping_status='TotalShipping' and t2.company_id=1 and t2.shipping_time>='2019-11-01' and t2.shipping_time<'2019-11-02' ";
-                var EbayShipping = cn.QueryFirstOrDefault<decimal>(sql);
+                var EbayShipping = cn.QueryFirstOrDefault<decimal?>(sql)??0;
                 //退款(未发货的)
                 sql = $"select sum(amount_refund_rmb) amount from dc_base_crm_refund where platform_type = 'Ebay' and company_id = 1 and is_deleted = 0 and is_freeze = 0 and shipping_status = 'UnShipping' and refund_time>= '{day.ToString("yyyy-MM-dd")}' and refund_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}'";
-                var EbayRefund = cn.QueryFirstOrDefault<decimal>(sql);
+                var EbayRefund = cn.QueryFirstOrDefault<decimal?>(sql)??0;
 
                 var m_ebay = new dc_daily_receivable {
                     day = day,
@@ -69,7 +69,7 @@ namespace Bailun.DC.DailyPlatformReceivable
                         select platform_type,sum(amount_sales*seller_order_exchange_rate) amount,sum(cost_platform_fee*seller_order_exchange_rate) cost_platform_fee,sum(cost_fba_fee*seller_order_exchange_rate) cost_fba_fee from dc_base_oms_order where platform_type='FBA' and create_time>='{day.ToString("yyyy-MM-dd")}' and create_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' and company_id=1 and bailun_order_status!='Canceled' and has_scalp=0 and has_innersale=0
                         ) tb";
 
-                var listPlatform = cn.Query<string>("select platform_type from dc_base_oms_order group by platform_type").Where(a=>a.ToLower()!= "amazon2b" && a.ToLower()!= "fba").ToList();
+                var listPlatform = cn.Query<string>("select platform_type from dc_base_oms_order group by platform_type").Where(a=>a.ToLower()!= "amazon2b" && a.ToLower()!= "fba" && a.ToLower()!="ebay").ToList();
 
                 //退款
                 sql = $"select sum(amount_refund_rmb) as amount,platform_type from dc_base_crm_refund where platform_type!='Ebay' and company_id=1 and is_deleted=0 and is_freeze=0 and shipping_status!='TotalShipping' and refund_time>='{day.ToString("yyyy-MM-dd")}' and refund_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' GROUP BY platform_type;";
@@ -131,7 +131,7 @@ namespace Bailun.DC.DailyPlatformReceivable
                     {
                         //广告费
                         sql = $"select sum(exchange_rate*cost) amount from dc_base_finance_amazon_ad_product t1 where t1.company_id=1 and t1.report_date>='{day.ToString("yyyy-MM-dd")}' and t1.report_date<'{day.AddDays(1).ToString("yyyy-MM-dd")}'";
-                        var ad = cn.QueryFirstOrDefault<decimal>(sql);
+                        var ad = cn.QueryFirstOrDefault<decimal?>(sql)??0;
                         m.amount_platformfee += ad;
                     }
 

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

@@ -6104,7 +6104,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 rows = list,
                 count_row = new
                 {
-                    platform="合计"
+                    platform="合计",
                     amount_end = objCount.amount_end.ToString("N2"),
                     amount_incoming = objCount.amount_incoming.ToString("N2"),
                     amount_other = objCount.amount_other.ToString("N2"),