|
|
@@ -7,7 +7,7 @@ namespace molilian.core
|
|
|
{
|
|
|
private const string base_orders_url = "https://pub.alimama.com/openapi/param2/1/gateway.unionpub/report.getTbkOrderDetails.json";
|
|
|
|
|
|
- public int GetHistoryOrders(int sleep, DateTime startTime, DateTime endTime)
|
|
|
+ public async Task<int> GetHistoryOrdersAsync(int sleep, DateTime startTime, DateTime endTime)
|
|
|
{
|
|
|
//DateTime endTime = DateTime.Now;
|
|
|
//DateTime startTime = endTime.AddDays(-90);
|
|
|
@@ -33,7 +33,7 @@ namespace molilian.core
|
|
|
//#endif
|
|
|
|
|
|
//当日往前查询
|
|
|
- (int total, DateTime max_modifiedTime, List<DateTime> orderTimes) = GetTkOrders(startTime, endTime, DateTime.MinValue, false, sleep);
|
|
|
+ (int total, DateTime max_modifiedTime, List<DateTime> orderTimes) = await GetTkOrdersAsync(startTime, endTime, DateTime.MinValue, false, sleep);
|
|
|
|
|
|
if (_account.is_hide) return total;
|
|
|
|
|
|
@@ -105,7 +105,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
return total;
|
|
|
|
|
|
}
|
|
|
- public int GetIncyOrders(int sleep)
|
|
|
+ public async Task<int> GetIncyOrdersAsync(int sleep)
|
|
|
{
|
|
|
string cacheKey = $":cache:GetIncyOrders:{_accountName}";
|
|
|
string cacheKey2 = $":cache:GetIncyOrders:{_accountId}";
|
|
|
@@ -130,7 +130,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
}
|
|
|
|
|
|
//当日往前查询
|
|
|
- (int total, DateTime max_modifiedTime, List<DateTime> orderTimes) = GetTkOrders(startTime, endTime, last_modifiedTime, true, sleep);
|
|
|
+ (int total, DateTime max_modifiedTime, List<DateTime> orderTimes) = await GetTkOrdersAsync(startTime, endTime, last_modifiedTime, true, sleep);
|
|
|
if (max_modifiedTime != DateTime.MinValue)
|
|
|
{
|
|
|
RedisHelper.Set(cacheKey, max_modifiedTime);
|
|
|
@@ -208,7 +208,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
return total;
|
|
|
}
|
|
|
|
|
|
- public int GetOrdersByAdZone(long adzoneId, DateTime startTime, DateTime endTime, int sleep)
|
|
|
+ public async Task<int> GetOrdersByAdZoneAsync(long adzoneId, DateTime startTime, DateTime endTime, int sleep)
|
|
|
{
|
|
|
string cacheKey = $":cache:GetOrdersByAdZone:{_accountName}";
|
|
|
string cacheKey2 = $":cache:GetOrdersByAdZone:{_accountId}";
|
|
|
@@ -225,7 +225,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
}
|
|
|
|
|
|
//当日往前查询
|
|
|
- (int total, DateTime max_modifiedTime, List<DateTime> orderTimes) = GetTkOrdersByAdZone(adzoneId, startTime, endTime, last_modifiedTime, true, sleep);
|
|
|
+ (int total, DateTime max_modifiedTime, List<DateTime> orderTimes) = await GetTkOrdersByAdZoneAsync(adzoneId, startTime, endTime, last_modifiedTime, true, sleep);
|
|
|
if (max_modifiedTime != DateTime.MinValue)
|
|
|
{
|
|
|
RedisHelper.Set(cacheKey, max_modifiedTime);
|
|
|
@@ -234,7 +234,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
|
|
|
return total;
|
|
|
}
|
|
|
- public (int, DateTime, List<DateTime>) GetTkOrdersByAdZone(long adzoneId, DateTime startTime, DateTime endTime, DateTime last_modifiedTime, bool desc = true, int sleep = 100)
|
|
|
+ public async Task<(int, DateTime, List<DateTime>)> GetTkOrdersByAdZoneAsync(long adzoneId, DateTime startTime, DateTime endTime, DateTime last_modifiedTime, bool desc = true, int sleep = 100)
|
|
|
{
|
|
|
List<DateTime> orderTimes = [];
|
|
|
|
|
|
@@ -303,7 +303,12 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
priority = NifyMessagePriority.high,
|
|
|
tags = ["red_circle"]
|
|
|
});
|
|
|
- Thread.Sleep(i * 60 * 1000);
|
|
|
+ if (!_account.is_hide)
|
|
|
+ {
|
|
|
+ _ = NotifyCore.QYWeixinPushNotifyAsync("GetTkOrders【出现滑动验证码】", message);
|
|
|
+ }
|
|
|
+
|
|
|
+ await Task.Delay(i * 60 * 1000);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
@@ -316,7 +321,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
priority = NifyMessagePriority.high,
|
|
|
tags = ["red_circle"]
|
|
|
});
|
|
|
- Thread.Sleep(i * 60 * 1000);
|
|
|
+ await Task.Delay(i * 60 * 1000);
|
|
|
continue;
|
|
|
}
|
|
|
break;
|
|
|
@@ -383,13 +388,13 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
hasNext = data.Read<bool>("hasNext");
|
|
|
positionIndex = data.Read<string>("positionIndex");
|
|
|
|
|
|
- if (sleep > 0) Thread.Sleep(sleep);
|
|
|
+ if (sleep > 0) await Task.Delay(sleep);
|
|
|
}
|
|
|
return (total, max_modifiedTime, orderTimes);
|
|
|
}
|
|
|
|
|
|
|
|
|
- public (int, DateTime, List<DateTime>) GetTkOrders(DateTime startTime, DateTime endTime, DateTime last_modifiedTime, bool desc = true, int sleep = 100)
|
|
|
+ public async Task<(int, DateTime, List<DateTime>)> GetTkOrdersAsync(DateTime startTime, DateTime endTime, DateTime last_modifiedTime, bool desc = true, int sleep = 100)
|
|
|
{
|
|
|
List<DateTime> orderTimes = [];
|
|
|
|
|
|
@@ -482,8 +487,11 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
priority = NifyMessagePriority.high,
|
|
|
tags = ["red_circle"]
|
|
|
});
|
|
|
- _ = NotifyCore.QYWeixinPushNotifyAsync("GetTkOrders【出现滑动验证码】", message);
|
|
|
- Thread.Sleep(i * 60 * 1000);
|
|
|
+ if (!_account.is_hide)
|
|
|
+ {
|
|
|
+ _ = NotifyCore.QYWeixinPushNotifyAsync("GetTkOrders【出现滑动验证码】", message);
|
|
|
+ }
|
|
|
+ await Task.Delay(i * 60 * 1000);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
@@ -498,7 +506,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
priority = NifyMessagePriority.high,
|
|
|
tags = ["red_circle"]
|
|
|
});
|
|
|
- Thread.Sleep(i * 60 * 1000);
|
|
|
+ await Task.Delay(i * 60 * 1000);
|
|
|
continue;
|
|
|
}
|
|
|
break;
|
|
|
@@ -538,7 +546,7 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
string message = $"【GetRawItemId】{_accountId}:{_accountName}\t{_proxy?.Address}\n" +
|
|
|
$"{body}\n{ex.Message}\n{ex.StackTrace}";
|
|
|
|
|
|
- if (sleep > 0) Thread.Sleep(sleep);
|
|
|
+ if (sleep > 0) await Task.Delay(sleep);
|
|
|
throw new APIException(body);
|
|
|
}
|
|
|
try
|
|
|
@@ -574,14 +582,14 @@ SET order_ord_num = order_ord_num_3 + order_ord_num_12 + order_ord_num_13 + ord
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
|
- if (sleep > 0) Thread.Sleep(sleep);
|
|
|
+ if (sleep > 0) await Task.Delay(sleep);
|
|
|
throw;
|
|
|
}
|
|
|
pageNo++;
|
|
|
hasNext = data.Read<bool>("hasNext");
|
|
|
positionIndex = data.Read<string>("positionIndex");
|
|
|
|
|
|
- if (sleep > 0) Thread.Sleep(sleep);
|
|
|
+ if (sleep > 0) await Task.Delay(sleep);
|
|
|
}
|
|
|
return (total, max_modifiedTime, orderTimes);
|
|
|
}
|