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] =?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));
             }
 
             //根据卡片类别查询