fix

Bailun.DC.Models/WebApiModels/Attribute/ParentNameAttribute.cs

@@ -71,8 +71,8 @@ namespace Bailun.DC.Models.WebApiModels
         /// <summary>
         /// 
         /// </summary>
-        [Description("销售费用-税金")]
-        fee_sales_taxes = 5,
+        //[Description("销售费用-税金")]
+        //fee_sales_taxes = 5,
         /// <summary>
         /// 销售费用合计
         /// </summary>

Bailun.DC.Models/WebApiModels/MonthSalesProfitDto.cs

@@ -189,7 +189,7 @@ namespace Bailun.DC.Models.WebApiModels
         //[ParentName("付现销售费用", ParentNameEnum.fee_logistics_storage)]
         //public decimal fee_paycash_sales { get; set; }
 
-        [ParentName("销售费用-税金", ParentNameEnum.fee_sales_taxes)]
+        //[ParentName("销售费用-税金", ParentNameEnum.fee_sales_taxes)]
         public decimal? fee_sales_taxes { get; set; }//new
         /// <summary>
         /// 销售费用合计
@@ -295,6 +295,11 @@ namespace Bailun.DC.Models.WebApiModels
         /// </summary>
         [ParentName("其中：歌戈儿收入", ParentNameEnum.profit)]
         public decimal incoming_gogirl { get; set; }
+        /// <summary>
+        /// 加：歌戈尔收入
+        /// </summary>
+        [ParentName("其中：其他收入", ParentNameEnum.profit)]
+        public decimal among_other_income { get; set; }
 
         /// <summary>
         /// 加：营业外收入

Bailun.DC.Models/dc_month_sales_profit_v2.cs

@@ -317,5 +317,9 @@ namespace Bailun.DC.Models
         /// 广州崇瑜信息技术咨询有限公司
         /// </summary>
         public decimal managercost_gzcy { get; set; }//new
+        /// <summary>
+        /// 其中：其他收入
+        /// </summary>
+        public decimal among_other_income { get; set; }//new
     }
 }

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -647,6 +647,7 @@ SUM(t1.amount_sales * t1.seller_order_exchange_rate * t1.quantity_shipped) AS to
                         managercost_ys = 0,
                         managercost_gzlk = 0,
                         managercost_gzcy = 0,
+                        among_other_income = 0,
                     };
                 }
                 var type = obj.GetType();
@@ -771,6 +772,10 @@ or (is_lend=2 and cost_form=1)) and pay_time>= @start and pay_time< @end ");
             {
                 sql.Append(" and company_name like '%歌戈儿%' and type_name not in ('销售收入','收款') ");
             }
+            else if(feeName.Contains("其中：其他收入"))
+            {
+                sql.Append(" and type_name not in ('其他收入','销售商品收入','利息收入') ");
+            }
             else if (feeName.Contains("广州歌戈儿生活科技有限公司"))
             {
                 sql.Append(" and company_name like '%歌戈儿%' and type_name not in ('还款','收款','借款','销售收入') ");
@@ -778,7 +783,7 @@ or (is_lend=2 and cost_form=1)) and pay_time>= @start and pay_time< @end ");
             }
             else if (feeName.Contains("香港百伦科技有限公司"))
             {
-                sql.Append(" and company_name = @feeName and type_name not in ('物流费','销售费用/物流费','收款') ");
+                sql.Append(" and company_name = @feeName and type_name not in ('物流费','销售费用/物流费','收款','销售收入') ");
             }
             else if (feeName.Contains("广州百伦供应链科技有限公司"))
             {
@@ -1239,13 +1244,16 @@ AND financecategoryname LIKE '{financecategory.Replace("产品", "")}%' ";
                         .Where(m => m.AmountValRmb != null).Sum(x => x.AmountValRmb.Value), 2)) * (-1);
 
                     //销售费用-税金
-                    oldData.fee_sales_taxes = Math.Abs(Math.Round(ExportMonthProfitFeePlatformFeeDetail(
-                        new GetMonthProfitPlatformDetailInput { Month = time, FeeName = "税金" })
-                        .Where(m => m.AmountValRmb != null).Sum(x => x.AmountValRmb.Value), 2)) * (-1);
+                    //oldData.fee_sales_taxes = Math.Abs(Math.Round(ExportMonthProfitFeePlatformFeeDetail(
+                    //    new GetMonthProfitPlatformDetailInput { Month = time, FeeName = "税金" })
+                    //    .Where(m => m.AmountValRmb != null).Sum(x => x.AmountValRmb.Value), 2)) * (-1);
                     //其中：歌戈儿收入
                     var operating = GetMonthProfitFeeManagementCostDetail(time, "其中：歌戈儿收入").Data;
                     oldData.incoming_gogirl = Math.Round(operating.Count == 0 ? 0 : operating.Last().AmountRmb.Value, 2);
+                    //其中：其他收入
 
+                    var among_other = GetMonthProfitFeeManagementCostDetail(time, "其中：其他收入").Data;
+                    oldData.among_other_income = Math.Round(among_other.Count == 0 ? 0 : among_other.Last().AmountRmb.Value, 2);
                     //管理成本
                     var bl_xg = GetMonthProfitFeeManagementCostDetail(time, "香港百伦科技有限公司").Data;
                     var bl_gz = GetMonthProfitFeeManagementCostDetail(time, "广州百伦供应链科技有限公司").Data;