调整现金流表的说明；解决财务付款金额和支出不一致的问题

Bailun.DC.DailyPayAndIncoming/Services.cs

@@ -70,7 +70,7 @@ namespace Bailun.DC.DailyPayAndIncoming
             //管理成本  广州百伦、香港百伦、电子服装厂、阳山仓、深圳仓的管理成本
             var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
-            var lgurl = "http://api.fee.bailuntec.com/purchase/other/cost/api/logisticsCostList?";
+            var lgurl = "http://api.fee.bailuntec.com/fee/api/cost/api/logisticsCostList?";
 
             url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
             cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.AddDays(-1).ToString("yyyy-MM-dd");
@@ -81,9 +81,8 @@ namespace Bailun.DC.DailyPayAndIncoming
             //管理成品
             var list = ListOtherCost(url);
             //物流费支出
-            var listlg = ListLogisticFee(url);
-
-
+            var listlg = ListLogisticFee(lgurl);
+            
             decimal costTotal = 0;
             costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB):0;
             
@@ -95,7 +94,7 @@ namespace Bailun.DC.DailyPayAndIncoming
             }
 
             //支出 物流费支出
-            if (listlg.Count() > 0)
+            if (listlg!=null && listlg.Count() > 0)
             {
                 costTotal += listlg.Sum(a => a.amountRmb);
             }
@@ -143,7 +142,7 @@ namespace Bailun.DC.DailyPayAndIncoming
             //管理成本  广州百伦、香港百伦、电子服装厂、阳山仓、深圳仓的管理成本
             var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
-            var lgurl = "http://api.fee.bailuntec.com/purchase/other/cost/api/logisticsCostList?";
+            var lgurl = "http://api.fee.bailuntec.com/fee/api/cost/api/logisticsCostList?";
 
             url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
             cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.AddDays(-1).ToString("yyyy-MM-dd");
@@ -154,18 +153,18 @@ namespace Bailun.DC.DailyPayAndIncoming
             //管理成品
             var list = ListOtherCost(url);
             //物流费支出
-            var listlg = ListLogisticFee(url);
+            var listlg = ListLogisticFee(lgurl);
 
             decimal costTotal = 0;
             costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB) : 0;
-            list = list.Where(a => a.companyValue == 1 || a.companyValue == 2 || a.companyValue == 5 || a.companyValue == 8 || a.companyValue == 7).ToList();
+            list = list.Where(a => a.companyName.Contains("广州歌戈儿生活科技有限公司") || a.companyValue == 5 || a.companyValue == 1 || a.companyValue == 3 || a.companyValue == 8 || a.companyValue == 2).ToList();
             if (list.Count > 0)
             {
                 costTotal += list.Sum(a => a.amountRmb);
             }
 
             //支出 物流费支出
-            if (listlg.Count() > 0)
+            if (listlg != null && listlg.Count() > 0)
             {
                 costTotal += listlg.Sum(a => a.amountRmb);
             }

Bailun.DC.HappenAmount/Services.cs

@@ -96,15 +96,21 @@ namespace Bailun.DC.HappenAmount
 
                 var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
                 var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
+                var lgurl = "http://api.fee.bailuntec.com/fee/api/cost/api/logisticsCostList?";
 
                 url += "&startDate=" + start.ToString("yyyy-MM-dd HH:mm:ss") + "&endDate=" + start.ToString("yyyy-MM-dd HH:mm:ss");
                 cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd HH:mm:ss") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd HH:mm:ss");
+                lgurl += "startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
 
                 //利息支出
                 var listInterest = new Bailun.DC.Services.FinanceReportServices().ListInterestExpense(cwurl);
 
                 //管理成本
                 var list = new Bailun.DC.Services.FinanceReportServices().ListOtherCost(url);
+                //物流费支出
+                var listlg = ListLogisticFee(lgurl);
+
+
 
                 var listFeeType = new List<string> { "推广费", "税费", "平台费用", "服务费", "其他" };
 
@@ -129,6 +135,13 @@ namespace Bailun.DC.HappenAmount
                     m.ac_amount_happen += listInterest.Sum(a => a.RepayInterestRMB);
                 }
 
+                //支出 物流费支出
+                if (listlg.Count() > 0)
+                {
+                    m.ac_amount_pay += listlg.Sum(a => a.amountRmb);
+                    m.ac_amount_happen += listlg.Sum(a => a.amountRmb);
+                }
+
                 #endregion
 
 
@@ -228,5 +241,26 @@ namespace Bailun.DC.HappenAmount
             }
 
         }
+
+        /// <summary>
+        /// 获取物流费列表
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public List<Models.Api.mLogisticFee> ListLogisticFee(string url)
+        {
+            var list = new List<Models.Api.mLogisticFee>();
+            var result = Common.HttpHelper.NetHelper.Request(url);
+            if (!string.IsNullOrEmpty(result))
+            {
+                var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<Models.Api.ListLogisticFee>(result);
+                if (obj != null)
+                {
+                    list = obj.data;
+                }
+            }
+
+            return list;
+        }
     }
 }

Bailun.DC.Web/Areas/Reports/Views/Finance/TotalIncomePay.cshtml

@@ -48,10 +48,10 @@
         <div class="alert alert-warning">
             取数说明：
             <br />
-            1、支出的取值：成品采购+半成品采购+百伦（广州、香港）支付给哈倪曼和拉古娜的费用+百伦的管理费<br />
+            1、支出的取值：成品采购+半成品采购+百伦（广州、香港）支付给哈倪曼和拉古娜的费用+百伦的管理费+物流费<br />
             2、收入的取值：当天提现到账的资金（已转换成CNY）<br />
             3、采购下单的取值：成品采购系统当天下单的采购金额<br />
-            4、财务付款的取值：当天支付给成品采购+半成品采购+百伦（广州、香港）支付给哈倪曼和拉古娜的费用+百伦的管理费<br />
+            4、财务付款的取值：当天支付给成品采购+半成品采购+百伦（广州、香港）支付给哈倪曼和拉古娜的费用+百伦的管理费+物流费<br />
             5、到货的取值：当天成品采购系统到货的总采购额<br />
             6、库存的取值：当天在库的库存金额<br />
             7、售出的取值：当天销售订单的产品成本<br />