From 365711b5ff1d1495316cf074de0b2904109612e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <Jinlin.Wang@cicc.com.cn>
Date: Thu, 2 Jul 2026 13:02:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BA=92=E6=8D=A2=E5=88=86?=
 =?UTF-8?q?=E7=BA=A2=E6=97=B6=EF=BC=8C=E6=9C=9F=E6=9C=AB=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=85=A8=E4=BB=B7=E4=BD=BF=E7=94=A8PosiGrossPrice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs | 2 +-
 YLErpWeb/Views/SwapTrade2/TradeView.cshtml            | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
index 454b5a5c..e5334b3d 100644
--- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
@@ -599,7 +599,7 @@ namespace YLErp.Modules.SwapModule
                     PositionQty = eodPosi.PosiQuantity,
                     Quantity = 0,
                     ContractSize = eodPosi.ContractSize,
-                    TradingAmountAvg = eodPosi.PosiNetPrice,
+                    TradingAmountAvg = eodPosi.PosiGrossPrice,
                     TradingAmountNetAvg = eodPosi.PosiNetNoFeePrice,
                     PosiGrossPrice = eodPosi.PosiGrossPrice,
                     PosiNetPrice = eodPosi.PosiNetPrice,
diff --git a/YLErpWeb/Views/SwapTrade2/TradeView.cshtml b/YLErpWeb/Views/SwapTrade2/TradeView.cshtml
index 979dfd6c..310b7897 100644
--- a/YLErpWeb/Views/SwapTrade2/TradeView.cshtml
+++ b/YLErpWeb/Views/SwapTrade2/TradeView.cshtml
@@ -71,18 +71,21 @@
                         <a class="nav-link" href="#terminationInfo" data-toggle="tab">提前终止</a>
                     </li>
                 }
+                
                 @if (swap_deals.Count > 0)
                 {
                     <li class="nav-item">
                         <a class="nav-link" href="#swapInfo" data-toggle="tab">互换</a>
                     </li>
                 }
+                
                 @if (trade.ClientCashInCashOutList.Count > 0)
                 {
                     <li class="nav-item">
                         <a class="nav-link" href="#ClientCashinCashout" data-toggle="tab">资金记录</a>
                     </li>
                 }
+            
             </ul>
         </div>
         <div class="tab-content">
@@ -820,6 +823,7 @@
                     }
                 </div>
             }
+            
             @if (!singleTrade && closeSwapDeals.Count > 0)
             {
                 var index = 1;
@@ -849,6 +853,7 @@
                     }
                 </div>
             }
+            
             @if (swap_deals.Count > 0)
             {
                 var index = 1;
@@ -919,6 +924,7 @@
                                             </div>
                                         </div>
                                     }
+                                    
                                     @if (swapInterests.Count > 0)
                                     {
                                         <div class="row no-gutters" style="display:block;">
@@ -1014,6 +1020,7 @@
                     }
                 </div>
             }
+            
             @if (trade.ClientCashInCashOutList.Count > 0)
             {
                 <div id="ClientCashinCashout" class="tab-pane">
@@ -1048,6 +1055,7 @@
                     </table>
                 </div>
             }
+        
         </div>
     </div>