优化统计接口

Src/Entities/Analysis.cs

@@ -9,6 +9,22 @@ namespace Kivii.Finances.Entities
     [Api(Description = "分析")]
     public class Analysis
     {
+        public string Summary { get; set; }
+
+        public string Remark { get; set; }
+
+        public string OwnerName { get; set; }
+
+        public Guid OwnerKvid { get; set; }
+
+        public AnalysisType AnalysisType { get; set; }
+
+        public DateTime BeginTime { get; set; }
+
+        public DateTime EndTime { get; set; }
+
+        public string Type { get; set; }
+
         public decimal AmountPlan { get; set; }
 
         public decimal Amount { get; set; }
@@ -60,18 +76,6 @@ namespace Kivii.Finances.Entities
         public int QuantityUnpaid { get; set; }
 
         public int QuantityOffset { get; set; }
-
-        public AnalysisType AnalysisType { get; set; }
-
-        public DateTime BeginTime { get; set; }
-
-        public DateTime EndTime { get; set; }
-
-        public string Type  { get; set; }
-
-        public string Summary { get; set; }
-
-        public string Remark { get; set; }
     }
 
     /// <summary>

Src/Transforms/Statistics/RestfulPayment.Statistic.cs

@@ -93,7 +93,7 @@ namespace Kivii.Finances.Transforms
 
             var sqlExpress = conn.From<Payment>();
             sqlExpress.Where(o => o.OffsetKvid == Guid.Empty && Sql.In(o.Type, PaymentType.WeChat, PaymentType.Cash, PaymentType.AliPay, PaymentType.Pos, PaymentType.Split, PaymentType.Refund, PaymentType.UnBiz));
-            sqlExpress.And(o => o.OperateTime >= beginTime && o.OperateTime < endTime);
+            sqlExpress.And(o => o.CreateTime >= beginTime && o.CreateTime < endTime);
             if (!OwnerKvids.IsNullOrEmpty()) sqlExpress.And(o => Sql.In(o.OwnerKvid, OwnerKvids));
             sqlExpress.And(o => (Sql.In(o.PayerAccountKvid, queryAccount)));
             sqlExpress.OrderBy(o => o.OwnerName);

Src/Transforms/Statistics/RestfulSettlement.Statistic.cs

@@ -45,9 +45,11 @@ namespace Kivii.Finances.Transforms
             #region 如果是GroupByOwner的处理情况
             if (GroupByOwner)
             {
-                sqlExpress.GroupBy(o => o.OwnerName);
+                sqlExpress.GroupBy(o => new { o.OwnerName, o.OwnerKvid });
                 sqlExpress.Select(o => new
                 {
+                    OwnerKvid = o.OwnerKvid,
+                    OwnerName = o.OwnerName,
                     Summary = o.OwnerName,
                     Quantity = Sql.Count(o.Kvid),
                     Amount = Sql.Sum(o.Amount),
@@ -60,13 +62,14 @@ namespace Kivii.Finances.Transforms
                 rtns.BeginTime = BeginTime;
                 rtns.EndTime = EndTime;
                 if (rtns.Results.IsNullOrEmpty()) return rtns;
-                rtns.Total = rtns.Results.Sum(o => o.Quantity);
+                rtns.TotalQuantity = rtns.Results.Sum(o => o.Quantity);
                 rtns.TotalAmount = rtns.Results.Sum(o => o.Amount);
                 rtns.TotalAmountPayment = rtns.Results.Sum(o => o.AmountPayment);
                 rtns.TotalQuantityPayment = rtns.Results.Sum(o => o.QuantityPayment);
                 rtns.TotalAmountUnpaid = rtns.Results.Sum(o => o.AmountUnpaid);
                 rtns.TotalQuantityUnpaid = rtns.Results.Sum(o => o.QuantityUnpaid);
 
+                rtns.Total = rtns.Results.Count;
                 return rtns;
             }
             #endregion
@@ -105,6 +108,7 @@ namespace Kivii.Finances.Transforms
             }
             else rtns.Results.AddRange(results);
 
+            rtns.Total = rtns.Results.Count;
             return rtns;
         }
     }

Src/Transforms/Statistics/RestfulStatistic.cs

@@ -14,6 +14,9 @@ namespace Kivii.Finances.Transforms
         public DateTime BeginTime { get; set; }
 
         public DateTime EndTime { get; set; }
+        public string OwnerName { get; set; }
+
+        public Guid OwnerKvid { get; set; }
 
         public string Description { get; set; }
         public decimal TotalAmount { get; set; }