Merge branch 'glms/feature/1.4.2' of http://git.yiliantech.com/gitlab/otc-dev/zszq-trs into glms/feature/1.4.2

2026-06-25 19:44:10 +08:00
parent 2140a97f53 697c7babf2
commit 6662ae7e7e
3 changed files with 318 additions and 5 deletions
@@ -450,12 +450,14 @@ namespace YLErp.Modules.SwapModule
                    PayDate = dividendPayDate,
                    PositionId = eodPosi.PositionId,
                    UnderlyingCode = eodPosi.UnderlyingCode,
+                    UnderlyingInstrumentType = eodPosi.UnderlyingInstrumentType,
                    PayDirection = eodPosi.PosiDirection,
                    PositionType = eodPosi.PositionType,
                    PositionQty = eodPosi.PosiQuantity,
                    Quantity = 0,
                    ContractSize = eodPosi.ContractSize,
                    TradingAmountAvg = eodPosi.PosiNetPrice,
+                    TradingAmountNetAvg = eodPosi.PosiNetNoFeePrice,
                    PosiGrossPrice = eodPosi.PosiGrossPrice,
                    PosiNetPrice = eodPosi.PosiNetPrice,
                    MarkClosePnl = eodPosi.PosiDividendSum,