diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs index 1853444..8a416f6 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs @@ -72,7 +72,7 @@ namespace Hncore.Pass.Vpn.Service public async Task GetAccountInfo(string accout, int userId) { - return await this.Query(true).FirstOrDefaultAsync(m => m.Account == accout && m.UserId == userId); + return await this.Query(true).FirstOrDefaultAsync(m => m.Account == accout && m.UserId == userId && m.DeleteTag == 0); } public async Task> GetAccounts(string accouts,int userId=0) diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index 4da6f4a..e41ee8b 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -579,7 +579,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, } else if (order.OrderType == OrderType.AgainBuy || order.OrderType == OrderType.AgainBuys) { - var accountEntitys = await m_ProductAccountService.Query(p => p.UserId == order.UserId && p.ProductId == order.ProductId && accounts.Contains(p.Account)).ToListAsync(); + var accountEntitys = await m_ProductAccountService.Query(p => p.UserId == order.UserId && p.DeleteTag == 0 && p.ProductId == order.ProductId && accounts.Contains(p.Account)).ToListAsync(); accountEntitys = accountEntitys.Distinct(new AccountEntityEq()).ToList(); @@ -852,6 +852,10 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, public async Task CaclRefund(int userId, string account) { var accountInfo = await m_ProductAccountService.GetAccountInfo(account, userId); + + if(accountInfo.Status == AccountStatus.Refund){ + return new ApiResult(ResultCode.C_Illegal_Operation, "此类帐号不允许退款"); + } if (accountInfo == null) {