Merge branch 'njzjy' of http://git.kivii.org/neoturing/Kivii.Biz.Finances.V2.0 into njzjy

Src/Extensions/InvoiceApplyExtension.cs

@@ -101,19 +101,23 @@ namespace Kivii.Finances
                 }
                 if (payment.InvoiceTime != null)
                 {
-                    if (payment.AuditTime == null)
-                    {
-                        payment.AuditTime = payment.InvoiceTime;
+                    if (payment.InvoiceTime.Value > payment.OperateTime) payment.AuditTime = payment.InvoiceTime;
+                    else payment.AuditTime = payment.OperateTime;
                     payment.AddOnlyProperties(o => o.AuditTime);
-                    }
-                    else
-                    {
-                        if (payment.AuditTime.Value < payment.InvoiceTime.Value)
-                        {
-                            payment.AuditTime = payment.InvoiceTime;
-                            payment.AddOnlyProperties(o => o.AuditTime);
-                        }
-                    }
+
+                    //if (payment.AuditTime == null)
+                    //{
+                    //    payment.AuditTime = payment.InvoiceTime;
+                    //    payment.AddOnlyProperties(o => o.AuditTime);
+                    //}
+                    //else
+                    //{
+                    //    if (payment.AuditTime.Value < payment.InvoiceTime.Value)
+                    //    {
+                    //        payment.AuditTime = payment.InvoiceTime;
+                    //        payment.AddOnlyProperties(o => o.AuditTime);
+                    //    }
+                    //}
                 }
                 payment.AddOnlyProperties(o => o.AmountInvoice);
             }

Src/Extensions/PaymentExtension.cs

@@ -339,19 +339,26 @@ namespace Kivii.Finances
                 {
                     payment.InvoiceTime = invoiceTime;
                     payment.AddOnlyProperties(o => o.InvoiceTime);
-                    if (payment.AuditTime == null)
+                    if (payment.InvoiceTime != null)
                     {
-                        payment.AuditTime = invoiceTime;
+                        if (payment.InvoiceTime.Value > payment.OperateTime) payment.AuditTime = payment.InvoiceTime;
+                        else payment.AuditTime = payment.OperateTime;
                         payment.AddOnlyProperties(o => o.AuditTime);
                     }
-                    else
-                    {
-                        if (payment.AuditTime.Value < invoiceTime.Value)
-                        {
-                            payment.AuditTime = invoiceTime;
-                            payment.AddOnlyProperties(o => o.AuditTime);
-                        }
-                    }
+                    //if (payment.AuditTime == null)
+                    //{
+                    //    payment.AuditTime = invoiceTime;
+                    //    payment.AddOnlyProperties(o => o.AuditTime);
+                    //}
+                    //else
+                    //{
+
+                    //    if (payment.AuditTime.Value < invoiceTime.Value)
+                    //    {
+                    //        payment.AuditTime = invoiceTime;
+                    //        payment.AddOnlyProperties(o => o.AuditTime);
+                    //    }
+                    //}
                 }
                 conn.UpdateOnly(payment);
                 if (parentPayment != null) parentPayment.RecalculateAmountInvoice(conn);
@@ -716,7 +723,7 @@ namespace Kivii.Finances
             splitPayment.Category = category;
             //金额设置
             splitPayment.AuditorName = splitPayment.OperateTime.Year.ToString();
-            splitPayment.AuditTime = payment.OperateTime;
+
             splitPayment.Amount = amountSplit;
             splitPayment.AmountSplited = 0;
             splitPayment.AmountUsed = 0;
@@ -728,6 +735,12 @@ namespace Kivii.Finances
             //splitPayment.Summary = string.Empty;
             if (!remark.IsNullOrEmpty()) splitPayment.Remark += $"[认领备注: {remark}]";
             splitPayment.OperateTime = payment.OperateTime;
+            if (splitPayment.InvoiceTime != null)
+            {
+                if (splitPayment.InvoiceTime.Value > splitPayment.OperateTime) splitPayment.AuditTime = payment.InvoiceTime;
+                else splitPayment.AuditTime = payment.OperateTime;
+
+            }
             if (operatorKvid != null && operatorKvid.Value != Guid.Empty)
             {
                 splitPayment.OperatorName = operatorName;

Src/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2024.1150")]
-[assembly: AssemblyFileVersion("5.4.2024.1150")]
+[assembly: AssemblyVersion("5.4.2024.1250")]
+[assembly: AssemblyFileVersion("5.4.2024.1250")]