Merge branch 'master' of https://code.bailuntec.com/bltdc/DataCenter_Core2.1_20190520

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -772,43 +772,30 @@ from dc_base_finance_fee where cost_status=4 and (is_lend is null or is_lend=1 o
 or (is_lend=2 and cost_form=1)) and pay_time>= @start and pay_time< @end ");
             parameters.Add("start", start);
             parameters.Add("end", end);
-            if (feeName.Contains("其中：歌戈儿收入"))
-            {
-                sql.Append(" and company_name like '%歌戈儿%' and type_name in ('销售收入','收款') ");
-            }
-            else if (feeName.Contains("其中：其他收入"))
+
+            if (feeName.Contains("其中：其他收入"))
             {
                 sql.Append(" and type_name in ('其他收入','销售商品收入','利息收入') ");
             }
-            else if (feeName.Contains("广州歌戈儿生活科技有限公司"))
-            {
-                sql.Append(" and company_name like '%歌戈儿%' and type_name not in ('还款','收款','借款','销售收入') ");
-                return sql.ToString();
-            }
-            else if (feeName.Contains("香港百伦科技有限公司"))
+            else if (feeName.Contains("其中：歌戈儿收入"))
             {
-                sql.Append(" and company_name = @feeName and type_name not in ('物流费','销售费用/物流费','收款','销售收入') ");
-            }
-            else if (feeName.Contains("广州百伦供应链科技有限公司"))
-            {
-                sql.Append(" and company_name like '广州百伦供应链科技有限公司%' and type_name not in ('还款','收款','出口退税款') ");
-                return sql.ToString();
-            }
-            else if (feeName.Contains("电子服装仓"))
-            {
-                sql.Append(" and company_name = @feeName and type_name not in ('还款') ");
-            }
-            else if (feeName.Contains("阳山仓"))
-            {
-                sql.Append(" and company_name = @feeName and type_name not in ('收款') ");
-            }
-            else if (feeName.Contains("广州崇瑜信息技术咨询有限公司"))
-            {
-                sql.Append(" and company_name = @feeName and type_name not in ('服务费') ");
+                sql.Append(" and company_name like '%歌戈儿%' and type_name in ('销售收入','收款') ");
             }
             else
             {
-                sql.Append(" and company_name = @feeName ");
+                sql.Append(@" and type_name not in ('押金','还款','其他应付款-Amazon','其他收入','销售商品收入','借款','还款-货款','投资款','利息收入','出口退税款','服务费','销售收入','政府补助','收款','信息技术服务收入','个税返还','其他应付款-AMZ','代运营产品收入','广告托管收入','Creative收入') ");
+                if (feeName.Contains("广州歌戈儿生活科技有限公司"))
+                {
+                    sql.Append(" and company_name like '%歌戈儿%' ");
+                }
+                else if (feeName.Contains("广州百伦供应链科技有限公司"))
+                {
+                    sql.Append(" and company_name like '广州百伦供应链科技有限公司%' ");
+                }
+                else
+                {
+                    sql.Append(" and company_name = @feeName ");
+                }
             }
             parameters.Add("feeName", feeName);
             return sql.ToString();
@@ -2062,7 +2049,7 @@ AND platform_type = '{item.platform_type}' AND financecategoryname = '{item.fina
         /// <returns></returns>
         public CommonApiResponseDto<GetMonthStockWeightingOutputDto> GetMonthStockWeightingList(string bailunSku, string month, int page, int limit)
         {
-            var result = new CommonApiResponseDto<GetMonthStockWeightingOutputDto> { Data = new GetMonthStockWeightingOutputDto {  ExportDataTitle = new List<string>(), ExportCNTitle = new List<string>()} };
+            var result = new CommonApiResponseDto<GetMonthStockWeightingOutputDto> { Data = new GetMonthStockWeightingOutputDto { ExportDataTitle = new List<string>(), ExportCNTitle = new List<string>() } };
             if (string.IsNullOrWhiteSpace(month)) return result;
             var dateTime = Convert.ToDateTime(month + "-01");
             var dateNow = DateTime.Now.Date;
@@ -2321,7 +2308,7 @@ AND platform_type = '{item.platform_type}' AND financecategoryname = '{item.fina
         /// <returns></returns>
         public object GetMonthStockWeightingDetail(string sku, string month)
         {
-            var sqlStock = BuildMonthStockSql(sku, month,out DynamicParameters sqlStockParam);
+            var sqlStock = BuildMonthStockSql(sku, month, out DynamicParameters sqlStockParam);
 
             var purchase = GetMonthPurchaseDetail(sku, month);
             var stock = SimpleCRUD.Query<GetMonthStockWeightingSummaryDto>(sqlStock, sqlStockParam, GlobalConfig.ConnectionString).ToList();
@@ -2374,7 +2361,7 @@ AND platform_type = '{item.platform_type}' AND financecategoryname = '{item.fina
         /// <param name="sku"></param>
         /// <param name="month"></param>
         /// <returns></returns>
-        public List<AveragePrice> GetWeightedAveragePrice(List<string> sku,string month)
+        public List<AveragePrice> GetWeightedAveragePrice(List<string> sku, string month)
         {
             var skuStr = $"('{string.Join("','", sku)}')";
             var sql = $"select bailun_sku,weighted_average_price FROM dc_month_stock_weighting where weighted_month = '{month}' and bailun_sku in {skuStr} ";