From ec7a3e6d2bd050f89047079d2c1d71e8f51e0c47 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 12 Dec 2025 14:49:24 +0800
Subject: [PATCH] fix(okxNewPrice): 优化订单信息处理逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
index 3ec8a4e..bcf86be 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
@@ -6,16 +6,22 @@
 import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
 import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
 import com.xcong.excoin.modules.okxNewPrice.okxpi.MallUtils;
+import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
 import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
 import com.xcong.excoin.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author Administrator
  */
 @Slf4j
 public class OrderInfoWs {
+
+    public static  final Map<String,String> ORDERINFOWSMAP = new ConcurrentHashMap<>();
 
     public static final String ORDERINFOWS_CHANNEL = "orders";
 
@@ -80,15 +86,26 @@
                         accFillSz, avgPx,state
                 );
 
-                String clOrdIdStr = (String) redisUtils.get(TradeOrderWs.ORDERWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":clOrdId");
-                String stateStr = (String) redisUtils.get(TradeOrderWs.ORDERWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
+                String clOrdIdStr = TradeOrderWs.TRADEORDERWSMAP.get("clOrdId");
+                String stateStr = TradeOrderWs.TRADEORDERWSMAP.get("state");
                 if (
                         StrUtil.isNotBlank(clOrdIdStr)
                                 && clOrdId.equals(clOrdIdStr)
                                 && StrUtil.isNotBlank(stateStr)
                                 && state.equals(stateStr)
                 ){
-                    redisUtils.set(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state", OrderParamEnums.STATE_0.getValue(), 0);
+                    //记录成交均价
+                    WsMapBuild.saveStringToMap(ORDERINFOWSMAP, "orderPrice",avgPx);
+                    WsMapBuild.saveStringToMap(TradeOrderWs.TRADEORDERWSMAP, "state", CoinEnums.ORDER_LIVE.getCode());
+
+                    String outStr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.OUT.name());
+                    if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
+                        WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_3.getValue());
+                    }else{
+                        WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.STATE.name(), OrderParamEnums.STATE_1.getValue());
+                    }
+
+                    log.info("订单详情已完成: {}, 自定义编号: {}", CoinEnums.HE_YUE.getCode(), clOrdId);
                 }
             }
         } catch (Exception e) {

--
Gitblit v1.9.1