From 0d02a8962f5a4ac7315964fcb9f42159e49884e4 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 17 May 2022 23:42:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Spot/D21OrderPublishBusiness.cs | 22 ++++++++++++------- .../Spot/BinanceSpotOrderWebSocketClient.cs | 5 +++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs b/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs index ba683cb..ba6bd25 100644 --- a/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs +++ b/Binance.TradeRobot.Business/Business/OrderPublishBusiness/Spot/D21OrderPublishBusiness.cs @@ -40,7 +40,15 @@ namespace Binance.TradeRobot.Business if (spotOrderPublishInfo.SpotOrderState == Enums.SpotOrderState.Rejected || spotOrderPublishInfo.SpotOrderState == Enums.SpotOrderState.Expired) { - + logList.Add(new ExecutionLog() + { + Id = idGenerator.NewLong(), + CreateTime = DateTime.Now, + OrderId = spotOrderPublishInfo.OrderId, + RobotId = spotOrderPublishInfo.RobotId, + SourceSingal = Enums.SingalType.订单推送, + Content = $"收到订单推送,订单号:{spotOrderPublishInfo.OrderId},订单方向:{spotOrderPublishInfo.TradeDirection},订单类型:{spotOrderPublishInfo.OrderType},订单状态:{spotOrderPublishInfo.SpotOrderState}{(spotOrderPublishInfo.SpotOrderState == Enums.SpotOrderState.Rejected ? spotOrderPublishInfo.RejectedReason : "")}" + }); } if (spotOrderPublishInfo.SpotOrderState == Enums.SpotOrderState.Filled) @@ -54,13 +62,11 @@ namespace Binance.TradeRobot.Business SourceSingal = Enums.SingalType.订单推送, Content = $"收到订单推送,订单号:{spotOrderPublishInfo.OrderId},订单方向:{spotOrderPublishInfo.TradeDirection},订单类型:{spotOrderPublishInfo.OrderType},订单状态:{spotOrderPublishInfo.SpotOrderState},成交额:{spotOrderPublishInfo.LastTradeAmount},成交量:{spotOrderPublishInfo.LastTradeQuantity},成交价:{spotOrderPublishInfo.LastTradePrice},手续费({spotOrderPublishInfo.FeeUnit}):{spotOrderPublishInfo.Fee}" }); - updateSpotOrder = fsql.Update(spotOrderPublishInfo.OrderId) - //.Set(o => o.TradeCount + 1) - .Set(o => o.TradeAmount, spotOrderPublishInfo.CummulativeTradeAmount) - .Set(o => o.TradeQuantity, spotOrderPublishInfo.CummulativeTradeQuantity) - .Set(o => o.TradePrice, spotOrderPublishInfo.CummulativeTradeAmount / spotOrderPublishInfo.CummulativeTradeQuantity) - .Set(o => o.TradeFee, spotOrderPublishInfo.Fee) - .Set(o => o.TradeFeeUnit, spotOrderPublishInfo.FeeUnit); + updateSpotOrder = updateSpotOrder.Set(o => o.TradeAmount, spotOrderPublishInfo.CummulativeTradeAmount) + .Set(o => o.TradeQuantity, spotOrderPublishInfo.CummulativeTradeQuantity) + .Set(o => o.TradePrice, spotOrderPublishInfo.CummulativeTradeAmount / spotOrderPublishInfo.CummulativeTradeQuantity) + .Set(o => o.TradeFee, spotOrderPublishInfo.Fee) + .Set(o => o.TradeFeeUnit, spotOrderPublishInfo.FeeUnit); } } diff --git a/SDKAdapter/WebSockets/Order/Spot/BinanceSpotOrderWebSocketClient.cs b/SDKAdapter/WebSockets/Order/Spot/BinanceSpotOrderWebSocketClient.cs index 1a80477..4680749 100644 --- a/SDKAdapter/WebSockets/Order/Spot/BinanceSpotOrderWebSocketClient.cs +++ b/SDKAdapter/WebSockets/Order/Spot/BinanceSpotOrderWebSocketClient.cs @@ -53,7 +53,7 @@ namespace SDKAdapter.WebSockets.Order.Spot { Binance.Net.Enums.OrderStatus.New, Binance.Net.Enums.OrderStatus.PendingCancel, - Binance.Net.Enums.OrderStatus.PartiallyFilled, //由于无法确定手续费时候存在局部,暂时忽略局部成交 + //Binance.Net.Enums.OrderStatus.PartiallyFilled, //由于无法确定手续费时候存在局部,暂时忽略局部成交 Binance.Net.Enums.OrderStatus.Insurance, Binance.Net.Enums.OrderStatus.Adl }; @@ -147,7 +147,8 @@ namespace SDKAdapter.WebSockets.Order.Spot LastTradeQuantity = e.Data.LastQuantityFilled, LastTradeTime = e.Data.UpdateTime, CreateTime = e.Data.CreateTime, - LoggerName = logger.Name + LoggerName = logger.Name, + RejectedReason = e.Data.RejectReason.ToString() }); } catch (Exception ex)