订单回调

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<SpotOrder>(spotOrderPublishInfo.OrderId)
+                    updateSpotOrder = updateSpotOrder.Set(o => o.TradeAmount, spotOrderPublishInfo.CummulativeTradeAmount)
-                                          //.Set(o => o.TradeCount + 1)
+                                                     .Set(o => o.TradeQuantity, spotOrderPublishInfo.CummulativeTradeQuantity)
-                                          .Set(o => o.TradeAmount, spotOrderPublishInfo.CummulativeTradeAmount)
+                                                     .Set(o => o.TradePrice, spotOrderPublishInfo.CummulativeTradeAmount / spotOrderPublishInfo.CummulativeTradeQuantity)
-                                          .Set(o => o.TradeQuantity, spotOrderPublishInfo.CummulativeTradeQuantity)
+                                                     .Set(o => o.TradeFee, spotOrderPublishInfo.Fee)
-                                          .Set(o => o.TradePrice, spotOrderPublishInfo.CummulativeTradeAmount / spotOrderPublishInfo.CummulativeTradeQuantity)
+                                                     .Set(o => o.TradeFeeUnit, spotOrderPublishInfo.FeeUnit);
-                                          .Set(o => o.TradeFee, spotOrderPublishInfo.Fee)
-                                          .Set(o => o.TradeFeeUnit, spotOrderPublishInfo.FeeUnit);
                 }
 
             }

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)