diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index d3c4c58..681b9c9 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -90,6 +90,7 @@ namespace Home.Controllers var user_Info = await m_UserService.GetById(userInfo.UserId); var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount; var mogu_jihu = user_Info.Sex; + var jgday = user_Info.jgday; //判断测试卡使用次数是否超过限定次数 false表示免费没用完 true表示免费测试已经用完 var test_flag = false; @@ -127,6 +128,9 @@ namespace Home.Controllers if (mogu_jihu == 0 && (m.Id==1188 || m.Id==1194 || m.Id==1200)){ m.Price = 0.1M; } + if (jgday == 0 && (m.Id==1215 || m.Id==1221 || m.Id==1227)){ + m.Price = 0.1M; + } //判断测试卡是否收费 if (test_flag && (m.IsTest == 1)) { m.Price = 1.0M; @@ -161,6 +165,9 @@ namespace Home.Controllers if (mogu_jihu == 0 && ( m.Id==1188 || m.Id==1194 || m.Id==1200)){ m.Price = 0.1M; } + if (jgday == 0 && (m.Id==1215 || m.Id==1221 || m.Id==1227)){ + m.Price = 0.1M; + } //判断测试卡是否收费 if (test_flag && (m.IsTest == 1)) { m.Price = 1.0M; @@ -182,7 +189,7 @@ namespace Home.Controllers m.Title = "0"; - if (m.Id == 1012 || m.Id==1188 || m.Id==1194 || m.Id==1200){ + if (m.Id == 1012 || m.Id==1188 || m.Id==1194 || m.Id==1200 || m.Id==1215 || m.Id==1221 || m.Id==1227){ m.Price = 0.1M; } }); @@ -814,6 +821,7 @@ namespace Home.Controllers var user_Info = await m_UserService.GetById(userId); var ExpiredProductAccountCount = user_Info.ExpiredProductAccountCount; var mogu_jihu = user_Info.Sex; + var jgday = user_Info.jgday; var dis_price = 1000000M; if((user_Info.agent_id == 0||(user_Info.agent_id != 0 && user_Info.discount_id != 0)) && user_Info.discount_id >= 0){ @@ -845,6 +853,10 @@ namespace Home.Controllers if (mogu_jihu == 0 &&(package.Id == 1188 || package.Id == 1194 || package.Id == 1200)){ package.Price = 0.1M; } + + if (jgday == 0 && (package.Id==1215 || package.Id==1221 || package.Id==1227)){ + package.Price = 0.1M; + } return View("buy", new PackageInfoResponse() diff --git a/Services/Hncore.Pass.BaseInfo/Domain/User.cs b/Services/Hncore.Pass.BaseInfo/Domain/User.cs index 13cffbf..0b57dc6 100644 --- a/Services/Hncore.Pass.BaseInfo/Domain/User.cs +++ b/Services/Hncore.Pass.BaseInfo/Domain/User.cs @@ -12,6 +12,7 @@ namespace Hncore.Pass.BaseInfo.Models public string apikey { get; set; } public int TenantId { get; set; } public int agent_id { get; set; } + public int jgday { get; set; } /// /// 管理员登录名[16 diff --git a/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs b/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs index d4e2cbc..35d80ce 100644 --- a/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs +++ b/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs @@ -38,6 +38,9 @@ namespace Hncore.Pass.Vpn.Domain /// public string Profile { get; set; } + + public int jgday { get; set; } + /// /// 状态 diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index 0477c1e..e6bf4cb 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -276,6 +276,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, //天卡0.1元 var ExpiredProductAccountCount = userEntity.ExpiredProductAccountCount; var mogu_jihu = userEntity.Sex; + var jgday = userEntity.jgday; var is_verify = userEntity.is_verify; @@ -346,6 +347,12 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, userEntity.Sex = 1; await m_UserService.Update(userEntity); } + + if (( request.PackageId == 1215 || request.PackageId == 1221 || request.PackageId == 1227)&&jgday == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ + price = 0.1M; + userEntity.jgday = 1; + await m_UserService.Update(userEntity); + } var order = new ProductOrderEntity() { AccountCount = 1,