From 8886d7acf162b20a225a3386d9d2f6ef8cc1c546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Mon, 15 Jan 2024 17:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=B3=A8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Front/CustomerController.cs   | 34 ++++++++++++++++++-
 New_College.Services/D_LongIdMapServices.cs   |  2 +-
 .../D_PlanMajorDescServices.cs                |  2 +-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/New_College.Api/Controllers/Front/CustomerController.cs b/New_College.Api/Controllers/Front/CustomerController.cs
index 0e3b898..9fbccf8 100644
--- a/New_College.Api/Controllers/Front/CustomerController.cs
+++ b/New_College.Api/Controllers/Front/CustomerController.cs
@@ -30,6 +30,38 @@ namespace New_College.Api.Controllers.Front
         }
 
 
+
+
+        /// <summary>
+        ///账号注销
+        /// </summary>
+        /// <returns>传入OpenId</returns>
+        [HttpPost]
+        public async Task<MessageModel<bool>> AccountCancel([FromBody] LoginQuery login)
+        {
+            var single = await _services.Query(c => c.OpenId == login.openId);
+            if (single.Any())
+            {
+                var newmodel = single.FirstOrDefault();
+                newmodel.IsDelete = true;
+                var update = await _services.Update(newmodel);
+                return new MessageModel<bool>()
+                {
+                    success = true,
+                    msg = "ok",
+                    response = update,
+                    status = 200
+                };
+            }
+            return new MessageModel<bool>()
+            {
+                status = 200,
+                response = false,
+                msg = "fail",
+
+            };
+        }
+
         /// <summary>
         /// 获取微信openid
         /// </summary>
@@ -211,7 +243,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<MessageModel<CustomerInfoResult>> UpdateCustomer([FromBody]CustomerUpdateQuery query)
+        public async Task<MessageModel<CustomerInfoResult>> UpdateCustomer([FromBody] CustomerUpdateQuery query)
         {
             var result = await _services.UpdateCustomer(query);
             if (result.Id > 0)
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 064fdb9..35a54a0 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -667,7 +667,7 @@ namespace New_College.Services
             //{
             var majorclasses = (await d_MajorClassRepository.Query(x => x.IsDelete == false)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId });
             var nowmajorname = majorclasses.Where(x => x.Id == query.categoryclassid).Select(x => x.Name)?.FirstOrDefault();
-            var newmajorinfo = await d_MajorRepository.Query(x => x.IsDelete == false && x.CategoryClass_Id == query.categoryclassid && x.Type != 3);
+            var newmajorinfo = await d_MajorRepository.Query(x => x.IsDelete == false && x.CategoryClass_Id == query.categoryclassid);
             info = newmajorinfo.Where(x => x.Name != nowmajorname).Select(x => new uniMajorInfo() { Id = x.Id, Name = x.MajorName, Code = x.MajorCode }).ToList();
             //}
             return new MessageModel<List<uniMajorInfo>>()
diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs
index f4c76e5..5d8ffe6 100644
--- a/New_College.Services/D_PlanMajorDescServices.cs
+++ b/New_College.Services/D_PlanMajorDescServices.cs
@@ -59,7 +59,7 @@ namespace New_College.Services
             var pagemodel = new AIGOPageModel<AIGOResponse>();
             int startscore = request.Score - 15;
             int endscore = request.Score + 15;
-            int qyear = request.Year > DateTime.Now.Year ? 2023 : DateTime.Now.Year;
+            int qyear = request.Year >= 2023 ? 2023 : request.Year;
             Expression<Func<D_QualificationLine, bool>> expression = Expressionable.Create<D_QualificationLine>()
                   .And(c => c.Years == qyear)
                   .And(c => c.IsDelete == false)