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-03-26 16:59:51 +08:00
parent 65f4725399
commit f0b4a741b5
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Host/Controllers/ProductController.cs
View File

@@ -97,7 +97,7 @@ namespace Home.Controllers
{ {
m.Price = userPrice.UserPrice; m.Price = userPrice.UserPrice;
} }
if (ProductAccountCount == 0 && m.DayCount == 1 && m.ProductId!=5){ if (ProductAccountCount == 0 && m.DayCount == 1){
m.Price = 0.1M; m.Price = 0.1M;
} }
}); });
@@ -106,7 +106,7 @@ namespace Home.Controllers
foreach(var product in respList) foreach(var product in respList)
{ {
product.Packages.ForEach(m => { product.Packages.ForEach(m => {
if ( m.DayCount == 1 && m.ProductId!=5){ if ( m.DayCount == 1 ){
m.Price = 0.1M; m.Price = 0.1M;
} }
}); });
@@ -681,7 +681,7 @@ namespace Home.Controllers
{ {
package.Price = userPrice.UserPrice; package.Price = userPrice.UserPrice;
} }
if (ProductAccountCount == 0 && package.DayCount == 1 && package.ProductId!=5){ if (ProductAccountCount == 0 && package.DayCount == 1){
package.Price = 0.1M; package.Price = 0.1M;
} }

4
Host/Views.Mobile/Product/Index.cshtml
View File

@@ -39,12 +39,12 @@
<a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></a> <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></a>
</li> </li>
} }
else if(item.Product.Id == 6||item.Product.Id == 2||item.Product.Id == 4 || item.Product.Id == 5) { else if(item.Product.Id == 6||item.Product.Id == 2||item.Product.Id == 4 ) {
<li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")"> <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
<a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄底价</span></a> <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄底价</span></a>
</li> </li>
} }
else if(item.Product.Id == 18) { else if(item.Product.Id == 18|| item.Product.Id == 5) {
<li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")"> <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
<a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄低价</span></a> <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄低价</span></a>
</li> </li>

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

@@ -497,11 +497,11 @@
@if(item.Product.Id == 13){ @if(item.Product.Id == 13){
<div class="productItem" style="" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></div> <div class="productItem" style="" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></div>
} }
else if(item.Product.Id == 6||item.Product.Id == 2||item.Product.Id == 4 || item.Product.Id == 5||item.Product.Id == 14) { else if(item.Product.Id == 6||item.Product.Id == 2||item.Product.Id == 4 ||item.Product.Id == 14) {
<div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id" a-pkg-id="@(item.Packages.FirstOrDefault(m=>m.Status==1).Id)">@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄底价</span></div> <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id" a-pkg-id="@(item.Packages.FirstOrDefault(m=>m.Status==1).Id)">@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄底价</span></div>
} }
else if(item.Product.Id == 18) { else if(item.Product.Id == 18|| item.Product.Id == 5) {
<div class="productItem" style="" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;"> 新</span>@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄低价</span></div> <div class="productItem" style="" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;"> 新</span>@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄底价</span></div>
} }
else if(item.Product.Id == 17) { else if(item.Product.Id == 17) {
<div class="productItem" style="" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span class="glyphicon glyphicon-thumbs-up" style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></div> <div class="productItem" style="" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span class="glyphicon glyphicon-thumbs-up" style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></div>
@@ -555,8 +555,8 @@
<p class="youhuiNew" style="padding:0;margin:0;color:white;background-color:#FF0033;">一毛钱活动：不分新老用户都可参加！</p> <p class="youhuiNew" style="padding:0;margin:0;color:white;background-color:#FF0033;">一毛钱活动：不分新老用户都可参加！</p>
@if(item.Product.Id == 5){ @if(item.Product.Id == 5){
<br> <br>
<p class="youhuiNew" style="padding:0;margin:0;color:white;background-color:#FF0033;"><span style="font-size:30px;">关停公告:</span><br>本产品感谢各位长久以来的选择与支持，现计划于2021年3月1日暂停服务运营，天卡周卡还可购买使用，月卡及以上套餐，请选择其他产品进行购买，服务暂停后，没到期的用户请及时申请退款！ <p class="youhuiNew" style="padding:0;margin:0;color:white;background-color:#99CC00;"><span style="font-size:30px;">恢复公告:</span><br>老鹰IP已恢复运营！已更新最新的IP池，产品稳定性也做了大幅度的升级！请下载使用最新版的客户端和IP线路表。<br>
祝各位用户万事顺利，生意兴隆，新年快乐！！</p> 为答谢各位对老鹰IP一直以来的选择和支持，特推出全部套餐8折狂欢价！ 祝各位用户万事顺利，生意兴隆！</p>
<p class="youhuiNew"></p> <p class="youhuiNew"></p>
} }
@if(item.Product.Id == 13){ @if(item.Product.Id == 13){

4
Host/Views/Product/ReBuyIndex.cshtml
View File

@@ -303,8 +303,8 @@
} *@ } *@
@if(defaultProduct.Id == 5){ @if(defaultProduct.Id == 5){
<br> <br>
<p class="youhuiNew" style="padding:0;margin:0;color:white;background-color:#FF0033;"><span style="font-size:30px;">关停公告:</span><br>本产品感谢各位长久以来的选择与支持，现计划于2021年3月1日暂停服务运营，天卡周卡还可购买使用，月卡及以上套餐，请选择其他产品进行购买，服务暂停后，没到期的用户请及时申请退款！ <p class="youhuiNew" style="padding:0;margin:0;color:white;background-color:#99CC00;"><span style="font-size:30px;">恢复公告:</span><br>老鹰IP已恢复运营！已更新最新的IP池，产品稳定性也做了大幅度的升级！请下载使用最新版的客户端和IP线路表。<br>
祝各位用户万事顺利，生意兴隆，新年快乐！！</p> 为答谢各位对老鹰IP一直以来的选择和支持，特推出全部套餐8折狂欢价！ 祝各位用户万事顺利，生意兴隆！</p>
<p class="youhuiNew"></p> <p class="youhuiNew"></p>
} }
@if(defaultProduct.Id == 13){ @if(defaultProduct.Id == 13){

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

@@ -253,7 +253,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
if (userPrice != null && userPrice.UserPrice > 0) if (userPrice != null && userPrice.UserPrice > 0)
price = userPrice.UserPrice; price = userPrice.UserPrice;
if (ProductAccountCount == 0 && request.OrderType != OrderType.News && packageEntity.DayCount == 1 && packageEntity.ProductId!=5 && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ if (ProductAccountCount == 0 && request.OrderType != OrderType.News && packageEntity.DayCount == 1 && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){
price = 0.1M; price = 0.1M;
userEntity.ProductAccountCount = 1; userEntity.ProductAccountCount = 1;
await m_UserService.Update(userEntity); await m_UserService.Update(userEntity);