million/Million
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

가지고 있던거 파는 로직 개선

Browse Source
This commit is contained in:
kyh
2022-11-21 16:03:20 +09:00
parent 8d1fc26ac8
commit dc5a3b0ec2
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Million Buyer/MainForm.cs
View File

@@ -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);