diff --git a/Million Buyer/MainForm.cs b/Million Buyer/MainForm.cs index 0bd7cad..2ddf0f6 100644 --- a/Million Buyer/MainForm.cs +++ b/Million Buyer/MainForm.cs @@ -254,9 +254,18 @@ namespace Million_Buyer } var tempData = orderList.Select(t => t.Uuid).ToList(); - tempData.AddRange(buyList.Select(t => t.Uuid).ToList()); - buyCycleCount = tempData.Distinct().ToList().Count; - lb_BuyMarketCount.Text = tempData.Distinct().ToList().Count.ToString(); + var buyListUuids = buyList.Select(t => t.Uuid).ToList(); + + var beforeBuyList = buyListUuids.Where(t => t == "").ToList(); + var cnt = 0; + + if (beforeBuyList != null) cnt = beforeBuyList.Count; + + if (cnt != 0) cnt -= 1; + + tempData.AddRange(buyListUuids); + buyCycleCount = tempData.Distinct().ToList().Count + cnt; + lb_BuyMarketCount.Text = buyCycleCount.ToString(); } catch (Exception e) { @@ -378,6 +387,7 @@ namespace Million_Buyer if(item.Currency != "KRW") { var buyItem = new CandleDataList(); + buyItem.Uuid = ""; var temp = dataList[MCandleTimeType.M1].FirstOrDefault(t => t.ConGoodsData.CoinFullName == item.UnitCurrency + "-" + item.Currency); if (temp == null) continue; @@ -388,6 +398,7 @@ namespace Million_Buyer candle.BuyValue = item.AvgBuyPrice; candle.BuyCount = item.Balance; buyItem.CandleDataLists_Im.Add(candle); + buyList.Add(buyItem); } } @@ -877,8 +888,13 @@ namespace Million_Buyer // 판매시 Order Cancel 진행 OrderCancel(coinFullName, uuid); - var orderData = CommonProperty.UpbitApi.GetOrderInformation(uuid); - + var orderData = CommonProperty.UpbitApi.GetOrderInformation(uuid); + + if(orderData == null) + { + orderData = new Order(); + //orderData.ExecutedVolume = this.accounts.FirstOrDefault(t => t.UnitCurrency + "-" + t.Currency == coinFullName).Balance; + } if (orderData.ExecutedVolume != 0) { var returnData = CommonProperty.UpbitApi.TryOrder(coinFullName, side, orderData.ExecutedVolume, price, InsertLog, ordType); diff --git a/Million/WebMangement/Upbit/UpbitAPI.cs b/Million/WebMangement/Upbit/UpbitAPI.cs index 3a959a4..fa7e4e2 100644 --- a/Million/WebMangement/Upbit/UpbitAPI.cs +++ b/Million/WebMangement/Upbit/UpbitAPI.cs @@ -157,6 +157,11 @@ namespace Million.WebMangement.Upbit Order returnData; + if(resResult.Contains("주문을 찾지 못했습니다.")) + { + return null; + } + while (true) { returnData = WebServiceFunctions.GetOrderInformation(resResult);