bug修复

Author: ZhangYiQiu

src/Telegram.CoinConvertBot/BgServices/BotHandler/UpdateHandlers.cs

@@ -239,7 +239,7 @@ async Task<Message> ConvertCoinTRX(ITelegramBotClient botClient, Message message
 实时汇率：<b>1 USDT = {2m.USDT_To_TRX(rate, FeeRate):#.####} TRX</b>
 获得TRX：<b>(10 - 1) * {2m.USDT_To_TRX(rate, FeeRate):#.####} = {9m.USDT_To_TRX(rate, FeeRate):0.00} TRX</b></code>
 
-注意：<b>暂时只支持{MinUSDT} USDT以上(不含{MinUSDT} USDT)的金额兑换，若转入{MinUSDT} USDT及以下金额，将无法退还！！！</b>
+注意：<b>只支持{MinUSDT} USDT以上的金额兑换。</b>
 
 转帐前，推荐您使用以下命令来接收入账通知
 <code>绑定波场地址 Txxxxxxx</code>(您的钱包地址)
@@ -348,7 +348,7 @@ static async Task<Message> ValuationAction(ITelegramBotClient botClient, Message
             var msg = $"<b>{price} {fromCurrency} = {price} {fromCurrency}</b>";
             if (fromCurrency == Currency.USDT && toCurrency == Currency.TRX)
             {
-                if (price <= MinUSDT)
+                if (price < MinUSDT)
                 {
                     msg = $"仅支持大于{MinUSDT} USDT 的兑换";
                 }
@@ -361,7 +361,7 @@ static async Task<Message> ValuationAction(ITelegramBotClient botClient, Message
             if (fromCurrency == Currency.TRX && toCurrency == Currency.USDT)
             {
                 var toPrice = price.TRX_To_USDT(rate, FeeRate);
-                if (toPrice <= MinUSDT)
+                if (toPrice < MinUSDT)
                 {
                     msg = $"仅支持大于{MinUSDT} USDT 的兑换";
                 }

src/Telegram.CoinConvertBot/BgServices/TransferTrxService.cs

@@ -53,7 +53,7 @@ protected override async Task ExecuteAsync()
             }
             var Orders = await _repository
                 .Where(x => x.Status == Status.Pending)
-                .Where(x => x.OriginalAmount > UpdateHandlers.MinUSDT)
+                .Where(x => x.OriginalAmount >= UpdateHandlers.MinUSDT)
                 .ToListAsync();
             if (Orders.Count > 0)
                 _logger.LogInformation("待转账订单检测，订单数：{c}", Orders.Count);

src/Telegram.CoinConvertBot/BgServices/USDT_TRC20Service.cs

@@ -83,12 +83,10 @@ protected override async Task ExecuteAsync()
                     foreach (var item in result.Data)
                     {
                         //合约地址不匹配
-                        if (item.TokenInfo?.Address != ContractAddress)
-                        {
-                            continue;
-                        }
+                        if (item.TokenInfo?.Address != ContractAddress) continue;
+                        var types = new string[] { "Transfer", "TransferFrom" };
                         //收款地址相同
-                        if (item.To != address) continue;
+                        if (item.To != address || !types.Contains(item.Type)) continue;
                         //实际支付金额
                         var amount = item.Amount;
                         var record = new TokenRecord