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-01 19:35:28 +08:00
parent 688577db39
commit 318c9a24a7
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Host/Views/Product/Index.cshtml
View File

@@ -361,16 +361,18 @@
@*<p class="text-center nameSmall">—<span>@item.Product.Name</span>—</p>*@ @*<p class="text-center nameSmall">—<span>@item.Product.Name</span>—</p>*@
<div class="card" style="margin-top:30px;"> <div class="card" style="margin-top:30px;">
<div class="item packageitem" a-test="true" id="@("pkgtest"+item.Product.Id)" a-pkg-id="@item.Product.Id"> @if(item.Product.Id != 5){
<p><span class="price">免费</span></p> <div class="item packageitem" a-test="true" id="@("pkgtest"+item.Product.Id)" a-pkg-id="@item.Product.Id">
<p class="yuanjia" style="color: #FF9900;text-decoration:none;"><span>@restStatus</span></p> <p><span class="price">免费</span></p>
<p>@restTimes</p> <p class="yuanjia" style="color: #FF9900;text-decoration:none;"><span>@restStatus</span></p>
<div class="pkgNameCard"> <p>@restTimes</p>
<p class="tianka" style="font-size:17px;">测试卡</p> <div class="pkgNameCard">
<p class="qixian">使用期限:1小时</p> <p class="tianka" style="font-size:17px;">测试卡</p>
<p class="qixian">使用期限:1小时</p>
</div>
<img src="~/img/check.png" class="cardCheck">
</div> </div>
<img src="~/img/check.png" class="cardCheck"> }
</div>
@foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1).OrderBy(m => m.TenantId)) @foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1).OrderBy(m => m.TenantId))
{ {

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

@@ -250,10 +250,12 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
{ {
order.OrderAmount = price * request.ConnectCount; order.OrderAmount = price * request.ConnectCount;
order.Accounts = request.Account; order.Accounts = request.Account;
var isExit = await m_ProductAccountService.CheckMonthAccountExist(request.Account);
if(isExit){ //双月卡活动
return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, request.Account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。"); // var isExit = await m_ProductAccountService.CheckMonthAccountExist(request.Account);
} // if(isExit){
// return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, request.Account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。");
// }
} }
if (request.OrderType == OrderType.News) if (request.OrderType == OrderType.News)
@@ -271,13 +273,14 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
order.OrderAmount = price * request.ConnectCount * count; order.OrderAmount = price * request.ConnectCount * count;
order.Accounts = request.Account; order.Accounts = request.Account;
} }
foreach (var account in order.Accounts.Split(",").ToList()) //双月卡活动
{ // foreach (var account in order.Accounts.Split(",").ToList())
var isExit = await m_ProductAccountService.CheckMonthAccountExist(account); // {
if(isExit){ // var isExit = await m_ProductAccountService.CheckMonthAccountExist(account);
return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。"); // if(isExit){
} // return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, account + "此IP账号已享受该优惠套餐，无法再次购买,若要购买此优惠套餐，请新开或续费其他账号。");
} // }
// }
await CheckRequest(order); await CheckRequest(order);