From 4e5d09d0f21ae177cc444144a9bb01a0e8c96f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= <wufanghai@ylkj7.wecom.work>
Date: Fri, 30 May 2025 14:59:28 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../App_Docs/结算单/非DMA结算单.xlsx          | Bin 10378 -> 10445 bytes
 .../TradeSettleBillGenerator.cs               |   4 ++--
 .../Modules/SwapModule/SwapDealService.cs     |   2 +-
 .../SwapModule/SwapTradeAutoService.cs        |   2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx b/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx
index f5e2a2fc2b394aed30f57d96412d33f71b5fb543..2cf6a553190a988bc29368ba950ad764186abc5b 100644
GIT binary patch
delta 4160
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

delta 4096
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
LIdSVb{vrGia&3g0

diff --git a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeSettleBillGenerator.cs b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeSettleBillGenerator.cs
index 06d52fa3..0536d73d 100644
--- a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeSettleBillGenerator.cs
+++ b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeSettleBillGenerator.cs
@@ -65,13 +65,13 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator
                     payDate = QdpCalendarHelper.GetNonHoliday(flowEventGroup.EventDate.AddDays(sr)); 
                 }
                 row.PayDate = payDate.Value.ToString("yyyy-MM-dd");
-                row.ClosePrice = ((flowEventGroup.TradingAmountAvg) * 100).OtcFormat(OtcFormatFlag.umprice);
+                row.ClosePrice = ((flowEventGroup.TradingAmountAvg) * 100).ToString("0.00000000");
                 decimal interestRate = unwindFlowEvents.Where(x => ConsTrade.InterestModels.Contains(x.InterestMode)).Sum(s => s.InterestRate);
                 row.InterestRate = interestRate.ToString("0.00%");
                 var PosiNotionalValue = flowEventGroup.Quantity * flowEventGroup.ContractSize* posi.PosiGrossPrice;
                 row.Quantity=  flowEventGroup.Quantity.ToString("0.00");
                 row.PosiNotionalValue = PosiNotionalValue.ToString("0.00");
-                row.PosiNetPrice = (posi.PosiGrossPrice * 100).OtcFormat(OtcFormatFlag.umprice);
+                row.PosiNetPrice = (posi.PosiGrossPrice * 100).ToString("0.00000000");
                 //var tradingFee = (flowEventGroup.TradingAmountFeeAvg- posi.PosiNetPrice- flowEventGroup.TradingAmountAvg+ posi.PosiGrossPrice)* PosiNotionalValue* ratio;
                 var tradingFee = flowEventGroup.TradingFee + flowEventGroup.TradingFeePending;
                 row.Fee = (-tradingFee).ToString("0.00");
diff --git a/YLErpDAL/Modules/SwapModule/SwapDealService.cs b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
index 7e731add..d14a007d 100644
--- a/YLErpDAL/Modules/SwapModule/SwapDealService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
@@ -877,7 +877,7 @@ namespace YLErp.Modules.SwapModule
                 floatEvent.TradingAmountNetFeeAvg = unwindNetFee;
                 floatEvent.TradingAmountNetAvg = unwindNet;
                 floatEvent.TradingFeePending = position.PosiTradingFeePending * unwindData.ClosePercent;
-                floatEvent.TradingFeePending = Math.Round(floatEvent.TradingFeePending, 2, MidpointRounding.AwayFromZero);
+                floatEvent.TradingFeePending = Math.Round(floatEvent.TradingFeePending, 4, MidpointRounding.AwayFromZero);
                 floatEvent.TradingFee = closeFee;
                 floatEvent.MarkClosePnl = (unwindPrice - position.PosiGrossPrice) * unwindQty * floatRatio * longRatio;
                 floatEvent.MarkClosePnl = Math.Round(floatEvent.MarkClosePnl + ((floatEvent.TradingFeePending+ closeFee) * floatRatio * -1), ConsGlobal.MoneyRound, MidpointRounding.AwayFromZero);
diff --git a/YLErpDAL/Modules/SwapModule/SwapTradeAutoService.cs b/YLErpDAL/Modules/SwapModule/SwapTradeAutoService.cs
index 90eddc20..733ce93b 100644
--- a/YLErpDAL/Modules/SwapModule/SwapTradeAutoService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapTradeAutoService.cs
@@ -698,6 +698,7 @@ namespace YLErp.Modules.SwapModule
                     }
                     flowMergeClone.TradingAmount = Math.Abs(amount);
                     flowMergeClone.TradingFeePending = flowMergeClone.TradingFeePending * qtyAbs / flowMergeClone.TradingQty;//剩余后付费用
+                    flowMergeClone.TradingFeePending = Math.Round(flowMergeClone.TradingFeePending, 4, MidpointRounding.AwayFromZero);
                     flowMergeClone.TradingQty = qtyAbs;
                     if (qty > 0)//交易有剩余新开仓
                     {
@@ -1333,6 +1334,7 @@ namespace YLErp.Modules.SwapModule
                 var newQtyAbs = Math.Abs(newQty);
                 flowMerge.SwapTradeNo = td.TradeNumber;
                 var unwindFee= newQty>0? flowMerge.TradingFeePending: flowMerge.TradingFeePending* floatPosition.PosiQuantity / flowMerge.TradingQty;
+                unwindFee = Math.Round(unwindFee, 4, MidpointRounding.AwayFromZero);
                 // 全平
                 new SwapDealService(UserInfo).AuotoSwapUnwind(td.id,
                     flowMerge.TradingAmountAvg,