增加跨境现金流报表

Bailun.DC.HappenAmount/Program.cs

@@ -21,7 +21,7 @@ namespace Bailun.DC.HappenAmount
         //static void Main(string[] args)
         //{
         //    var start = DateTime.Parse("2019-09-01");
-        //    while (start < DateTime.Now)
+        //    while (start.AddDay(1) < DateTime.Now)
         //    {
         //        new Services().Init(start, start.AddDays(1));
         //        start = start.AddDays(1);

Bailun.DC.Services/FinanceReportServices.cs

@@ -3118,6 +3118,54 @@ group by currency";
 
         #endregion
 
+        #region
 
+        /// <summary>
+        /// 每日总收支明细
+        /// </summary>
+        /// <param name="start">开始日期</param>
+        /// <param name="end">结束日期</param>
+        /// <returns></returns>
+        public List<dc_daily_pay_income> ListDailyPayIncoming(DateTime start, DateTime end)
+        {
+            var sql = $"select * from dc_daily_pay_income where record_time>='{start.ToString("yyyy-MM-dd")}' and record_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' order by record_time desc";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.Query<dc_daily_pay_income>(sql);
+
+                return obj.ToList();
+            }
+        }
+
+        /// <summary>
+        /// 每日现金流动态分析明细
+        /// </summary>
+        /// <param name="start">开始日期</param>
+        /// <param name="end">结束日期</param>
+        /// <returns></returns>
+        public List<dc_daily_companymoneystatus> ListDailyCompanyMoney(DateTime start, DateTime end)
+        {
+            var sql = $"select * from dc_daily_companymoneystatus where record_time>='{start.ToString("yyyy-MM-dd")}' and record_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}' order by record_time desc";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.Query<dc_daily_companymoneystatus>(sql);
+
+                return obj.ToList();
+            }
+        }
+
+        #endregion
     }
 }

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

@@ -5051,6 +5051,143 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
         #endregion
 
