Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/zs_v1.3_0822' into feature/zs_v1.3_risk

Browse Source
This commit is contained in:
yexuzhong
2025-09-12 09:31:36 +08:00
parent 134ae985f7 2b418eb9db
commit 98e41afec4
37 changed files with 841 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs
+49 -1
View File
@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using DocumentFormat.OpenXml.Drawing.Charts;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using NPOI.SS.UserModel;
using Org.BouncyCastle.Asn1.Ocsp;
@@ -525,6 +526,53 @@ namespace YLErp.Modules.EodModule.SettlementModule
fundObject.OtherFund.Add(clientEntryexit.CurrencyCode, clientEntryexit.Money ?? 0);
}
}
else if (clientEntryexit.Direction.Equals("划转")) {
if (clientEntryexit.TransferOutAccount == "初保账户")
{
AddToFund(fundObject.InFund, clientEntryexit.CurrencyCode, -clientEntryexit.Money ?? 0);
// 更新 NetFund
AddToFund(fundObject.NetFund, clientEntryexit.CurrencyCode, -clientEntryexit.Money ?? 0);
if (clientEntryexit.TransferInAccount == "追保账户")
{
AddToFund(fundObject.VmInFund, clientEntryexit.CurrencyCode, clientEntryexit.Money ?? 0);
}
else
{
WinLoss += clientEntryexit.Money ?? 0;
CurrChangeAmount += clientEntryexit.Money ?? 0;
}
}
else if (clientEntryexit.TransferOutAccount == "追保账户")
{
AddToFund(fundObject.VmInFund, clientEntryexit.CurrencyCode, -clientEntryexit.Money ?? 0);
if (clientEntryexit.TransferInAccount == "初保账户")
{
AddToFund(fundObject.InFund, clientEntryexit.CurrencyCode, clientEntryexit.Money ?? 0);
// 更新 NetFund
AddToFund(fundObject.NetFund, clientEntryexit.CurrencyCode, clientEntryexit.Money ?? 0);
}
else
{
WinLoss += clientEntryexit.Money ?? 0;
CurrChangeAmount += clientEntryexit.Money ?? 0;
}
}
else
{
WinLoss -= clientEntryexit.Money ?? 0;
CurrChangeAmount -= clientEntryexit.Money ?? 0;
if (clientEntryexit.TransferInAccount == "初保账户")
{
AddToFund(fundObject.InFund, clientEntryexit.CurrencyCode, clientEntryexit.Money ?? 0);
// 更新 NetFund
AddToFund(fundObject.NetFund, clientEntryexit.CurrencyCode, clientEntryexit.Money ?? 0);
}
else
{
AddToFund(fundObject.VmInFund, clientEntryexit.CurrencyCode, clientEntryexit.Money ?? 0);
}
}
}
else
{
if (ClientCashInCashOut.系统操作_期权费.Equals(clientEntryexit.Action))