diff --git a/Host/Views/Product/Test.cshtml b/Host/Views/Product/Test.cshtml index f3f08d6..f16488c 100644 --- a/Host/Views/Product/Test.cshtml +++ b/Host/Views/Product/Test.cshtml @@ -91,8 +91,8 @@
剩余试用次数@(Model.RestTimes)
-
- +
+
@if (Model.RestTimes > 0 && Model.Package.Status == 1) diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs index 4452b81..5d48646 100644 --- a/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs +++ b/Services/Hncore.Pass.Vpn/Controllers/ProductAccountController.cs @@ -272,10 +272,17 @@ namespace Hncore.Pass.Vpn.Controllers } var restTimes = await m_AccountService.GetRestTestCount(userId); + var is_verify = await m_AccountService.GetUserStatus(userId); + if (restTimes <= 0) { return Error("没有测试次数了"); - } + } + + if (is_verify == 0) + { + return Error("请点击前往实名认证"); + } var ret= await m_agentService.NewAccount(0, request.PackageId, request.Account, request.Pwd, accountType: 0); diff --git a/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs b/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs index 6e11d15..5e7d79e 100644 --- a/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs +++ b/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs @@ -77,6 +77,7 @@ namespace Hncore.Pass.Vpn.Domain public int? ManagerId { get; set; } = 0; public string ManagerName { get; set; } + public int is_verify { get; set; } } } \ No newline at end of file diff --git a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs index 8a416f6..5b8d199 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductAccountService.cs @@ -167,5 +167,12 @@ namespace Hncore.Pass.Vpn.Service restTimes = restTimes < 0 ? 0 : restTimes; return restTimes; } + //获取是否实名认证 + public async Task GetUserStatus(int userId) + { + var userInfo = await m_UserService.GetById(userId); + var flag = userInfo.is_verify; + return flag; + } } } diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index e41ee8b..31d9132 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -201,6 +201,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, public async Task> CreateOrder(CreateOrderRequest request, int userId) { + var packageEntity = await m_ProductPackageService.GetById(request.PackageId); if (packageEntity == null) { @@ -217,6 +218,14 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, } var userEntity = await m_UserService.GetById(userId); + + var is_verify = userEntity.is_verify; + + if (is_verify == 0) + { + return new ApiResult(ResultCode.C_INVALID_ERROR, "请前往实名认证"); + } + var price = packageEntity.Price; var userPrice = await this.m_ProductUserPriceService.Query(true).FirstOrDefaultAsync(m => m.UserId == userId && m.PackageId == packageEntity.Id && m.Status == 1); if (userPrice != null && userPrice.UserPrice > 0)