+        #region 跨境电商现金流
+
+        /// <summary>
+        /// 总收支报表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult TotalIncomePay()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 总收支报表Json
+        /// </summary>
+        /// <param name="start">开始日期</param>
+        /// <param name="end">结束日期</param>
+        /// <returns></returns>
+        [BailunAuthentication(LoginMode.Enforce)]
+        [HttpPost]
+        public JsonResult TotalIncomePayJson(DateTime start,DateTime end)
+        {
+            try
+            {
+                var _service = new Services.FinanceReportServices();
+                var obj = _service.ListDailyPayIncoming(start, end);
+
+                return Json(new {
+                    success = true,
+                    list = obj.Select(p => new {
+                        amount_income = p.amount_income.ToString("N2"),
+                        amount_payed = p.amount_payed.ToString("N2"),
+                        record_time = p.record_time.ToString("yyyy-MM-dd")
+                    }),
+                    msg = "",
+                    countpayed = (obj.Count>0?obj.Sum(a=>a.amount_payed):0).ToString("N2"),
+                    countincoming = (obj.Count>0?obj.Sum(a=>a.amount_income):0).ToString("N2")
+                });
+            }
+            catch (Exception ex)
+            {
+                return Json(new
+                {
+                    success = false,
+                    msg = "出现异常，异常信息："+ex.Message,
+
+                });
+            }
+        }
+
+        /// <summary>
+        /// 现金流动态分析明细
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ListDailyCompanyMoney()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 现金流动态分析明细
+        /// </summary>
+        /// <param name="start">开始日期</param>
+        /// <param name="end">结束日期</param>
+        /// <returns></returns>
+        [BailunAuthentication(LoginMode.Enforce)]
+        [HttpPost]
+        public JsonResult ListDailyCompanyMoneyJson(DateTime start, DateTime end)
+        {
+            try
+            {
+                var _service = new Services.FinanceReportServices();
+                var obj = _service.ListDailyCompanyMoney(start, end);
+
+                var m = new dc_daily_companymoneystatus() {
+                    amount_arrivaled = 0,
+                    amount_incoming = 0,
+                    amount_payed = 0,
+                    amount_purchase = 0,
+                    amount_receivable = 0,
+                    amount_sale = 0,
+                    amount_stock = 0,
+                    amount_withdrawonway = 0,
+                };
+
+                if (obj.Count > 0)
+                {
+                    m.amount_arrivaled = obj.Sum(a => a.amount_arrivaled);
+                    m.amount_incoming = obj.Sum(a => a.amount_incoming);
+                    m.amount_payed = obj.Sum(a => a.amount_payed);
+                    m.amount_purchase = obj.Sum(a => a.amount_purchase);
+                    m.amount_receivable = obj.Sum(a => a.amount_receivable);
+                    m.amount_sale = obj.Sum(a => a.amount_sale);
+                    m.amount_stock = obj.Sum(a => a.amount_stock);
+                    m.amount_withdrawonway = obj.Sum(a => a.amount_withdrawonway);
+                }
+
+                return Json(new
+                {
+                    success = true,
+                    list = obj.Select(p=>new {
+                        amount_arrivaled = p.amount_arrivaled.ToString("N2"),
+                        amount_incoming = p.amount_incoming.ToString("N2"),
+                        amount_payed = p.amount_payed.ToString("N2"),
+                        amount_purchase = p.amount_purchase.ToString("N2"),
+                        amount_receivable = p.amount_receivable.ToString("N2"),
+                        amount_sale = p.amount_sale.ToString("N2"),
+                        amount_stock = p.amount_stock.ToString("N2"),
+                        amount_withdrawonway = p.amount_withdrawonway.ToString("N2"),
+                        record_time = p.record_time.ToString("yyyy-MM-dd")
+                    }),
+                    msg = "",
+                    count = new {
+                        amount_arrivaled = m.amount_arrivaled.ToString("N2"),
+                        amount_incoming = m.amount_incoming.ToString("N2"),
+                        amount_payed = m.amount_payed.ToString("N2"),
+                        amount_purchase = m.amount_purchase.ToString("N2"),
+                        amount_receivable = m.amount_receivable.ToString("N2"),
+                        amount_sale = m.amount_sale.ToString("N2"),
+                        amount_stock = m.amount_stock.ToString("N2"),
+                        amount_withdrawonway = m.amount_withdrawonway.ToString("N2"),
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                return Json(new
+                {
+                    success = false,
+                    msg = "出现异常，异常信息：" + ex.Message,
+
+                });
+            }
+        }
+
+        #endregion
+
+
     }
 
     class mHappenAmount {

Bailun.DC.sln

@@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.LogicWareHouse",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.SkuProfitService", "Bailun.DC.SkuProfitService\Bailun.DC.SkuProfitService.csproj", "{91F08169-1D64-479B-B877-88FCBDDDE90B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.SkuDataWareHouse", "Bailun.DC.SkuDataWareHouse\Bailun.DC.SkuDataWareHouse.csproj", "{FAB2A012-44D0-42D0-9EAD-1798D8332B66}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.SkuDailyPurchaseAndSales", "Bailun.DC.SkuDailyPurchaseAndSales\Bailun.DC.SkuDailyPurchaseAndSales.csproj", "{DD391409-2440-4332-8400-BE44A5140D89}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.HappenAmount", "Bailun.DC.HappenAmount\Bailun.DC.HappenAmount.csproj", "{D47B1C2E-BD79-4D41-87E0-D7749F65371E}"
@@ -85,10 +83,6 @@ Global
 		{91F08169-1D64-479B-B877-88FCBDDDE90B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91F08169-1D64-479B-B877-88FCBDDDE90B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91F08169-1D64-479B-B877-88FCBDDDE90B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAB2A012-44D0-42D0-9EAD-1798D8332B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAB2A012-44D0-42D0-9EAD-1798D8332B66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAB2A012-44D0-42D0-9EAD-1798D8332B66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAB2A012-44D0-42D0-9EAD-1798D8332B66}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD391409-2440-4332-8400-BE44A5140D89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD391409-2440-4332-8400-BE44A5140D89}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD391409-2440-4332-8400-BE44A5140D89}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -111,7 +105,6 @@ Global
 		{121E5FDF-0CE9-46A3-BE01-D638B7275213} = {AE2CE86A-8538-4142-920F-684DCF47C064}
 		{75782F98-28B6-4618-BAF2-56C68846CC92} = {AE2CE86A-8538-4142-920F-684DCF47C064}
 		{91F08169-1D64-479B-B877-88FCBDDDE90B} = {AE2CE86A-8538-4142-920F-684DCF47C064}
-		{FAB2A012-44D0-42D0-9EAD-1798D8332B66} = {AE2CE86A-8538-4142-920F-684DCF47C064}
 		{DD391409-2440-4332-8400-BE44A5140D89} = {AE2CE86A-8538-4142-920F-684DCF47C064}
 		{D47B1C2E-BD79-4D41-87E0-D7749F65371E} = {AE2CE86A-8538-4142-920F-684DCF47C064}
 		{D65CA330-DB1E-4B55-AFFA-5CC02518AB28} = {AE2CE86A-8538-4142-920F-684DCF47C064}