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
}
+
+
+ ///
+ ///账号注销
+ ///
+ /// 传入OpenId
+ [HttpPost]
+ public async Task> 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()
+ {
+ success = true,
+ msg = "ok",
+ response = update,
+ status = 200
+ };
+ }
+ return new MessageModel()
+ {
+ status = 200,
+ response = false,
+ msg = "fail",
+
+ };
+ }
+
///
/// 获取微信openid
///
@@ -211,7 +243,7 @@ namespace New_College.Api.Controllers.Front
///
///
[HttpPost]
- public async Task> UpdateCustomer([FromBody]CustomerUpdateQuery query)
+ public async Task> 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>()
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();
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> expression = Expressionable.Create()
.And(c => c.Years == qyear)
.And(c => c.IsDelete == false)