From 4a26831eb134114997602482abcc6dfc2b942a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Wed, 2 Jun 2021 16:59:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E9=A2=86=E4=B8=8E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ProductController.cs                | 13 +++++++++++--
 .../Controllers/ProductOrderController.cs           |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
index 12f66ef..2fa70a4 100644
--- a/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
+++ b/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
@@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using UserService = Hncore.Pass.Vpn.Service.UserService;
 
 namespace Hncore.Pass.Vpn.Controllers
 {
@@ -19,12 +20,14 @@ namespace Hncore.Pass.Vpn.Controllers
     public class ProductController : HncoreControllerBase
     {
         private ProductService m_ProductService;
+        private UserService m_UserService;
         private ProductPackageService m_ProductPackageService;
         private ProductUserPriceService m_ProductUserPriceService;
-        public ProductController(ProductService _ProductServic, ProductPackageService _ProductPackageService, ProductUserPriceService m_ProductUserPriceService)
+        public ProductController(UserService _UserService,ProductService _ProductServic, ProductPackageService _ProductPackageService, ProductUserPriceService m_ProductUserPriceService)
         {
             m_ProductService = _ProductServic;
             m_ProductPackageService = _ProductPackageService;
+            m_UserService = _UserService;
             this.m_ProductUserPriceService = m_ProductUserPriceService;
         }
 
@@ -203,6 +206,10 @@ namespace Hncore.Pass.Vpn.Controllers
             {
                 return Error("请设置会员价");
             }
+            var userEntity = await m_UserService.Query(m => m.Id==userPriceEntity.UserId).FirstOrDefaultAsync();
+            userEntity.discount_id = -1;
+            await m_UserService.Update(userEntity);
+
             userPriceEntity.Status = userPriceEntity.Status == 0 ? 1 : 0;
             await m_ProductUserPriceService.Update(userPriceEntity);
             return Success(userPriceEntity.Status);
@@ -232,7 +239,9 @@ namespace Hncore.Pass.Vpn.Controllers
         public async Task<ApiResult> PutUserPrice([FromBody]PutUserPriceRequest request)
         {
             var userPriceEntity = await m_ProductUserPriceService.Query(m => m.PackageId == request.PackageId && m.UserId == request.UserId).FirstOrDefaultAsync();
-
+            var userEntity = await m_UserService.Query(m => m.Id==request.UserId).FirstOrDefaultAsync();
+            userEntity.discount_id = -1;
+            await m_UserService.Update(userEntity);
             var price = request.UserPrice;
             var packageEntity =await m_ProductPackageService.GetById(request.PackageId);
           //  var product = await m_ProductService.GetById(packageEntity.ProductId);
diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
index 0e22894..45c3c6e 100644
--- a/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
+++ b/Services/Hncore.Pass.Vpn/Controllers/ProductOrderController.cs
@@ -560,7 +560,7 @@ namespace Hncore.Pass.Vpn.Controllers
                  && string.IsNullOrEmpty(m.Channel))
                 .OrderByDescending(m => m.Id)
                 .ToListAsync();
-            var data = datas.Where(m => (DateTime.Now - m.UpdateTime).TotalMinutes < 30).FirstOrDefault();
+            var data = datas.Where(m => (DateTime.Now - m.UpdateTime).TotalMinutes < 60).FirstOrDefault();
             if (data != null)
             {
                 data.Channel = manager.LoginName;