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

认领与修改价格

Browse Source
This commit is contained in:
“wanyongkang”
2021-06-02 16:59:51 +08:00
parent 49cab5512c
commit 4a26831eb1
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
View File

@@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using UserService = Hncore.Pass.Vpn.Service.UserService;
namespace Hncore.Pass.Vpn.Controllers namespace Hncore.Pass.Vpn.Controllers
{ {
@@ -19,12 +20,14 @@ namespace Hncore.Pass.Vpn.Controllers
public class ProductController : HncoreControllerBase public class ProductController : HncoreControllerBase
{ {
private ProductService m_ProductService; private ProductService m_ProductService;
private UserService m_UserService;
private ProductPackageService m_ProductPackageService; private ProductPackageService m_ProductPackageService;
private ProductUserPriceService m_ProductUserPriceService; private ProductUserPriceService m_ProductUserPriceService;
public ProductController(ProductService _ProductServic, ProductPackageService _ProductPackageService, ProductUserPriceService m_ProductUserPriceService) public ProductController(UserService _UserService,ProductService _ProductServic, ProductPackageService _ProductPackageService, ProductUserPriceService m_ProductUserPriceService)
{ {
m_ProductService = _ProductServic; m_ProductService = _ProductServic;
m_ProductPackageService = _ProductPackageService; m_ProductPackageService = _ProductPackageService;
m_UserService = _UserService;
this.m_ProductUserPriceService = m_ProductUserPriceService; this.m_ProductUserPriceService = m_ProductUserPriceService;
} }
@@ -203,6 +206,10 @@ namespace Hncore.Pass.Vpn.Controllers
{ {
return Error("请设置会员价"); return Error("请设置会员价");
} }
var userEntity = await m_UserService.Query(m => m.Id==userPriceEntity.UserId).FirstOrDefaultAsync();
userEntity.discount_id = -1;
await m_UserService.Update(userEntity);
userPriceEntity.Status = userPriceEntity.Status == 0 ? 1 : 0; userPriceEntity.Status = userPriceEntity.Status == 0 ? 1 : 0;
await m_ProductUserPriceService.Update(userPriceEntity); await m_ProductUserPriceService.Update(userPriceEntity);
return Success(userPriceEntity.Status); return Success(userPriceEntity.Status);
@@ -232,7 +239,9 @@ namespace Hncore.Pass.Vpn.Controllers
public async Task<ApiResult> PutUserPrice([FromBody]PutUserPriceRequest request) public async Task<ApiResult> PutUserPrice([FromBody]PutUserPriceRequest request)
{ {
var userPriceEntity = await m_ProductUserPriceService.Query(m => m.PackageId == request.PackageId && m.UserId == request.UserId).FirstOrDefaultAsync(); var userPriceEntity = await m_ProductUserPriceService.Query(m => m.PackageId == request.PackageId && m.UserId == request.UserId).FirstOrDefaultAsync();
var userEntity = await m_UserService.Query(m => m.Id==request.UserId).FirstOrDefaultAsync();
userEntity.discount_id = -1;
await m_UserService.Update(userEntity);
var price = request.UserPrice; var price = request.UserPrice;
var packageEntity =await m_ProductPackageService.GetById(request.PackageId); var packageEntity =await m_ProductPackageService.GetById(request.PackageId);
// var product = await m_ProductService.GetById(packageEntity.ProductId); // var product = await m_ProductService.GetById(packageEntity.ProductId);

2
Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
View File

@@ -560,7 +560,7 @@ namespace Hncore.Pass.Vpn.Controllers
&& string.IsNullOrEmpty(m.Channel)) && string.IsNullOrEmpty(m.Channel))
.OrderByDescending(m => m.Id) .OrderByDescending(m => m.Id)
.ToListAsync(); .ToListAsync();
var data = datas.Where(m => (DateTime.Now - m.UpdateTime).TotalMinutes < 30).FirstOrDefault(); var data = datas.Where(m => (DateTime.Now - m.UpdateTime).TotalMinutes < 60).FirstOrDefault();
if (data != null) if (data != null)
{ {
data.Channel = manager.LoginName; data.Channel = manager.LoginName;