From 25e577ec8240a3a3114453b658e2db91be7a8b0c Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Mon, 19 Oct 2020 17:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/LineListController.cs                        | 2 +-
 Host/Views/Home/Index.cshtml                                  | 2 +-
 Host/Views/Product/Soft.cshtml                                | 2 +-
 Services/Hncore.Pass.Vpn/Controllers/ProductController.cs     | 4 ++--
 Services/Hncore.Pass.Vpn/Service/AgentService.cs              | 2 +-
 .../Hncore.Pass.Vpn/Service/ProductPriceDiscountService.cs    | 2 +-
 Services/Hncore.Pass.Vpn/Service/ProductService.cs            | 2 +-
 Services/Hncore.Pass.Vpn/Service/ProductUserPriceService.cs   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Host/Controllers/LineListController.cs b/Host/Controllers/LineListController.cs
index 762a186..45b481f 100644
--- a/Host/Controllers/LineListController.cs
+++ b/Host/Controllers/LineListController.cs
@@ -52,7 +52,7 @@ namespace Home.Controllers
             var ret = await m_ProductRouteService.Query(exp).OrderBy(m=>m.Sort).ToListAsync();
 
 
-            var products = await m_ProductService.Query(m=>m.OnLine == 1).ToListAsync();
+            var products = await m_ProductService.Query(m=>m.OnLine == 1).OrderBy(m=>m.Sort).ToListAsync();
             ViewData["products"] = products;
             return View(ret);
         }
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index d08f0e3..2193f94 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -416,7 +416,7 @@
         <p class="chanpinText">温馨提示：在国外，香港，台湾，澳门，城市使用不稳定；移动网络，长城宽带以及校园网使用会不稳定，因此不建议亲使用哦</p>
         <div class="container-fluid d2">
             <ul class="newProduct">
-                @foreach (var item in Model.Where(m => m.Sort != 1000))
+                @foreach (var item in Model.Where(m => m.Sort != 1000).OrderBy(m => m.Sort))
                 {
                     <li>
 
diff --git a/Host/Views/Product/Soft.cshtml b/Host/Views/Product/Soft.cshtml
index 135c9a1..85a6809 100644
--- a/Host/Views/Product/Soft.cshtml
+++ b/Host/Views/Product/Soft.cshtml
@@ -25,7 +25,7 @@
 
 <div class="container">
     <div class="soft">
-        @foreach (var item in Model.Where(m=>m.Sort!=1000))
+        @foreach (var item in Model.Where(m=>m.Sort!=1000).OrderBy(m => m.Sort))
         {
             <div class="sitem">
                 <div class="smodel">
diff --git a/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs b/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
index 2f7b68f..ea12b0a 100644
--- a/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
+++ b/Services/Hncore.Pass.Vpn/Controllers/ProductController.cs
@@ -134,7 +134,7 @@ namespace Hncore.Pass.Vpn.Controllers
             {
                 expr = expr.And(m => m.Name.Contains(request.KeyWord));
             }
-            var ret = await m_ProductService.Page(request.PageIndex, request.PageSize, expr,true);
+            var ret = await m_ProductService.PageAsc(request.PageIndex, request.PageSize, expr,true,m=>m.Sort);
             var data = ret.ToApiResult();
             return data;
         }
@@ -147,7 +147,7 @@ namespace Hncore.Pass.Vpn.Controllers
             {
                 expr = expr.And(m => m.Name.Contains(request.KeyWord));
             }
-            var ret = await m_ProductService.Page(request.PageIndex, request.PageSize, expr, true);
+            var ret = await m_ProductService.PageAsc(request.PageIndex, request.PageSize, expr, true,m=>m.Sort);
             var data = ret.ToApiResult();
             return data;
         }
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentService.cs b/Services/Hncore.Pass.Vpn/Service/AgentService.cs
index 9b20e20..411a516 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentService.cs
@@ -62,7 +62,7 @@ namespace Hncore.Pass.Vpn.Service
         }
         public async Task RefrushAllStatus()
         {
-            var products = await m_ProductService.Query(false).ToListAsync();
+            var products = await m_ProductService.Query(false).OrderBy(m=>m.Sort).ToListAsync();
 
             await products.ForEachAsync(async m =>
             {
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductPriceDiscountService.cs b/Services/Hncore.Pass.Vpn/Service/ProductPriceDiscountService.cs
index 0b84e97..3cadaf6 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductPriceDiscountService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductPriceDiscountService.cs
@@ -26,7 +26,7 @@ namespace Hncore.Pass.Vpn.Service
 
         public async Task<List<ProductWithPriceDiscountResponse>> GetPriceDiscount(int schemeId)
         {
-            var products = await m_ProductService.Query(true).ToListAsync();
+            var products = await m_ProductService.Query(true).OrderBy(m=>m.Sort).ToListAsync();
 
             var packages = m_ProductPackageService.Query(true);
             var priceDiscount = this.Query(m => m.SchemeId == schemeId);
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductService.cs b/Services/Hncore.Pass.Vpn/Service/ProductService.cs
index c151031..19ccfd7 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductService.cs
@@ -48,7 +48,7 @@ namespace Hncore.Pass.Vpn.Service
 
         public async Task<List<ProductWithPackageResponse>> ProductWithPackage(int online=1)
         {
-            var products = await this.Query(m => m.Sort != 1000).Where(m=>m.OnLine==online).ToListAsync();
+            var products = await this.Query(m => m.Sort != 1000).OrderBy(m=>m.Sort).Where(m=>m.OnLine==online).ToListAsync();
             var packages = await m_ProductPackageService.Query(true).ToListAsync();
 
             List<ProductWithPackageResponse> respList = new List<ProductWithPackageResponse>();
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductUserPriceService.cs b/Services/Hncore.Pass.Vpn/Service/ProductUserPriceService.cs
index 8f5575d..06ccc60 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductUserPriceService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductUserPriceService.cs
@@ -26,7 +26,7 @@ namespace Hncore.Pass.Vpn.Service
 
         public async Task<List<ProductWithPackageUserPriceResponse>> GetPackageUserPrice(int userId)
         {
-            var products = await m_ProductService.Query(true).ToListAsync();
+            var products = await m_ProductService.Query(true).OrderBy(m=>m.Sort).ToListAsync();
 
             var packages = m_ProductPackageService.Query(true);
             var userPrice = this.Query(m => m.UserId == userId);