接口权限调整,新增作废后到账可删除功能

Src/Transforms/RestfulPayment.Accept.cs

@@ -10,7 +10,8 @@ using System.Threading.Tasks;
 namespace Kivii.Finances.Transforms
 {
     [Api(Description = "生成到账流水")]
-    [RequiresAnyRole(SystemRoles.Administrator,SystemRoles.Manager,SystemRoles.Configuration)]
+    //[RequiresAnyRole(SystemRoles.Administrator,SystemRoles.Manager,SystemRoles.Configuration)]
+    [RequiresAnyRole(SystemRoles.Everyone)]
     public class PaymentAccept : RestfulExecution<Payment>
     {
         public Payment Item { get; set; }

Src/Transforms/RestfulPayment.Offset.cs

@@ -3,6 +3,7 @@ using Kivii.Linq;
 using Kivii.Web;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,7 +11,8 @@ using System.Threading.Tasks;
 namespace Kivii.Finances.Transforms
 {
     [Api(Description = "到账冲账")]
-    [RequiresAnyRole(SystemRoles.Administrator, SystemRoles.Manager, SystemRoles.Configuration)]
+    //[RequiresAnyRole(SystemRoles.Administrator,SystemRoles.Manager,SystemRoles.Configuration)]
+    [RequiresAnyRole(SystemRoles.Everyone)]
     public class PaymentOffset : RestfulExecution<Payment>
     {
         public Guid Kvid { get; set; }
@@ -128,7 +130,8 @@ namespace Kivii.Finances.Transforms
     }
 
     [Api(Description = "到账冲账撤销")]
-    [RequiresAnyRole(SystemRoles.Administrator, SystemRoles.Manager, SystemRoles.Configuration)]
+    //[RequiresAnyRole(SystemRoles.Administrator,SystemRoles.Manager,SystemRoles.Configuration)]
+    [RequiresAnyRole(SystemRoles.Everyone)]
     public class PaymentOffsetCancel : RestfulExecution<Payment>
     {
         public Guid Kvid { get; set; }
@@ -199,4 +202,25 @@ namespace Kivii.Finances.Transforms
             return rtns;
         }
     }
+
+    [RequiresAnyRole(SystemRoles.Everyone)]
+    public class PaymentDelete : RestfulDelete<Payment>
+    {
+        /// <summary>
+        /// 只有作废了的到账才可以被删除
+        /// </summary>
+        /// <param name="req"></param>
+        /// <param name="res"></param>
+        /// <param name="dbConnection"></param>
+        /// <param name="rtns"></param>
+        /// <returns></returns>
+        public override bool OnPreRestfulDelete(IRequest req, IResponse res, IDbConnection dbConnection, IRestfulDeleteResponse<Payment> rtns)
+        {
+            var conn = KiviiContext.GetOpenedDbConnection<Payment>();
+            var payments = conn.SelectByIds<Payment>(Kvids);
+            payments.ThrowIfNullOrEmpty("收付款项不存在");
+            (payments.Exists(o => o.OffsetKvid == Guid.Empty)).ThrowIfTrue("收付款未冲账,无需撤销");
+            return base.OnPreRestfulDelete(req, res, dbConnection, rtns);
+        }
+    }
 }

Src/Transforms/RestfulStatistic.cs

@@ -396,8 +396,18 @@ namespace Kivii.Finances.Transforms
                 var group = results.GroupBy(o => o.OwnerName);
                 foreach (var kv in group)
                 {
+                    var summary = kv.Key;
+                    if (kv.Key == "Report") summary = "报告费";
+                    if (kv.Key == "Service") summary = "服务费";
+                    if (kv.Key == "Express") summary = "快递费";
+                    if (kv.Key == "Certificate") summary = "证书费";
+                    if (kv.Key == "Tag") summary = "挂签费";
+                    if (kv.Key == "SoftwareSupervision") summary = "软件监理费";
+                    if (kv.Key == "SoftwareCostEvaluation") summary = "软件造价评估费";
+                    if (kv.Key == "Authentication") summary = "认证费";
+                    if (kv.Key == "Train") summary = "培训费";
                     var rtn = new Settlement();
-                    rtn.Summary = kv.Key;
+                    rtn.Summary = summary;
                     rtn.Amount = kv.Sum(o => o.Amount);
                     rtn.AmountPayment = kv.Sum(o => o.AmountPayment);
                     rtn.AmountPlan = kv.Sum(o => o.AmountPlan);
@@ -410,8 +420,18 @@ namespace Kivii.Finances.Transforms
                 var group = results.GroupBy(o => o.Summary);
                 foreach (var kv in group)
                 {
+                    var summary = kv.Key;
+                    if (kv.Key == "Report") summary = "报告费";
+                    if (kv.Key == "Service") summary = "服务费";
+                    if (kv.Key == "Express") summary = "快递费";
+                    if (kv.Key == "Certificate") summary = "证书费";
+                    if (kv.Key == "Tag") summary = "挂签费";
+                    if (kv.Key == "SoftwareSupervision") summary = "软件监理费";
+                    if (kv.Key == "SoftwareCostEvaluation") summary = "软件造价评估费";
+                    if (kv.Key == "Authentication") summary = "认证费";
+                    if (kv.Key == "Train") summary = "培训费";
                     var rtn = new Settlement();
-                    rtn.Summary = kv.Key;
+                    rtn.Summary = summary;
                     rtn.Amount = kv.Sum(o => o.Amount);
                     rtn.AmountPayment = kv.Sum(o => o.AmountPayment);
                     rtn.AmountPlan = kv.Sum(o => o.AmountPlan);
@@ -424,7 +444,16 @@ namespace Kivii.Finances.Transforms
                 var group = results.GroupBy(o => o.Type);
                 foreach (var kv in group)
                 {
-                    var summary = kv.Key == "Report" ? "报告费" : (kv.Key == "Service" ? "服务费" : (kv.Key == "Express" ? "快递费" : kv.Key));
+                    var summary = kv.Key;
+                    if (kv.Key == "Report") summary = "报告费";
+                    if (kv.Key == "Service") summary = "服务费";
+                    if (kv.Key == "Express") summary = "快递费";
+                    if (kv.Key == "Certificate") summary = "证书费";
+                    if (kv.Key == "Tag") summary = "挂签费";
+                    if (kv.Key == "SoftwareSupervision") summary = "软件监理费";
+                    if (kv.Key == "SoftwareCostEvaluation") summary = "软件造价评估费";
+                    if (kv.Key == "Authentication") summary = "认证费";
+                    if (kv.Key == "Train") summary = "培训费";
                     var rtn = new Settlement();
                     rtn.Summary = summary;
                     rtn.Amount = kv.Sum(o => o.Amount);