feat:优化持仓处理

@@ -231,13 +231,13 @@ class CmBroker
                 $wsDataPos = WsDataPos::TransferBybitPos($value, $this->symbolInfos, function ($symbol) {
                 $wsDataPos = WsDataPos::TransferBybitPos($value, $this->symbolInfos, function ($symbol) {
                     return $this->getSymbolSt($symbol);
                     return $this->getSymbolSt($symbol);
                 });
                 });
-            }
                 if ($wsDataPos != null) {
                 if ($wsDataPos != null) {
                     $pos = Pos::transferWsDataPos($wsDataPos);
                     $pos = Pos::transferWsDataPos($wsDataPos);
                     $this->positions[$wsDataPos->symbol . "_" . $wsDataPos->posSide] = $pos;
                     $this->positions[$wsDataPos->symbol . "_" . $wsDataPos->posSide] = $pos;
                     $wsData = new WsData($this->plat, 'pos', $trade = null, $pos = $wsDataPos);
                     $wsData = new WsData($this->plat, 'pos', $trade = null, $pos = $wsDataPos);
                     $onData($wsData);
                     $onData($wsData);
                 }
                 }
+            }
             return;
             return;
         }
         }
     }
     }

@@ -79,7 +79,13 @@ class WsDataPos
         if ($symbolInfo === null) {
         if ($symbolInfo === null) {
             return null;
             return null;
         }
         }
-        $posSide = strtoupper($data['side']);
+        $posSide = "BOTH";
+        if ($data['positionIdx'] == 1) {
+            $posSide = "LONG";
+        }
+        if ($data['positionIdx'] == 2) {
+            $posSide = "SHORT";
+        }
         $qty = (float)$data['size'];
         $qty = (float)$data['size'];
         $lot = $qty;
         $lot = $qty;
         $avgPrice = (float)$data['entryPrice'];
         $avgPrice = (float)$data['entryPrice'];