From 06e32328f7eb5cdec995994758ea533f398f4007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Sun, 11 Jun 2023 18:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Controllers/ProductController.cs | 77 +++--- Host/Views.Mobile/Home/Index.cshtml | 6 +- Host/Views.Mobile/Product/Index.cshtml | 10 +- Host/Views.Mobile/Product/Routeros.cshtml | 2 +- Host/Views.Mobile/Product/buy.cshtml | 8 +- Host/Views.Mobile/Product/rebuy.cshtml | 4 +- Host/Views.Mobile/User/IndexInfo.cshtml | 2 +- Host/Views/Home/Index.cshtml | 9 +- Host/Views/Product/Index.cshtml | 38 +-- Host/Views/Product/Routeros.cshtml | 3 +- Host/Views/Product/buy.cshtml | 4 +- Host/Views/Product/rebuy.cshtml | 2 +- Host/Views/User/Index.cshtml | 2 +- .../Service/ProductOrderService.cs | 252 +++++++++++++++++- 14 files changed, 339 insertions(+), 80 deletions(-) diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 6ee9f2e..3ae5c05 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -107,16 +107,19 @@ namespace Home.Controllers m.Price = dis_price; m.Title = discount.Remark; } else { - m.Title = "9.5"; - if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){ - m.Title = "8"; - } - if (m.ProductId == 18){ - m.Title = "8"; - } - if (m.ProductId == 6||m.ProductId == 5||m.ProductId == 23){ - m.Title = "9"; - } + m.Title = "9.5"; + if (m.ProductId == 1||m.ProductId == 2){ + m.Title = "7.5"; + } + if (m.ProductId == 18){ + m.Title = "7.5"; + } + if (m.ProductId == 6||m.ProductId == 5){ + m.Title = "9"; + } + if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){ + m.Title = "8"; + } } if(m.Price { m.Title = "9.5"; - if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){ - m.Title = "8"; - } - if (m.ProductId == 18){ - m.Title = "8"; - } - if (m.ProductId == 6||m.ProductId == 5||m.ProductId == 23){ - m.Title = "9"; - } + if (m.ProductId == 1||m.ProductId == 2){ + m.Title = "7.5"; + } + if (m.ProductId == 18){ + m.Title = "7.5"; + } + if (m.ProductId == 6||m.ProductId == 5){ + m.Title = "9"; + } + if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){ + m.Title = "8"; + } var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id && p.ProductId == m.ProductId); if (userPrice != null && userPrice.UserPrice > 0) @@ -160,15 +166,18 @@ namespace Home.Controllers { product.Packages.ForEach(m => { m.Title = "9.5"; - if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){ - m.Title = "8"; + if (m.ProductId == 1||m.ProductId == 2){ + m.Title = "7.5"; } if (m.ProductId == 18){ - m.Title = "8"; + m.Title = "7.5"; } - if (m.ProductId == 6||m.ProductId == 5||m.ProductId == 23){ + if (m.ProductId == 6||m.ProductId == 5){ m.Title = "9"; } + if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){ + m.Title = "8"; + } // if ((m.DayCount == 1||m.DayCount == 2) && m.Id != 1034&&m.Id != 1040 &&m.Id != 1079&&m.Id != 1073){ // m.Price = 0.1M; // } @@ -918,15 +927,18 @@ namespace Home.Controllers m.Title = discount.Remark; } else { m.Title = "9.5"; - if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){ - m.Title = "8"; + if (m.ProductId == 1||m.ProductId == 2){ + m.Title = "7.5"; } if (m.ProductId == 18){ - m.Title = "8"; + m.Title = "7.5"; } - if (m.ProductId == 6||m.ProductId == 5||m.ProductId == 23){ + if (m.ProductId == 6||m.ProductId == 5){ m.Title = "9"; } + if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){ + m.Title = "8"; + } } if(m.Price p.PackageId == m.Id); if (userPrice != null && userPrice.UserPrice > 0) { diff --git a/Host/Views.Mobile/Home/Index.cshtml b/Host/Views.Mobile/Home/Index.cshtml index c06564e..ce7b11b 100644 --- a/Host/Views.Mobile/Home/Index.cshtml +++ b/Host/Views.Mobile/Home/Index.cshtml @@ -331,11 +331,11 @@

所有IP产品已记录日志,均保留6个月以上

发现违法行为直接提交网监部门处理

-

聚IP虎年新春复工助力活动：

+

聚IP兔年新春复工助力活动：

@*

1.动态IP一毛钱一天，每用户限一次~

*@ -

1.新上蘑菇IP，天卡送天卡，周卡送3天，月卡送10天，双月卡送1个月，多买多送~

-

2.其他产品均有8折活动～

+

1.新上蘑菇IP，周卡送1天，月卡送5天，双月卡送1个月，多买多送~

+

2.其他产品均有7.5折活动～

3.需求5个以上可联系客服设置优惠折扣！

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index 5d5c3e1..915b619 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -59,12 +59,12 @@ } else if(item.Product.Id == 18) { } - else if(item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 13||item.Product.Id == 17||item.Product.Id == 19) { + else if(item.Product.Id == 1||item.Product.Id == 2) { } else if(item.Product.Id == 5) { @@ -72,9 +72,9 @@ @item.Product.Name9折 } - else if(item.Product.Id == 23) { + else if(item.Product.Id == 23||item.Product.Id == 13||item.Product.Id == 17) { } else if(item.Product.Id == 14) { diff --git a/Host/Views.Mobile/Product/Routeros.cshtml b/Host/Views.Mobile/Product/Routeros.cshtml index 99b2f94..ede3cc4 100644 --- a/Host/Views.Mobile/Product/Routeros.cshtml +++ b/Host/Views.Mobile/Product/Routeros.cshtml @@ -79,7 +79,7 @@
- + @* *@
diff --git a/Host/Views.Mobile/Product/buy.cshtml b/Host/Views.Mobile/Product/buy.cshtml index 8e4819f..de23403 100644 --- a/Host/Views.Mobile/Product/buy.cshtml +++ b/Host/Views.Mobile/Product/buy.cshtml @@ -199,10 +199,10 @@ 支付方式：
-
+ @*
-
+
*@
@@ -345,10 +345,10 @@ 支付方式：
-
+ @*
-
+
*@
diff --git a/Host/Views.Mobile/Product/rebuy.cshtml b/Host/Views.Mobile/Product/rebuy.cshtml index 92c066d..ec430a9 100644 --- a/Host/Views.Mobile/Product/rebuy.cshtml +++ b/Host/Views.Mobile/Product/rebuy.cshtml @@ -142,10 +142,10 @@ 支付方式：
-
+ @*
-
+
*@
diff --git a/Host/Views.Mobile/User/IndexInfo.cshtml b/Host/Views.Mobile/User/IndexInfo.cshtml index 860c40e..de425da 100644 --- a/Host/Views.Mobile/User/IndexInfo.cshtml +++ b/Host/Views.Mobile/User/IndexInfo.cshtml @@ -277,7 +277,7 @@ 支付方式： - 支付宝支付
+ @* 支付宝支付
*@ 微信支付 diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml index 0d60729..4b5372c 100644 --- a/Host/Views/Home/Index.cshtml +++ b/Host/Views/Home/Index.cshtml @@ -711,13 +711,16 @@

所有IP产品已记录日志,均保留6个月以上

发现违法行为直接提交网监部门处理

-

聚IP虎年新春复工助力活动：

+

聚IP兔年新春复工助力活动：

@*

1.动态IP一毛钱一天，每用户限一次~

*@ -

1.新上蘑菇IP，天卡送天卡，周卡送3天，月卡送10天，双月卡送1个月，多买多送~

-

2.其他产品均有8折活动～

+

1.新上蘑菇IP，周卡送1天，月卡送5天，双月卡送1个月，多买多送~

+

2.其他产品均有7.5折活动～

3.需求5个以上可联系客服设置优惠折扣！

+
+

因支付宝审核等问题，暂时无法进行支付宝支付、充值等功能，建议使用微信支付，如确实需要支付宝支付，请联系相关人员：17719092232（微信同号）

+

diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index ed23ee0..3e18999 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -202,7 +202,7 @@ height: 0px; border: 1.0rem solid #FF9933; border-right-color: transparent; - content: "8折+送 1 天"; + content: "7.5折+送 1 天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; } @@ -231,7 +231,7 @@ height: 0px; border: 1.0rem solid #FF9933; border-right-color: transparent; - content: "8折+送 5 天"; + content: "7.5折+送 5 天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; } @@ -260,7 +260,7 @@ height: 0px; border: 1.0rem solid #FF9933; border-right-color: transparent; - content: "8折+送 1 月"; + content: "7.5折+送 1 月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; } @@ -364,19 +364,19 @@ @foreach (var item in Model) { if(item.Product.Id == 18) { -

送@item.Product.Name8折
+
送@item.Product.Name7.5折
} else if(item.Product.Id == 6) {
@item.Product.Name9折
} - else if(item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 13||item.Product.Id == 17||item.Product.Id == 19) { -
@item.Product.Name8折
+ else if(item.Product.Id == 1||item.Product.Id == 2) { +
@item.Product.Name7.5折
} else if(item.Product.Id == 5) {
@item.Product.Name9折
} - else if(item.Product.Id == 23) { -
新@item.Product.Name9折
+ else if(item.Product.Id == 23||item.Product.Id == 13||item.Product.Id == 17) { +
@item.Product.Name8折
} else if(item.Product.Id == 14) {
@@ -414,6 +414,12 @@
静态IP
新@item.Product.Name
+ } + + else if(item.Product.Id == 25) { + @*
静态IP
*@ +
新@item.Product.Name
+ } else if(item.Product.Id == 23) {
新@item.Product.Name
@@ -481,7 +487,7 @@
} *@ @if(item.Product.Id == 13||item.Product.Id == 17){ -

本产品目前所有地区都屏蔽QQ微信

+

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

@*
周卡送1天，月卡送5天
（新开和续费都可参加，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）
新产品上线，全新IP池！

-

本产品目前所有地区都屏蔽QQ微信

+

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

@*
天天IP于8.6日已恢复，全新IP池，欢迎选购！
购买须知：本产品新开账号屏蔽QQ微信
购买需选择左侧天天产品类型

} - @if(item.Product.Id == 1){ -

本产品目前所有地区都屏蔽QQ微信

+ @if(item.Product.Id == 1 || item.Product.Id == 25){ +

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

@*
购买须知：本产品域名出现问题，点击查看服务器ip地址本产品目前所有地区都屏蔽QQ微信

+

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

@*
购买须知：本产品域名出现问题，点击查看服务器ip地址购买须知：本产品目前所有地区QQ微信仅限于登录游戏账号

+

购买须知：本产品目前所有地区QQ微信仅限于登录游戏账号 云南以及非大陆地区禁用

} @if(item.Product.Id == 5){ -

购买须知：本产品目前所有地区都屏蔽QQ微信

+

购买须知：本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

} @if(item.Product.Id == 19){ -

本产品目前所有地区都屏蔽QQ微信

+

本产品目前所有地区都屏蔽QQ微信 云南以及非大陆地区禁用

本产品为独享，每个账号对应一个宽带拨号，永不超载，保证了网速及稳定性。
使用时只需设置这个唯一的服务器：1.hhip.vip，在账号列表中点击切换地区即可任意组合自己需要的地区
切记一定要指定一下地区，不然会没有网络

@*
- + @* *@
@@ -388,6 +388,7 @@ document.forms['alipaysubmit'].submit(); @* window.location.href = '/user/rosorder'; *@ } else if (res.code == 3) { + alert("购买成功"); @* window.location.href = '/user/rosorder'; *@ } else { alert('付款失败！请联系客服！'); diff --git a/Host/Views/Product/buy.cshtml b/Host/Views/Product/buy.cshtml index 433187f..25b5581 100644 --- a/Host/Views/Product/buy.cshtml +++ b/Host/Views/Product/buy.cshtml @@ -237,7 +237,7 @@ 支付方式：
- + @* *@ @@ -401,7 +401,7 @@ 支付方式：
- + @* *@ diff --git a/Host/Views/Product/rebuy.cshtml b/Host/Views/Product/rebuy.cshtml index edae5f5..8a65bbe 100644 --- a/Host/Views/Product/rebuy.cshtml +++ b/Host/Views/Product/rebuy.cshtml @@ -181,7 +181,7 @@ 支付方式：
- + @* *@ diff --git a/Host/Views/User/Index.cshtml b/Host/Views/User/Index.cshtml index 012219b..7dcaa00 100644 --- a/Host/Views/User/Index.cshtml +++ b/Host/Views/User/Index.cshtml @@ -235,7 +235,7 @@
- 支付宝支付 + @* 支付宝支付 *@ 微信支付
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index c8699f0..b223294 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -118,6 +118,10 @@ FROM product_order where OrderState=20 or OrderState=90 or OrderState=40 or Orde public List Statistics(DateTime? bTime, DateTime? eTime, int ProductId) { string where = $" (OrderState=20 or OrderState=90 or OrderState=40 or OrderState=50 or OrderState=30) "; + // if (bTime.HasValue && eTime.HasValue) + // { + where += $"and UpdateTime>DATE_SUB(CURDATE(), INTERVAL 30 DAY) and UpdateTime'{bTime.Value.ToString("yyyy-MM-dd")}' and UpdateTime<'{eTime.Value.ToString("yyyy-MM-dd")}'"; @@ -235,14 +239,14 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, { return new ApiResult(ResultCode.C_INVALID_ERROR, "产品不存在或者下架"); } - if (productEntity.Status == 0) - { - return new ApiResult(ResultCode.C_INVALID_ERROR, "产品不存在或者下架"); - } - if (productEntity.Status == 0) - { - return new ApiResult(ResultCode.C_INVALID_ERROR, "服务不在线"); - } + // if (productEntity.Status == 0) + // { + // return new ApiResult(ResultCode.C_INVALID_ERROR, "产品不存在或者下架"); + // } + // if (productEntity.Status == 0) + // { + // return new ApiResult(ResultCode.C_INVALID_ERROR, "服务不在线"); + // } if (request.Account == request.Pwd) { @@ -310,7 +314,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, if (packageEntity.ProductId != 23 &&packageEntity.ProductId != 22 && ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ - price = 0.1M; + // price = 0.1M; userEntity.ProductAccountCount = 1; await m_UserService.Update(userEntity); } @@ -824,6 +828,236 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, } + /// + /// 处理成功的订单 + /// + /// + /// + public async Task ApiProcessOrderAccount(ProductOrderEntity order,string remark) + { + if (order.OrderState != OrderStatus.PayOk || order.Accounts == null) return; + + var isOk = true; + var accounts = order.Accounts.Split(',').ToList(); + accounts = accounts.Distinct().ToList(); + + var userEntity = await m_UserService.GetById(order.UserId); + var user_remark = ""; + + if(order.ProductId == 8||order.ProductId == 7) { + //用户信息 + user_remark = userEntity.Name.Substring(0,1) + "**" + userEntity.Phone.Substring(0,3) + "********" + userEntity.id_code.Substring(0,3)+"***************"; + + } + + if (order.OrderType == OrderType.New || order.OrderType == OrderType.News) + { + var accountEntitys = new List(); + + await accounts.ForEachAsync(async account => + { + var accountEntity = new ProductAccountEntity() + { + Account = account, + AccountType = (int)order.OrderType, + ConnectCount = order.ConnectCount, + StartTime = DateTime.Now, + EndTime = DateTime.Now.AddDays(order.DayCount), + PackageId = order.PackageId, + PackageName = order.PackageName, + ProductId = order.ProductId, + ProductName = order.ProductName, + Pwd = order.AccountPwd, + ChargeStatus = AccountChargeStatus.Normal, + UserId = order.UserId, + UserCode = order.UserName, + agent_id = order.agent_id, + UserPhone = order.Remark, + Remark = remark + }; + accountEntitys.Add(accountEntity); + }); + using (var tran2 = await m_DbContext.Database.BeginTransactionAsync()) + { + try + { + await m_ProductAccountService.Adds(accountEntitys); + order.OrderState = OrderStatus.Complete; + order.StartTime = DateTime.Now; + order.EndTime = DateTime.Now.AddDays(order.DayCount); + order.Remark = remark; + await this.Update(order); + tran2.Commit(); + } + catch (Exception ex) + { + LogHelper.Error("处理订单创建账号", ex); + isOk = false; + tran2.Rollback(); + } + } + if (isOk) + { + var accountError = ""; + await accountEntitys.ForEachAsync(async accountEntity => + { + + var ret = new ApiResult(); + if(accountEntity.PackageId.Value == 86 || accountEntity.PackageId.Value == 88){ + ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount,1,2); + } else if(accountEntity.ProductId.Value == 8 || accountEntity.ProductId.Value == 7){ + var account_remark = accountEntity.Account + "-" + user_remark; + ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, account_remark, accountEntity.Pwd, accountEntity.ConnectCount,1,2); + } else if (accountEntity.PackageId.Value > 1034 && accountEntity.PackageId.Value < 1040) { + ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount,2); + } + else if (accountEntity.PackageId.Value > 1040 && accountEntity.PackageId.Value < 1046) { + ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount,3); + } + else { + ret = await m_AgentService.NewAccount(order.Id, accountEntity.PackageId.Value, accountEntity.Account, accountEntity.Pwd, accountEntity.ConnectCount); + } + + if (ret.Code != ResultCode.C_SUCCESS) + { + accountEntity.ChargeStatus = AccountChargeStatus.Exception; + accountEntity.Remark = ret.Message; + await m_ProductAccountService.Update(accountEntity); + + } + else if (ret.Data != null && ret.Data.ToString().Has()) + { + accountEntity.Raw = ret.Data.ToString(); + await m_ProductAccountService.Update(accountEntity); + } + }); + if (accountError.Has()) + { + order.Remark = accountError; + await this.Update(order); + } + } + } + else if (order.OrderType == OrderType.AgainBuy || order.OrderType == OrderType.AgainBuys) + { + var accountEntitys = await m_ProductAccountService.Query(p => p.UserId == order.UserId && p.DeleteTag == 0 && p.ProductId == order.ProductId && accounts.Contains(p.Account)).ToListAsync(); + + accountEntitys = accountEntitys.Distinct(new AccountEntityEq()).ToList(); + + await accountEntitys.ForEachAsync(async account => + { + if (account.EndTime < DateTime.Now) + { + account.StartTime = DateTime.Now; + account.EndTime = DateTime.Now.AddDays(order.DayCount); + } + else + { + account.EndTime = account.EndTime.Value.AddDays(order.DayCount); + } + account.PackageId = order.PackageId; + account.PackageName = order.PackageName; + account.ProductId = order.ProductId; + account.ProductName = order.ProductName; + account.AccountType = (int)order.OrderType; + }); + using (var tran3 = await m_DbContext.Database.BeginTransactionAsync()) + { + try + { + await m_ProductAccountService.Update(accountEntitys); + order.OrderState = OrderStatus.Complete; + order.StartTime = DateTime.Now; + order.EndTime = DateTime.Now.AddDays(order.DayCount); + order.Remark = remark; + await this.Update(order); + tran3.Commit(); + } + catch (Exception ex) + { + LogHelper.Error("处理续费订单", ex); + isOk = false; + tran3.Rollback(); + } + } + if (isOk) + { + var accountError = ""; + var product = await m_ProductService.GetById(order.ProductId); + await accountEntitys.ForEachAsync(async accountEntity => + { + var account = accountEntity.Account; + // if (product.GroupNO == "g7") account = accountEntity.Raw; + var ret = new ApiResult(); + if (order.PackageId == 86){ + ret = await m_AgentService.ReNewAccount(order.Id, order.PackageId, account, order.ConnectCount,2); + } else { + ret = await m_AgentService.ReNewAccount(order.Id, order.PackageId, account, order.ConnectCount); + } + if (ret.Code != ResultCode.C_SUCCESS) + { + accountEntity.ChargeStatus = AccountChargeStatus.Exception; + accountEntity.Remark = ret.Message; + await m_ProductAccountService.Update(accountEntity); + accountError += $"{accountEntity.Account}{accountEntity.Remark},"; + } + }); + if (accountError.Has()) + { + order.Remark = accountError; + await this.Update(order); + } + } + } + + + 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 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; + + await m_AgentScoreService.Add(agnetScoreEntity); + await m_AgentUserService.Update(agentEntity); + } + + + } + + public async Task Refund(int userId, string account) {