feat:完成持仓频道

@@ -19,12 +19,12 @@ $restHost = "http://bgapi.keetu.com";
 $broker = new CmBroker(CmBroker::PLAT_BITGET, $apiInfo, $wsHost, $restHost);
 $broker = new CmBroker(CmBroker::PLAT_BITGET, $apiInfo, $wsHost, $restHost);
 
 
 output("开始监听");
 output("开始监听");
-// $broker->accListen(function (WsData $data) {
-//     if ($data->dataType == "order") {
-//         var_dump($data);
-//     }
-// });
-$broker->setLever("BTCUSDT", 20);
+$broker->accListen(function (WsData $data) {
+    if ($data->dataType == "pos") {
+        var_dump($data->pos->toArray());
+    }
+});
+// $broker->setLever("BTCUSDT", 20);
 // $broker->klineListen("BTCUSDT", "1m", function ($data) {
 // $broker->klineListen("BTCUSDT", "1m", function ($data) {
 //     output($data->toArray());
 //     output($data->toArray());
 // });
 // });

@@ -285,11 +285,9 @@ class CmBroker
             }
             }
         }
         }
 
 
-        // 处理账户和持仓数据
-        if (isset($data['arg']) && $data['arg']['channel'] == 'account') {
-            foreach ($data['data'] as $value) {
-                if (isset($value['positions'])) {
-                    foreach ($value['positions'] as $pos) {
+        // 处理持仓数据
+        if (isset($data['arg']) && $data['arg']['channel'] == 'positions') {
+            foreach ($data['data'] as $pos) {
                 $wsDataPos = WsDataPos::TransferBitgetPos($pos, $this->symbolInfos, function ($symbol) {
                 $wsDataPos = WsDataPos::TransferBitgetPos($pos, $this->symbolInfos, function ($symbol) {
                     return $this->getSymbolSt($symbol);
                     return $this->getSymbolSt($symbol);
                 });
                 });
@@ -299,8 +297,6 @@ class CmBroker
                     $onData($wsData);
                     $onData($wsData);
                 }
                 }
             }
             }
-                }
-            }
             return;
             return;
         }
         }
     }
     }

@@ -203,7 +203,6 @@ class WsDataOrder
     }
     }
     public static function TransferBitgetOrder(array $data, array $symbolInfos, callable $toSymbolSt): WsDataOrder|null
     public static function TransferBitgetOrder(array $data, array $symbolInfos, callable $toSymbolSt): WsDataOrder|null
     {
     {
-        var_dump($data);
         $symbol = call_user_func($toSymbolSt, $data['instId']);
         $symbol = call_user_func($toSymbolSt, $data['instId']);
         /** @var SymbolInfo $symbolInfo */
         /** @var SymbolInfo $symbolInfo */
         $symbolInfo = $symbolInfos[$symbol] ?? null;
         $symbolInfo = $symbolInfos[$symbol] ?? null;

@@ -73,6 +73,7 @@ class WsDataPos
     }
     }
     public static function TransferBybitPos($data, $symbolInfos, callable $toSymbolSt): WsDataPos|null
     public static function TransferBybitPos($data, $symbolInfos, callable $toSymbolSt): WsDataPos|null
     {
     {
+        var_dump($data);
         $symbol = call_user_func($toSymbolSt, $data['symbol']);
         $symbol = call_user_func($toSymbolSt, $data['symbol']);
         /** @var SymbolInfo $symbolInfo */
         /** @var SymbolInfo $symbolInfo */
         $symbolInfo = $symbolInfos[$symbol] ?? null;
         $symbolInfo = $symbolInfos[$symbol] ?? null;
@@ -94,21 +95,17 @@ class WsDataPos
     }
     }
     public static function TransferBitgetPos(array $data, array $symbolInfos, callable $toSymbolSt): WsDataPos|null
     public static function TransferBitgetPos(array $data, array $symbolInfos, callable $toSymbolSt): WsDataPos|null
     {
     {
-        $symbol = call_user_func($toSymbolSt, $data['symbol']);
+        $symbol = call_user_func($toSymbolSt, $data['instId']);
         /** @var SymbolInfo $symbolInfo */
         /** @var SymbolInfo $symbolInfo */
         $symbolInfo = $symbolInfos[$symbol] ?? null;
         $symbolInfo = $symbolInfos[$symbol] ?? null;
         if ($symbolInfo === null) {
         if ($symbolInfo === null) {
             return null;
             return null;
         }
         }
-
-        return new WsDataPos(
-            $symbol,
-            'BOTH',
-            (float)$data['total'],
-            (float)$data['total'],
-            (float)$data['averageOpenPrice'],
-            false,
-            (float)$data['unrealizedPL']
-        );
+        $posSide = strtoupper($data['holdSide']);
+        $qty = (float)$data['available'];
+        $lot = $qty;
+        $avgPrice = (float)$data['openPriceAvg'];
+        $pnl = (float)$data['unrealizedPL'];
+        return new WsDataPos($symbol, $posSide, $qty, $lot, $avgPrice, false, $pnl);
     }
     }
 }
 }