From 9f8e6f4642fa5b7021709fea6664c3529d39b709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Fri, 26 Jan 2024 17:58:50 +0800
Subject: [PATCH] test

---
 .../Controllers/Front/CustomerController.cs         | 10 ++++++++++
 .../Controllers/Front/WeixinPayController.cs        |  3 +++
 New_College.Services/D_PlanMajorDescServices.cs     | 13 ++++++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/New_College.Api/Controllers/Front/CustomerController.cs b/New_College.Api/Controllers/Front/CustomerController.cs
index 8eae20c..15236ee 100644
--- a/New_College.Api/Controllers/Front/CustomerController.cs
+++ b/New_College.Api/Controllers/Front/CustomerController.cs
@@ -225,10 +225,20 @@ namespace New_College.Api.Controllers.Front
         [HttpPost]
         public async Task<MessageModel<CustomerInfoResult>> UpdateScore(UpdateScoreQuery query)
         {
+            var customersingle = await _services.QueryById(query.StudentId);
+            if (customersingle == null) {
+
+                return new MessageModel<CustomerInfoResult>()
+                {
+
+                };
+            }
+
             var result = await _services.UpdateScore(query);
             if (result.Id > 0)
             {
                 await _userSetting.UpdateSingleCustomerSetting(new UserBaseSettingUpdateDTO() { UType = 0, CustomerId = query.StudentId });//修改参数次数
+
                 var token = JwtHelper.IssueJwt(new TokenModelJwt() { Uid = result.Id, Role = "学生" });
                 result.Token = token;
             }
diff --git a/New_College.Api/Controllers/Front/WeixinPayController.cs b/New_College.Api/Controllers/Front/WeixinPayController.cs
index 660fdc9..d5b8302 100644
--- a/New_College.Api/Controllers/Front/WeixinPayController.cs
+++ b/New_College.Api/Controllers/Front/WeixinPayController.cs
@@ -55,6 +55,9 @@ namespace New_College.Api.Controllers.Front
             var resp = new WeixinPayResult();
             try
             {
+                var vipinfo = await v_VipCardTypeRepository.QueryById(5);
+                query.total_fee = vipinfo.Money;
+
                 DingHookHelper.DingTalkHookMessage("UnifiedOrder=>发起支付", JsonConvert.SerializeObject(query));
                 Random rd = new Random();
                 //HttpContext.GetClientUserIp();
diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs
index de1c8dd..d8a9b05 100644
--- a/New_College.Services/D_PlanMajorDescServices.cs
+++ b/New_College.Services/D_PlanMajorDescServices.cs
@@ -73,16 +73,23 @@ namespace New_College.Services
                  .AndIF(request._985.HasValue && request._985 == 1, c => SqlFunc.Contains(c.LnstitutionalLevel, "985"))
                  .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership)
                  .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature)
-                 .AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c._23Score, request.StartScore, request.EndScore))
+                 .AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c._23SchoolScore, request.StartScore, request.EndScore))
                 .ToExpression();
-            var querylist = await sNeedDataInfoServices.Query(expression);
+            var querylist = (await sNeedDataInfoServices.Query(expression)).Select(c=>new T_TbSNeedDataInfo() {
+             ID = c.ID,
+              LnstitutionalLevel = c.LnstitutionalLevel,
+               UniversityName   = c.UniversityName,
+               Nature=c.Nature,
+                _23SchoolScore = c._23SchoolScore,
+            
+            }).ToList();
             var unlist = querylist.GroupBy(b => b.UniversityName).Select(c => new AIPerviewItemDto() { UniversityName = c.Key }).ToList();
             var mapunlist = unlist.Select(c => new AIPerviewItemDto
             {
                 LnstitutionalLevel = querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault().LnstitutionalLevel,
                 Nature = querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault().Nature,
                 UniversityName = querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault().UniversityName,
-                Type = MajorPlanScoreTool.GetPlanScore(int.Parse(querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault()._23Score), request.Score),
+                Type = MajorPlanScoreTool.GetPlanScore(int.Parse(querylist.Where(e => e.UniversityName == c.UniversityName).FirstOrDefault()._23SchoolScore), request.Score),
             }).ToList();
             aidto.universities = new List<UniversityPerviewDto>()
             {