Merge branch 'master' into webapi

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -1082,23 +1082,16 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
             {
                 listReversal.ForEach(l =>
                 {
-                    data.ForEach(x => { if (l.platform == x.platform && l.website == x.site) { x.total = 0 - x.total; } });
+                    data = data.Select(x =>
+                    {
+                        if (l.platform == x.platform && l.website == x.site)
+                        {
+                            x.total = 0 - x.total;
+                        }
+                        return x;
+                    }).ToList();
                 });
-            }
-
-            //其他
-            data = data.Select(x =>
-            {
-                if (x.platform.Contains("万邑通") || x.platform.Contains("速卖通"))
-                {
-                    x.total = Math.Abs(x.total);
-                }
-                if (x.platform.Contains("易可达") && x.site.Contains("其他收入"))
-                {
-                    x.total = Math.Abs(x.total) * -1;
-                }
-                return x;
-            }).ToList();
+            } 
             return data.Sum(x => x.total);
         }
         /// <summary>
@@ -1175,7 +1168,7 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
                 sql.Append(@"select platform_type AS Platform,SUM(amount_refund_rmb) AS RefundRmb,
 SUM(amount_refund_usd) AS RefundUsd,Count(*) AS Totals
 from dc_base_crm_refund 
-where refund_time >= @start and refund_time < @end and shipping_status = 'TotalShipping' AND is_deleted = 0  AND is_freeze = 0  AND company_id = 1
+where refund_time >= @start and refund_time < @end and shipping_status in ('TotalShipping','PartShipping') AND is_deleted = 0  AND is_freeze = 0  AND company_id = 1
 group by platform_type ");
                 parameters.Add("start", start);
                 parameters.Add("end", end);
@@ -1185,14 +1178,14 @@ group by platform_type ");
             {
                 sql.Append($@"
 select sum(t1.amount_refund_rmb) AS RefundRmb,sum(t1.amount_refund_usd) AS RefundUsd from dc_base_crm_refund t1
-where t1.refund_time >= @start and t1.refund_time < @end and shipping_status = 'TotalShipping' AND is_deleted = 0  AND is_freeze = 0  AND company_id = 1");
+where t1.refund_time >= @start and t1.refund_time < @end and shipping_status in ('TotalShipping','PartShipping') AND is_deleted = 0  AND is_freeze = 0  AND company_id = 1");
             }
             else
             {
                 sql.Append($@"
 select t1.platform_type AS PlatformType, t1.bailun_account AS BailunAccount, t1.website AS WebSite, 
 t1.origin_order_id AS OriginOrderId, t1.amount_refund_rmb AS RefundRmb, t1.amount_refund_usd AS RefundUsd, t1.refund_time AS RefundTime from dc_base_crm_refund t1
-where t1.refund_time >= @start and t1.refund_time < @end and shipping_status = 'TotalShipping' AND is_deleted = 0  AND is_freeze = 0  AND company_id = 1");
+where t1.refund_time >= @start and t1.refund_time < @end and shipping_status in ('TotalShipping','PartShipping') AND is_deleted = 0  AND is_freeze = 0  AND company_id = 1");
             }
             parameters.Add("start", start);
             parameters.Add("end", end);