应收账款明细合计加上期初和期末

Bailun.DC.Services/FinanceReportServices.cs

@@ -4564,6 +4564,52 @@ group by currency";
         }
 
         /// <summary>
+        /// 获取应收账款的期初和期末合计
+        /// </summary>
+        /// <param name="platform"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public dc_daily_receivable ListReceivableStartEnd(string platform, DateTime start, DateTime end, int type)
+        {
+            var sqlparam = new DynamicParameters();
+            var sql = $@"select sum(amount_start) amount_start from dc_daily_receivable where 1=1 ";
+
+            if (!string.IsNullOrEmpty(platform))
+            {
+                sql += " and platform=@platform";
+                sqlparam.Add("platform", platform);
+            }
+
+            if (type == 1)  //Ebay
+            {
+                sql += " and platform='Ebay'";
+            }
+            else if (type == 2) //非Ebay
+            {
+                sql += " and platform!='Ebay'";
+            }
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var amount_start = cn.QueryFirstOrDefault<decimal?>(sql+" and day='"+start.ToString("yyyy-MM-dd")+"'", sqlparam)??0;
+                var amount_end = cn.QueryFirstOrDefault<decimal?>(sql + " and day='" + end.ToString("yyyy-MM-dd") + "'", sqlparam)??0;
+
+                return new dc_daily_receivable {
+                    amount_start = amount_start,
+                    amount_end = amount_end
+                };
+            }
+
+        }
+
+        /// <summary>
         /// 修改应收款其他金额
         /// </summary>
         /// <param name="id"></param>

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

@@ -6099,13 +6099,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             var objCount = _service.ListReceivableCount(platform, start, end,type);
 
+            var objStartEnd = _service.ListReceivableStartEnd(platform, start, end, type);
+            
             return JsonConvert.SerializeObject(new {
                 total = list.Count(),
                 rows = list,
                 count_row = new
                 {
                     platform="合计",
-                    amount_end = objCount.amount_end.ToString("N2"),
+                    amount_end = objStartEnd.amount_end.ToString("N2"),
                     amount_incoming = objCount.amount_incoming.ToString("N2"),
                     amount_other = objCount.amount_other.ToString("N2"),
                     amount_platformfee = objCount.amount_platformfee.ToString("N2"),
@@ -6113,7 +6115,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     amount_sale_pay = objCount.amount_sale_pay.ToString("N2"),
                     amount_sale_shipping = objCount.amount_sale_shipping.ToString("N2"),
                     amount_shipping = objCount.amount_shipping.ToString("N2"),
-                    amount_start = objCount.amount_start.ToString("N2"),
+                    amount_start = objStartEnd.amount_start.ToString("N2"),
                 }
             });