Commit c54a1981 by 陶然

优化到账认领方法,可自定义指定认领人信息

parent 4081df0d
......@@ -649,7 +649,7 @@ namespace Kivii.Finances
/// <param name="ownerKvid"></param>
/// <param name="ownerName"></param>
/// <returns></returns>
public static Payment BizSplit(this Payment payment, decimal amountSplit, string remark = null, Guid? ownerKvid = null, string ownerName = null, IDbConnection conn = null, string category = null)
public static Payment BizSplit(this Payment payment, decimal amountSplit, string remark = null, Guid? ownerKvid = null, string ownerName = null, IDbConnection conn = null, string category = null, Guid? operatorKvid = null, string operatorName = null)
{
payment.ThrowIfNull($"传入payment参数为空");
if (payment.Type != PaymentType.Bank) throw new Exception("非银行到账不可以认领!");
......@@ -704,8 +704,16 @@ namespace Kivii.Finances
//splitPayment.Summary = string.Empty;
if (!remark.IsNullOrEmpty()) splitPayment.Remark += $"[认领备注: {remark}]";
splitPayment.OperateTime = payment.OperateTime;
splitPayment.OperatorName = KiviiContext.CurrentMember.FullName;
splitPayment.OperatorKvid = KiviiContext.CurrentMember.Kvid;
if (operatorKvid != null && operatorKvid.Value != Guid.Empty)
{
splitPayment.OperatorName = operatorName;
splitPayment.OperatorKvid = operatorKvid.Value;
}
else
{
splitPayment.OperatorName = KiviiContext.CurrentMember.FullName;
splitPayment.OperatorKvid = KiviiContext.CurrentMember.Kvid;
}
//splitPayment.Status = 1;
#endregion
......
......@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2023.11230")]
[assembly: AssemblyFileVersion("5.4.2023.11230")]
[assembly: AssemblyVersion("5.4.2023.12130")]
[assembly: AssemblyFileVersion("5.4.2023.12130")]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment