From f0b4a741b5aa14be30011446fe949f315186c5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 26 Mar 2021 16:59:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81=E9=B9=B0=E4=BA=A7=E5=93=81=E6=96=B0?=
=?UTF-8?q?=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Host/Controllers/ProductController.cs | 6 +++---
Host/Views.Mobile/Product/Index.cshtml | 4 ++--
Host/Views/Product/Index.cshtml | 10 +++++-----
Host/Views/Product/ReBuyIndex.cshtml | 4 ++--
.../Hncore.Pass.Vpn/Service/ProductOrderService.cs | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs
index 519f0aa..0a259a6 100644
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -97,7 +97,7 @@ namespace Home.Controllers
{
m.Price = userPrice.UserPrice;
}
- if (ProductAccountCount == 0 && m.DayCount == 1 && m.ProductId!=5){
+ if (ProductAccountCount == 0 && m.DayCount == 1){
m.Price = 0.1M;
}
});
@@ -106,7 +106,7 @@ namespace Home.Controllers
foreach(var product in respList)
{
product.Packages.ForEach(m => {
- if ( m.DayCount == 1 && m.ProductId!=5){
+ if ( m.DayCount == 1 ){
m.Price = 0.1M;
}
});
@@ -681,7 +681,7 @@ namespace Home.Controllers
{
package.Price = userPrice.UserPrice;
}
- if (ProductAccountCount == 0 && package.DayCount == 1 && package.ProductId!=5){
+ if (ProductAccountCount == 0 && package.DayCount == 1){
package.Price = 0.1M;
}
diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index bfcaf26..812bf06 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -39,12 +39,12 @@
@item.Product.Name送一月
}
- 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 ) {
@item.Product.Name抄底价
}
- else if(item.Product.Id == 18) {
+ else if(item.Product.Id == 18|| item.Product.Id == 5) {
新@item.Product.Name抄低价
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index ffe0967..dd9a0cd 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -497,11 +497,11 @@
@if(item.Product.Id == 13){
@item.Product.Name 送一月
}
- 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) {
@item.Product.Name 抄底价
}
- else if(item.Product.Id == 18) {
- 新@item.Product.Name 抄低价
+ else if(item.Product.Id == 18|| item.Product.Id == 5) {
+ 新@item.Product.Name 抄底价
}
else if(item.Product.Id == 17) {
新@item.Product.Name 送一月
@@ -555,8 +555,8 @@
一毛钱活动：不分新老用户都可参加！
@if(item.Product.Id == 5){
- 关停公告:
本产品感谢各位长久以来的选择与支持，现计划于2021年3月1日暂停服务运营，天卡周卡还可购买使用，月卡及以上套餐，请选择其他产品进行购买，服务暂停后，没到期的用户请及时申请退款！
-祝各位用户万事顺利，生意兴隆，新年快乐！！
+ 恢复公告:
老鹰IP已恢复运营！已更新最新的IP池，产品稳定性也做了大幅度的升级！请下载使用最新版的客户端和IP线路表。
+为答谢各位对老鹰IP一直以来的选择和支持，特推出全部套餐8折狂欢价！ 祝各位用户万事顺利，生意兴隆！
}
@if(item.Product.Id == 13){
diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml
index 5b420ce..07e08b6 100644
--- a/Host/Views/Product/ReBuyIndex.cshtml
+++ b/Host/Views/Product/ReBuyIndex.cshtml
@@ -303,8 +303,8 @@
} *@
@if(defaultProduct.Id == 5){
- 关停公告:
本产品感谢各位长久以来的选择与支持，现计划于2021年3月1日暂停服务运营，天卡周卡还可购买使用，月卡及以上套餐，请选择其他产品进行购买，服务暂停后，没到期的用户请及时申请退款！
-祝各位用户万事顺利，生意兴隆，新年快乐！！
+ 恢复公告:
老鹰IP已恢复运营！已更新最新的IP池，产品稳定性也做了大幅度的升级！请下载使用最新版的客户端和IP线路表。
+为答谢各位对老鹰IP一直以来的选择和支持，特推出全部套餐8折狂欢价！ 祝各位用户万事顺利，生意兴隆！
}
@if(defaultProduct.Id == 13){
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 28e6887..1f2ceca 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -253,7 +253,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
if (userPrice != null && userPrice.UserPrice > 0)
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;
userEntity.ProductAccountCount = 1;
await m_UserService.Update(userEntity);