[bybit-stream] fix, add CumRealisedPnl

rizer1980 · Oct 16, 2024 · 6fb1934 · 6fb1934
1 parent d82616f
commit 6fb1934
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/xchange-stream-bybit/src/main/java/dto/trade/BybitComplexPositionChanges.java b/xchange-stream-bybit/src/main/java/dto/trade/BybitComplexPositionChanges.java
@@ -10,7 +10,7 @@
 
 @Getter
 @Setter
-@ToString
+@ToString(callSuper = true)
 public class BybitComplexPositionChanges extends OpenPosition {
 
   private int positionIdx;
@@ -29,6 +29,7 @@ public class BybitComplexPositionChanges extends OpenPosition {
   private BigDecimal stopLoss;
   private BigDecimal trailingStop;
   private BigDecimal curRealisedPnl;
+  private BigDecimal cumRealisedPnl;
   private BigDecimal sessionAvgPrice; //USDC contract session avg price
   private String positionStatus;
   private int adlRankIndicator;
@@ -42,14 +43,15 @@ public class BybitComplexPositionChanges extends OpenPosition {
   public BybitComplexPositionChanges(Instrument instrument, Type type, BigDecimal size,
       BigDecimal liquidationPrice, BigDecimal unRealisedPnl,
       BigDecimal positionValue, BigDecimal entryPrice, BigDecimal leverage, BigDecimal takeProfit,
-      BigDecimal stopLoss, BigDecimal curRealisedPnl, long createdTime, long updatedTime,
+      BigDecimal stopLoss, BigDecimal curRealisedPnl, BigDecimal cumRealisedPnl,long createdTime, long updatedTime,
       long seq) {
     super(instrument, type, size, entryPrice, liquidationPrice, unRealisedPnl);
     this.positionValue = positionValue;
     this.leverage = leverage;
     this.takeProfit = takeProfit;
     this.stopLoss = stopLoss;
     this.curRealisedPnl = curRealisedPnl;
+    this.cumRealisedPnl = cumRealisedPnl;
     this.createdTime = createdTime;
     this.updatedTime = updatedTime;
     this.seq = seq;
@@ -80,6 +82,7 @@ public BybitComplexPositionChanges(BybitComplexPositionChanges changes) {
     this.stopLoss = changes.stopLoss;
     this.trailingStop = changes.trailingStop;
     this.curRealisedPnl = changes.curRealisedPnl;
+    this.cumRealisedPnl = changes.cumRealisedPnl;
     this.sessionAvgPrice = changes.sessionAvgPrice;
     this.positionStatus = changes.positionStatus;
     this.adlRankIndicator = changes.adlRankIndicator;
@@ -97,7 +100,7 @@ public BybitComplexPositionChanges(Instrument instrument, Type type, BigDecimal
       BigDecimal positionBalance, int autoAddMargin, BigDecimal positionMM, BigDecimal positionIM,
       BigDecimal bustPrice, BigDecimal positionValue, BigDecimal leverage,
       BigDecimal takeProfit, BigDecimal stopLoss, BigDecimal trailingStop,
-      BigDecimal curRealisedPnl,
+      BigDecimal curRealisedPnl,BigDecimal cumRealisedPnl,
       BigDecimal sessionAvgPrice, String positionStatus, int adlRankIndicator, boolean isReduceOnly,
       String mmrSysUpdatedTime, String leverageSysUpdatedTime, long createdTime, long updatedTime,
       long seq) {
@@ -118,6 +121,7 @@ public BybitComplexPositionChanges(Instrument instrument, Type type, BigDecimal
     this.stopLoss = stopLoss;
     this.trailingStop = trailingStop;
     this.curRealisedPnl = curRealisedPnl;
+    this.cumRealisedPnl = cumRealisedPnl;
     this.sessionAvgPrice = sessionAvgPrice;
     this.positionStatus = positionStatus;
     this.adlRankIndicator = adlRankIndicator;

diff --git a/xchange-stream-bybit/src/main/java/info/bitrich/xchangestream/bybit/BybitStreamAdapters.java b/xchange-stream-bybit/src/main/java/info/bitrich/xchangestream/bybit/BybitStreamAdapters.java
@@ -162,7 +162,7 @@ bustPrice, new BigDecimal(position.getPositionValue()),
           new BigDecimal(position.getLeverage()),
           new BigDecimal(position.getTakeProfit()), new BigDecimal(position.getStopLoss()),
           new BigDecimal(position.getTrailingStop()),
-          new BigDecimal(position.getCurRealisedPnl()),
+          new BigDecimal(position.getCurRealisedPnl()),new BigDecimal(position.getCumRealisedPnl()),
           sessionAvgPrice, position.getPositionStatus(),
           position.getAdlRankIndicator(), position.isReduceOnly(),
           position.getMmrSysUpdatedTime(), position.getLeverageSysUpdatedTime(),