From 908a31cc089861acd652e0c3793025974e615bfd Mon Sep 17 00:00:00 2001
From: liuyangyi <liuyangyi123@outlook.com>
Date: Sat, 25 May 2024 19:12:56 +0800
Subject: [PATCH 1/4] bug fixd

---
 .../Controllers/Front/TestController.cs       | 26 +++++++++----------
 New_College.Model/Models/D_MyHistoryInfo.cs   |  2 +-
 New_College.Model/Models/D_UserSettingBase.cs |  2 +-
 .../Models/Test_PsychMeasurementInfo.cs       |  2 +-
 New_College.Model/Models/V_SubjectSelect.cs   |  2 +-
 New_College.Model/ViewModels/BaseResult.cs    |  2 +-
 .../ViewModels/Query/CategoryInfoQuery.cs     |  2 +-
 .../ViewModels/Query/PsychMeasurementQuery.cs |  6 ++---
 .../ViewModels/Query/SubjectSelectQuery.cs    |  2 +-
 .../ViewModels/UserSettingBaseRequest.cs      |  4 +--
 10 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/New_College.Api/Controllers/Front/TestController.cs b/New_College.Api/Controllers/Front/TestController.cs
index 9622d07..61ca41f 100644
--- a/New_College.Api/Controllers/Front/TestController.cs
+++ b/New_College.Api/Controllers/Front/TestController.cs
@@ -75,7 +75,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+     
         public async Task<MessageModel<CategoryStatusResult>> GetTestStatus([FromQuery] CategoryStatusQuery query)
         {
             var result = await test_CategoryInfoServices.GetTestStatus(query);
@@ -93,7 +93,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+      
         public async Task<MessageModel<List<appQuestionResult>>> GetQuestion([FromQuery] appQuestionQuery query)
         {
             var result = await test_QuestionInfoServices.GetQuestion(query);
@@ -110,7 +110,7 @@ namespace New_College.Api.Controllers.Front
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+      
         public async Task<MessageModel<List<QuestionMBTI>>> GetQuestionMBTI()
         {
             var result = await test_QuestionInfoServices.GetQuestionMBTI();
@@ -127,7 +127,7 @@ namespace New_College.Api.Controllers.Front
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [Authorize]
+       
         public async Task<MessageModel<bool>> SavePsych([FromBody] SavePsychQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.SavePsych(query);
@@ -145,7 +145,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-        [Authorize]
+    
         public async Task<MessageModel<bool>> SaveHolland(SaveHollandQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.SaveHolland(query);
@@ -181,7 +181,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+    
         public async Task<MessageModel<TagtestingHollandResult>> GetHollandResult([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetHollandResult(query);
@@ -200,7 +200,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+      
         public async Task<MessageModel<HollandOccupDetail>> GetHollandOccupDetail([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetHollandOccupDetail(query);
@@ -239,7 +239,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+       
         public async Task<MessageModel<UserResult>> GetMBTIResult([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetMBTIResult(query);
@@ -258,7 +258,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+      
         public async Task<MessageModel<SubjectEvBillDTO>> SubjectChartRadar([FromQuery] ResultLookQuery query)
         {
             return await test_PsychMeasurementInfoServices.SubjectChartRadar(query);
@@ -270,7 +270,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+      
         public async Task<MessageModel<string>> GetHollandStatus([FromQuery] IdQuery query)
         {
             return await test_PsychMeasurementInfoServices.GetHollandStatus(query);
@@ -282,7 +282,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+      
         public async Task<MessageModel<bool>> GetSubjectSelectStatus([FromQuery] IdQuery query)
         {
             return await test_PsychMeasurementInfoServices.GetSubjectSelectStatus(query);
@@ -295,7 +295,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+       
         public async Task<MessageModel<string>> GetSubjectSelect([FromQuery] IdQuery query)
         {
             return await v_SubjectSelectServices.GetSubjectSelect(query);
@@ -307,7 +307,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-        [Authorize]
+     
         public async Task<MessageModel<bool>> SaveSubjectSelect([FromBody] SubjectSelectQuery query)
         {
             return await v_SubjectSelectServices.SaveSubjectSelect(query);
diff --git a/New_College.Model/Models/D_MyHistoryInfo.cs b/New_College.Model/Models/D_MyHistoryInfo.cs
index 13b4156..06a4104 100644
--- a/New_College.Model/Models/D_MyHistoryInfo.cs
+++ b/New_College.Model/Models/D_MyHistoryInfo.cs
@@ -13,7 +13,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 记录Id
         /// </summary>
-        public int UId { get; set; }
+        public long UId { get; set; }
 
         /// <summary>
         /// 
diff --git a/New_College.Model/Models/D_UserSettingBase.cs b/New_College.Model/Models/D_UserSettingBase.cs
index 975919e..9d14d95 100644
--- a/New_College.Model/Models/D_UserSettingBase.cs
+++ b/New_College.Model/Models/D_UserSettingBase.cs
@@ -14,7 +14,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
         /// <summary>
         /// 0-pc,1-minpro
         /// </summary>
diff --git a/New_College.Model/Models/Test_PsychMeasurementInfo.cs b/New_College.Model/Models/Test_PsychMeasurementInfo.cs
index 2d236e1..6d44fb5 100644
--- a/New_College.Model/Models/Test_PsychMeasurementInfo.cs
+++ b/New_College.Model/Models/Test_PsychMeasurementInfo.cs
@@ -13,7 +13,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 学生Id
         /// </summary>
-        public int StudentId { get; set; }
+        public long StudentId { get; set; }
 
         /// <summary>
         /// 周期Id
diff --git a/New_College.Model/Models/V_SubjectSelect.cs b/New_College.Model/Models/V_SubjectSelect.cs
index f54b51f..18364f1 100644
--- a/New_College.Model/Models/V_SubjectSelect.cs
+++ b/New_College.Model/Models/V_SubjectSelect.cs
@@ -9,7 +9,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         /// <summary>
         /// 逗号隔开
diff --git a/New_College.Model/ViewModels/BaseResult.cs b/New_College.Model/ViewModels/BaseResult.cs
index b938d75..4a12660 100644
--- a/New_College.Model/ViewModels/BaseResult.cs
+++ b/New_College.Model/ViewModels/BaseResult.cs
@@ -18,7 +18,7 @@ namespace New_College.Model.ViewModels
 
     public class IdQuery
     {
-        public int? CustomerId { get; set; }
+        public long? CustomerId { get; set; }
         public int Id { get; set; }
 
         public List<int> Ids { get; set; }
diff --git a/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs b/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs
index 879481d..42a5953 100644
--- a/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs
+++ b/New_College.Model/ViewModels/Query/CategoryInfoQuery.cs
@@ -25,6 +25,6 @@ namespace New_College.Model.ViewModels
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
     }
 }
diff --git a/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs b/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs
index bd275be..ec28108 100644
--- a/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs
+++ b/New_College.Model/ViewModels/Query/PsychMeasurementQuery.cs
@@ -17,7 +17,7 @@ namespace New_College.Model.ViewModels
     {
         public int CategoryId { get; set; }
 
-        public int StudentId { get; set; }
+        public long StudentId { get; set; }
 
 
         public string Tags { get; set; }
@@ -32,7 +32,7 @@ namespace New_College.Model.ViewModels
 
         public int CategoryId { get; set; }
 
-        public int StudentId { get; set; }
+        public long StudentId { get; set; }
 
         public int CycleTimeId { get; set; }
 
@@ -92,7 +92,7 @@ namespace New_College.Model.ViewModels
 
     public class ResultLookQuery
     {
-        public int StudentId { get; set; }
+        public long StudentId { get; set; }
 
         public int CategoryId { get; set; }
 
diff --git a/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs b/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs
index 7eb1e7c..1c10b84 100644
--- a/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs
+++ b/New_College.Model/ViewModels/Query/SubjectSelectQuery.cs
@@ -9,7 +9,7 @@ namespace New_College.Model.ViewModels
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         /// <summary>
         /// 逗号隔开
diff --git a/New_College.Model/ViewModels/UserSettingBaseRequest.cs b/New_College.Model/ViewModels/UserSettingBaseRequest.cs
index bed9f95..e8acf40 100644
--- a/New_College.Model/ViewModels/UserSettingBaseRequest.cs
+++ b/New_College.Model/ViewModels/UserSettingBaseRequest.cs
@@ -8,7 +8,7 @@ namespace New_College.Model.ViewModels
 {
     public class UserSettingBaseRequest
     {
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
     }
 
@@ -43,7 +43,7 @@ namespace New_College.Model.ViewModels
 
     public class UserBaseSettingDto
     {
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
         /// <summary>
         /// 0-pc,1-minpro
         /// </summary>

From 2334f3a8f64844dc2c3490fdc7596cd7188a0b92 Mon Sep 17 00:00:00 2001
From: liuyangyi <liuyangyi123@outlook.com>
Date: Sat, 25 May 2024 22:34:39 +0800
Subject: [PATCH 2/4] aaa

---
 New_College.Model/ViewModels/Query/EvaluationRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/New_College.Model/ViewModels/Query/EvaluationRequest.cs b/New_College.Model/ViewModels/Query/EvaluationRequest.cs
index d89a59c..d504230 100644
--- a/New_College.Model/ViewModels/Query/EvaluationRequest.cs
+++ b/New_College.Model/ViewModels/Query/EvaluationRequest.cs
@@ -6,6 +6,6 @@ namespace New_College.Model.ViewModels.Query
 {
     public class EvaluationRequest
     {
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
     }
 }

From 3aa8cf9badc88b9fab22ba805f98365f3d9e37e4 Mon Sep 17 00:00:00 2001
From: liuyangyi <liuyangyi123@outlook.com>
Date: Sun, 26 May 2024 00:27:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Front/TestController.cs       | 44 +++++++++----------
 .../ITest_PsychMeasurementInfoServices.cs     |  5 ++-
 .../Test_PsychMeasurementInfoServices.cs      | 18 ++++----
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/New_College.Api/Controllers/Front/TestController.cs b/New_College.Api/Controllers/Front/TestController.cs
index e425649..5676ce3 100644
--- a/New_College.Api/Controllers/Front/TestController.cs
+++ b/New_College.Api/Controllers/Front/TestController.cs
@@ -75,7 +75,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-     
+
         public async Task<MessageModel<CategoryStatusResult>> GetTestStatus([FromQuery] CategoryStatusQuery query)
         {
             var result = await test_CategoryInfoServices.GetTestStatus(query);
@@ -125,15 +125,15 @@ namespace New_College.Api.Controllers.Front
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-       
-        public async Task<MessageModel<bool>> SavePsych([FromBody] SavePsychQuery query)
+
+        public async Task<MessageModel<int>> SavePsych([FromBody] SavePsychQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.SavePsych(query);
-            return new MessageModel<bool>()
+            return new MessageModel<int>()
             {
-                success = result,
-                msg = result == true ? "提交成功" : "提交失败",
-                response = result
+                success = result.Item2,
+                msg = result.Item2 == true ? "提交成功" : "提交失败",
+                response = result.Item1
             };
         }
 
@@ -143,15 +143,15 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-    
-        public async Task<MessageModel<bool>> SaveHolland(SaveHollandQuery query)
+
+        public async Task<MessageModel<int>> SaveHolland(SaveHollandQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.SaveHolland(query);
-            return new MessageModel<bool>()
+            return new MessageModel<int>()
             {
-                success = result,
-                msg = result == true ? "提交成功" : "提交失败",
-                response = result
+                success = result.Item2,
+                msg = result.Item2 ? "提交成功" : "提交失败",
+                response = result.Item1
             };
         }
 
@@ -179,7 +179,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-    
+
         public async Task<MessageModel<TagtestingHollandResult>> GetHollandResult([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetHollandResult(query);
@@ -198,7 +198,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-      
+
         public async Task<MessageModel<HollandOccupDetail>> GetHollandOccupDetail([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetHollandOccupDetail(query);
@@ -237,7 +237,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-       
+
         public async Task<MessageModel<UserResult>> GetMBTIResult([FromQuery] ResultLookQuery query)
         {
             var result = await test_PsychMeasurementInfoServices.GetMBTIResult(query);
@@ -256,7 +256,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-      
+
         public async Task<MessageModel<SubjectEvBillDTO>> SubjectChartRadar([FromQuery] ResultLookQuery query)
         {
             return await test_PsychMeasurementInfoServices.SubjectChartRadar(query);
@@ -268,7 +268,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-      
+
         public async Task<MessageModel<string>> GetHollandStatus([FromQuery] IdQuery query)
         {
             return await test_PsychMeasurementInfoServices.GetHollandStatus(query);
@@ -280,7 +280,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-      
+
         public async Task<MessageModel<bool>> GetSubjectSelectStatus([FromQuery] IdQuery query)
         {
             return await test_PsychMeasurementInfoServices.GetSubjectSelectStatus(query);
@@ -293,7 +293,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-       
+
         public async Task<MessageModel<string>> GetSubjectSelect([FromQuery] IdQuery query)
         {
             return await v_SubjectSelectServices.GetSubjectSelect(query);
@@ -305,7 +305,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-     
+
         public async Task<MessageModel<bool>> SaveSubjectSelect([FromBody] SubjectSelectQuery query)
         {
             return await v_SubjectSelectServices.SaveSubjectSelect(query);
@@ -355,7 +355,7 @@ namespace New_College.Api.Controllers.Front
         /// <returns></returns>
         [HttpGet]
         //[Authorize]
-        public async Task<MessageModel<string>> GetHollandSubject([FromQuery]HollandSubjectQuery query)
+        public async Task<MessageModel<string>> GetHollandSubject([FromQuery] HollandSubjectQuery query)
         {
             return await test_PsychMeasurementInfoServices.GetHollandSubject(query);
         }
diff --git a/New_College.IServices/ITest_PsychMeasurementInfoServices.cs b/New_College.IServices/ITest_PsychMeasurementInfoServices.cs
index 2d82e5d..a4c3dde 100644
--- a/New_College.IServices/ITest_PsychMeasurementInfoServices.cs
+++ b/New_College.IServices/ITest_PsychMeasurementInfoServices.cs
@@ -4,6 +4,7 @@ using New_College.Model.Models;
 using New_College.Model.ViewModels;
 using New_College.Model.ViewModels.Query;
 using New_College.Model.ViewModels.Result;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -16,11 +17,11 @@ namespace New_College.IServices
     {
         Task<List<PsychMeasurementListResult>> GetPsychListByCateAndCustomerId(PsychMeasurementQuery query);
 
-        Task<bool> SavePsych(SavePsychQuery query);
+        Task<Tuple<int, bool>> SavePsych(SavePsychQuery query);
 
         Task<ShowPsychologicalResult> GetPsychDetail(ResultLookQuery query);
 
-        Task<bool> SaveHolland(SaveHollandQuery query);
+        Task<Tuple<int, bool>> SaveHolland(SaveHollandQuery query);
 
         Task<HollandOccupDetail> GetHollandOccupDetail(ResultLookQuery query);
 
diff --git a/New_College.Services/Test_PsychMeasurementInfoServices.cs b/New_College.Services/Test_PsychMeasurementInfoServices.cs
index 1db0336..304363f 100644
--- a/New_College.Services/Test_PsychMeasurementInfoServices.cs
+++ b/New_College.Services/Test_PsychMeasurementInfoServices.cs
@@ -97,7 +97,7 @@ namespace New_College.Services
         /// 提交
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> SavePsych(SavePsychQuery query)
+        public async Task<Tuple<int, bool>> SavePsych(SavePsychQuery query)
         {
             var IsOpen = 1;
             var result = "";
@@ -161,11 +161,11 @@ namespace New_College.Services
                 //    UpdateGrow(query.CareerResult, query.CycleTimeId, query.CategoryId, query.StudentId);
                 //    #endregion
                 //}
-                return true;
+                return new Tuple<int, bool>(info, info > 0);
             }
             else
             {
-                return false;
+                return new Tuple<int, bool>(0, false);
             }
         }
 
@@ -404,7 +404,7 @@ namespace New_College.Services
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public async Task<bool> SaveHolland(SaveHollandQuery query)
+        public async Task<Tuple<int, bool>> SaveHolland(SaveHollandQuery query)
         {
             StringBuilder tagname = new StringBuilder();
             if (query.CategoryId == 18)
@@ -439,7 +439,7 @@ namespace New_College.Services
                     IsOpen = 1,
                     Result = tagname.ToString()
                 });
-                return info > 0 ? true : false;
+                return new Tuple<int, bool>(info, info > 0);
             }
             else if (query.CategoryId == 19)
             {
@@ -458,9 +458,9 @@ namespace New_College.Services
                     IsOpen = 1,
                     Result = tagname.ToString()
                 });
-                return info > 0 ? true : false;
+                return new Tuple<int, bool>(info, info > 0);
             }
-            return false;
+            return new Tuple<int, bool>(0, false);
         }
 
 
@@ -507,9 +507,9 @@ namespace New_College.Services
             {
                 BaseProperty = baseprop,
                 Description = description,
-                OccupationProperty = occupationprop.Replace(" ","").Replace("1","").Replace("2", "").Replace("3", "").Replace("4", "").Replace("5", "").Split('.', StringSplitOptions.RemoveEmptyEntries).ToList(),
+                OccupationProperty = occupationprop.Replace(" ", "").Replace("1", "").Replace("2", "").Replace("3", "").Replace("4", "").Replace("5", "").Split('.', StringSplitOptions.RemoveEmptyEntries).ToList(),
                 Occupation = occupation
-            }; 
+            };
             return response;
         }
 

From ea43e769628df48ce459565b4fe971acac6b2630 Mon Sep 17 00:00:00 2001
From: liuyangyi <liuyangyi123@outlook.com>
Date: Mon, 27 May 2024 21:10:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4vip=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 New_College.Model/Models/RootEntity.cs             | 4 ++--
 New_College.Model/Models/V_OrderInfo.cs            | 2 +-
 New_College.Model/ViewModels/Query/VipCardQuery.cs | 6 +++---
 New_College.Services/V_OrderInfoServices.cs        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/New_College.Model/Models/RootEntity.cs b/New_College.Model/Models/RootEntity.cs
index 5fefb8d..da849c4 100644
--- a/New_College.Model/Models/RootEntity.cs
+++ b/New_College.Model/Models/RootEntity.cs
@@ -64,7 +64,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 租户id
         /// </summary>
-        public virtual int? TenantId { get; set; }
+        public virtual long? TenantId { get; set; }
     }
     /// <summary>
     ///带上租户Id
@@ -74,7 +74,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 租户id
         /// </summary>
-        public virtual int? TenantId { get; set; }
+        public virtual long? TenantId { get; set; }
     }
 
 
diff --git a/New_College.Model/Models/V_OrderInfo.cs b/New_College.Model/Models/V_OrderInfo.cs
index fb6504e..4302309 100644
--- a/New_College.Model/Models/V_OrderInfo.cs
+++ b/New_College.Model/Models/V_OrderInfo.cs
@@ -52,7 +52,7 @@ namespace New_College.Model.Models
         /// <summary>
         /// 用户Id
         /// </summary>
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         /// <summary>
         /// 
diff --git a/New_College.Model/ViewModels/Query/VipCardQuery.cs b/New_College.Model/ViewModels/Query/VipCardQuery.cs
index 4996a6b..cecd449 100644
--- a/New_College.Model/ViewModels/Query/VipCardQuery.cs
+++ b/New_College.Model/ViewModels/Query/VipCardQuery.cs
@@ -6,7 +6,7 @@ namespace New_College.Model.ViewModels
 {
     public class VipCardQuery: BasePageRequest
     {
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         public string CardCode { get; set; }
 
@@ -15,13 +15,13 @@ namespace New_College.Model.ViewModels
 
     public class OpenVipCardRequest
     {
-        public int CustomerId { get; set; }
+        public long CustomerId { get; set; }
 
         public string CardCode { get; set; }
 
         public string CardPwd { get; set; }
 
-        public int? TenantId { get; set; }
+        public long? TenantId { get; set; }
     }
 
 
diff --git a/New_College.Services/V_OrderInfoServices.cs b/New_College.Services/V_OrderInfoServices.cs
index 7e76f99..e1181a6 100644
--- a/New_College.Services/V_OrderInfoServices.cs
+++ b/New_College.Services/V_OrderInfoServices.cs
@@ -210,7 +210,7 @@ namespace New_College.Services
                 var CoustomerId = await v_CustomerInfoRepository.Query(x => x.Phone.Contains(query.Phone));
                 var ids = CoustomerId.Select(x => x.Id).ToList();
                 if (CoustomerId != null)
-                    wheres = wheres.And(x => ids.Contains(x.CustomerId));
+                    wheres = wheres.And(x => ids.Contains((int)x.CustomerId));
             }
 
             //根据卡片类别查询