wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

续费新开 已删除帐号处理

Browse Source
This commit is contained in:
wanyongkang
2020-12-07 09:10:58 +08:00
parent f433566143
commit de8a9a493a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs
View File

@@ -72,7 +72,7 @@ namespace Hncore.Pass.Vpn.Service
public async Task<ProductAccountEntity> 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<List<ProductAccountEntity>> GetAccounts(string accouts,int userId=0)

6
Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
View File

@@ -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<ApiResult> 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)
{