From 63d2cecb18a8112795aa0a016f2a8f637fab5471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Thu, 3 Apr 2025 14:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=90=86=E8=BF=94?=
=?UTF-8?q?=E6=AC=BE=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Host/Views/Home/Index.cshtml | 6 +-
.../Service/ProductOrderService.cs | 77 ++++++++++---------
2 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index 4377a21..cc7d278 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -280,7 +280,7 @@
*手机号不是IP账号，请登录后开通IP账号*
-
+ 登录
还没有账号？立即注册
@@ -378,8 +378,8 @@
@if (user == null)
{
-
-
+ 注册
+ 登录
}
else
{
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index e6bf4cb..2009b26 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -858,6 +858,9 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
var discount = await m_ProductPriceSchemeService.GetById(agentEntity.discount_id);
var packageEntity = await m_ProductPackageService.GetById(order.PackageId);
var price = packageEntity.LinePrice * discount.discount / 100;
+ if (price < packageEntity.MinPrice) {
+ price = packageEntity.MinPrice;
+ }
score_money = order.PaymentAmount - order.ConnectCount * order.AccountCount * price;
}
@@ -1076,48 +1079,48 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel,
}
- if(order.agent_id != 0 && order.PaymentAmount != 0.1M){
- var agentEntity = await m_AgentUserService.Query(m => m.id == order.agent_id).FirstOrDefaultAsync();
+ // if(order.agent_id != 0 && order.PaymentAmount != 0.1M){
+ // var agentEntity = await m_AgentUserService.Query(m => m.id == order.agent_id).FirstOrDefaultAsync();
- //根据折扣设置价格
- var score_money = 0.00M;
- // if((userEntity.agent_id == 0||(userEntity.agent_id != 0 && userEntity.discount_id != 0)) && userEntity.discount_id >= 0){
- // //获取代理折扣
- // var discount = await m_ProductPriceSchemeService.GetById(agentEntity.discount_id);
- // var packageEntity = await m_ProductPackageService.GetById(order.PackageId);
- // var price = packageEntity.LinePrice * discount.discount / 100;
- // score_money = order.PaymentAmount - order.ConnectCount * order.AccountCount * price;
- // } else {
- // var agentPriceEntity = await m_AgentPriceService.Query(m => m.agent_id == order.agent_id && m.package_id == order.PackageId).FirstOrDefaultAsync();
- // score_money = order.PaymentAmount - order.ConnectCount * order.AccountCount * agentPriceEntity.price;
- // }
- if(agentEntity.discount_id != 0){
- //获取代理折扣
- var discount = await m_ProductPriceSchemeService.GetById(agentEntity.discount_id);
- var packageEntity = await m_ProductPackageService.GetById(order.PackageId);
- var price = packageEntity.LinePrice * discount.discount / 100;
- score_money = order.PaymentAmount - order.ConnectCount * order.AccountCount * price;
- }
+ // //根据折扣设置价格
+ // var score_money = 0.00M;
+ // // if((userEntity.agent_id == 0||(userEntity.agent_id != 0 && userEntity.discount_id != 0)) && userEntity.discount_id >= 0){
+ // // //获取代理折扣
+ // // var discount = await m_ProductPriceSchemeService.GetById(agentEntity.discount_id);
+ // // var packageEntity = await m_ProductPackageService.GetById(order.PackageId);
+ // // var price = packageEntity.LinePrice * discount.discount / 100;
+ // // score_money = order.PaymentAmount - order.ConnectCount * order.AccountCount * price;
+ // // } else {
+ // // var agentPriceEntity = await m_AgentPriceService.Query(m => m.agent_id == order.agent_id && m.package_id == order.PackageId).FirstOrDefaultAsync();
+ // // score_money = order.PaymentAmount - order.ConnectCount * order.AccountCount * agentPriceEntity.price;
+ // // }
+ // if(agentEntity.discount_id != 0){
+ // //获取代理折扣
+ // var discount = await m_ProductPriceSchemeService.GetById(agentEntity.discount_id);
+ // var packageEntity = await m_ProductPackageService.GetById(order.PackageId);
+ // var price = packageEntity.LinePrice * discount.discount / 100;
+ // score_money = order.PaymentAmount - order.ConnectCount * order.AccountCount * price;
+ // }
- var agnetScoreEntity = new AgentScoreEntity()
- {
- agent_id = order.agent_id,
- order_id = order.Id,
- score_type = 1,
- score_value = score_money,
- remark = "客户购买产品" + order.Accounts,
- agent_name = agentEntity.username,
- op_user = order.UserName,
- rest_amount1 = agentEntity.account,
- rest_amount2 = agentEntity.account + score_money
- };
+ // var agnetScoreEntity = new AgentScoreEntity()
+ // {
+ // agent_id = order.agent_id,
+ // order_id = order.Id,
+ // score_type = 1,
+ // score_value = score_money,
+ // remark = "客户购买产品" + order.Accounts,
+ // agent_name = agentEntity.username,
+ // op_user = order.UserName,
+ // rest_amount1 = agentEntity.account,
+ // rest_amount2 = agentEntity.account + score_money
+ // };
- agentEntity.account += score_money;
+ // agentEntity.account += score_money;
- await m_AgentScoreService.Add(agnetScoreEntity);
- await m_AgentUserService.Update(agentEntity);
- }
+ // await m_AgentScoreService.Add(agnetScoreEntity);
+ // await m_AgentUserService.Update(agentEntity);
+ // }
}