From 57bac48c78c8eb0e67143fc67a7a85ab8d378865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Fri, 19 Feb 2021 15:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=81=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=90=86=E5=95=86=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Services/Hncore.Pass.Vpn/Domain/ProductAccountEntity.cs | 1 + Services/Hncore.Pass.Vpn/Domain/ProductOrderEntity.cs | 2 +- Services/Hncore.Pass.Vpn/Domain/UserEntity.cs | 1 + Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Services/Hncore.Pass.Vpn/Domain/ProductAccountEntity.cs b/Services/Hncore.Pass.Vpn/Domain/ProductAccountEntity.cs index d9ea1c8..7ee8f6b 100644 --- a/Services/Hncore.Pass.Vpn/Domain/ProductAccountEntity.cs +++ b/Services/Hncore.Pass.Vpn/Domain/ProductAccountEntity.cs @@ -49,5 +49,6 @@ namespace Hncore.Pass.Vpn.Domain } public string Raw { get; set; } + public int agent_id {get; set;} } } diff --git a/Services/Hncore.Pass.Vpn/Domain/ProductOrderEntity.cs b/Services/Hncore.Pass.Vpn/Domain/ProductOrderEntity.cs index c09e753..2b43e75 100644 --- a/Services/Hncore.Pass.Vpn/Domain/ProductOrderEntity.cs +++ b/Services/Hncore.Pass.Vpn/Domain/ProductOrderEntity.cs @@ -51,7 +51,7 @@ namespace Hncore.Pass.Vpn.Domain public decimal? BackAmount { get; set; } = 0; public string RefundReason { get; set; } - + public int agent_id {get; set;} } } diff --git a/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs b/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs index 5e7d79e..15cf00f 100644 --- a/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs +++ b/Services/Hncore.Pass.Vpn/Domain/UserEntity.cs @@ -78,6 +78,7 @@ namespace Hncore.Pass.Vpn.Domain public int? ManagerId { get; set; } = 0; public string ManagerName { get; set; } public int is_verify { get; set; } + public int agent_id {get; set;} } } \ No newline at end of file diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index 927a490..b7b1c74 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -270,7 +270,8 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, EndTime = DateTime.Now.AddDays(packageEntity.DayCount), PayChannel = request.PayChannel, Channel = request.Channel, - IsAutoRefund = productEntity.AutoRefund + IsAutoRefund = productEntity.AutoRefund, + agent_id = userEntity.agent_id }; if (request.OrderType == OrderType.New || request.OrderType == OrderType.AgainBuy) { @@ -534,6 +535,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, ChargeStatus = AccountChargeStatus.Normal, UserId = order.UserId, UserCode = order.UserName, + agent_id = order.agent_id }; accountEntitys.Add(accountEntity); });