bug fixed

New_College.Api/Controllers/Front/PayQrCodeController.cs

@@ -8,7 +8,6 @@ namespace New_College.Api.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    [Authorize]
     public class PayQrCodeController : Controller
     {
         private readonly IV_OrderInfoServices v_OrderInfoServices;

New_College.Api/New_College.Model.xml

@@ -6425,6 +6425,11 @@
             硕士数
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.UniversityResult.Percentage">
+            <summary>
+            百分比
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.UniversityResult.Web">
             <summary>
             官网

New_College.Api/appsettings.json

@@ -235,7 +235,7 @@
     "APIv3Key": "brapuk6fon0wachiMlth2t3lb4a0h7ji",
     //回调地址
     "NotifyUrl": "https://pay.ycymedu.com/api/notify/transactions",
-    "PrivateKey": "/cert/apiclient_cert.p12", //（新）证书私钥
+    "PrivateKey": "cert/apiclient_cert.p12", //（新）证书私钥
     "SerialNumber": "1B304596B953D156B37863FF52FCAE40B458C9F2" //（新）证书序列号
   }
 }

New_College.Model/ViewModels/Query/MajorcategoryQuery.cs

@@ -10,5 +10,8 @@ namespace New_College.Model.ViewModels
         /// 办学层次 本科/专科大类 1本科  2 专科
         /// </summary>
         public int SchoolLevel { get; set; } = 1;
+
+        public string MajorName { get; set; }
+
     }
 }

New_College.Model/ViewModels/Result/CustomerInfoResult.cs

@@ -97,6 +97,9 @@ namespace New_College.Model.ViewModels
         public string SchoolName { get; set; }
 
         public string ClassName { get; set; }
+
+        public string BatchName { get; set; }
+
     }
     public class CustomerInfoListResult : BasePageRequest
     {

New_College.Model/ViewModels/Result/UniversityResult.cs

@@ -9,6 +9,11 @@ namespace New_College.Model.ViewModels
 
         public string UniversityCode { get; set; }
 
+        /// <summary>
+        /// 百分比
+        /// </summary>
+        public int Percentage { get; set; }
+
         /// <summary>
         /// 官网
         /// </summary>

New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs

@@ -1,4 +1,5 @@
 using LinqKit;
+using New_College.Common;
 using New_College.Common.Helper;
 using New_College.IRepository;
 using New_College.IRepository.UnitOfWork;
@@ -251,17 +252,6 @@ namespace New_College.Repository
             query.Year = query.Year > 2023 ? 2023 : query.Year;
             //var custome = (await this.v_CustomerInfo.QueryById(query.CustomerId));
             //  int planId = (await t_EnrollmentPlane.Query(e => e.Years == custome.Year && e.Area_Id == custome.AreaId)).FirstOrDefault().Id;
-
-            //var subjects = new string[] { };
-            //string sbuOne = string.Empty;
-            //string sbuTwo = string.Empty;
-            //string sbuTree = string.Empty;
-            //if (!string.IsNullOrWhiteSpace(query.SubjectClaim))
-            //{
-            //    subjects = query.SubjectClaim.Split(",");
-            //    sbuOne = subjects[0];
-            //    sbuTwo = subjects[1];
-            //    sbuTree = subjects[2];
             //}
             var recommendInfo = await this.Db.Queryable<D_QualificationLine, D_University>((plans, universitys) => new object[] { JoinType.Left, plans.UId == universitys.Id })
                  .Where((plans, universitys) => plans.Location == query.Location)
@@ -280,7 +270,7 @@ namespace New_College.Repository
                 .OrderBy((plans, universitys) => plans.LowScoreRank, OrderByType.Asc)
                 .Select((plans, universitys) => new UniversityResult()
                 {
-                    Id = plans.Id,
+                    Id = universitys.Id,
                     Name = universitys.Name,
                     Nature = universitys.Nature,
                     AscriptionName = universitys.AscriptionName,
@@ -293,6 +283,7 @@ namespace New_College.Repository
                     UniversityType = universitys.Type,
                     Scorepostion = plans.LowScoreRank,
                     ScoreLine = plans.LowScore,
+                    Percentage = MajorPlanScoreTool.GetPlanPercentage(plans.LowScore, (int)query.Score),
                     Years = plans.Years
                 })
                 .ToPageListAsync(query.PageIndex, query.PageSize, totalNumber);

New_College.Services/D_LongIdMapServices.cs

@@ -199,9 +199,14 @@ namespace New_College.Services
         /// <returns></returns>
         public async Task<List<uniMajorInfoResult>> uniGetMajorInfo(MajorcategoryQuery query)
         {
+            var expression = Expressionable.Create<D_Major>()
+             .And(x => x.IsDelete == false)
+                .And(x => x.Type != 3)
+                .AndIF(!string.IsNullOrEmpty(query.MajorName),x=>SqlFunc.Contains(x.MajorName,query.MajorName))
+                .ToExpression();
             var majorcategories = (await d_MajorCategoryRepository.Query(x => x.Type == query.SchoolLevel && x.IsDelete == false)).Select(x => new uniMajorSelect() { Id = x.Id, Name = x.Name }); ;
             var majorclasses = (await d_MajorClassRepository.Query(x => x.IsDelete == false)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId });
-            var majorinfo = (await d_MajorRepository.Query(x => x.IsDelete == false && x.Type != 3)).Select(s => new uniMajorSelect() { Id = s.CategoryClass_Id, Name = s.Name }).ToList();
+            var majorinfo = (await d_MajorRepository.Query(expression)).Select(s => new uniMajorSelect() { Id = s.CategoryClass_Id, Name = s.Name }).ToList();
             List<uniMajorInfoResult> list = new List<uniMajorInfoResult>() { };
             foreach (var item in majorcategories)
             {
@@ -2018,7 +2023,7 @@ namespace New_College.Services
             var planlinelist = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "山东省");
             planlinelist.ForEach(async c =>
             {
-                var tmpany=tbinfo.Where(e=>e.UniversityName==c.UniversityName&&e.MajorCode==c.MajorCode).Any();
+                var tmpany = tbinfo.Where(e => e.UniversityName == c.UniversityName && e.MajorCode == c.MajorCode).Any();
                 if (tmpany)
                 {
                     var tmp = tbinfo.Where(e => e.UniversityName == c.UniversityName && e.MajorCode == c.MajorCode).FirstOrDefault();

New_College.Services/D_PlanMajorDescServices.cs

@@ -64,7 +64,7 @@ namespace New_College.Services
             int endscore = request.Score + 15;
             int qyear = request.Year >= 2023 ? 2023 : request.Year;
             var batlist = await _batchlineRepository.Query(c => c.Year == request.Year && c.Type_name == "综合");
-            request.BatchName = batlist.Where(c => c.Average >= request.Score).Any() ? batlist.Where(c => c.Average >= request.Score).FirstOrDefault().Batch_name : batlist.Where(c => c.Average < request.Score).FirstOrDefault().Batch_name;
+            request.BatchName = batlist.Where(c => c.Average <= request.Score&&c.Batch_name== "普通类一段").Any() ? "普通类一段": "普通类二段";
             Expression<Func<D_QualificationLine, bool>> expression = Expressionable.Create<D_QualificationLine>()
                   .And(c => c.Years == qyear)
                   .And(c => c.IsDelete == false)
@@ -120,7 +120,7 @@ namespace New_College.Services
             var responselist = query.data.Select(c => new AIGOResponse()
             {
                 AreaName = c.AreaName,
-                Rank = c.Rank > 9999 ? "--" : c.Rank.ToString(),
+                Rank = c.OrderSort > 9999 ? "--" : c.OrderSort.ToString(),
                 _985 = c._985,
                 _211 = c._211,
                 _SYL = c._SYL,

New_College.Services/V_CustomerInfoServices.cs

@@ -14,16 +14,19 @@ using New_College.Common.Helper;
 using New_College.Model;
 using LinqKit;
 using New_College.Model.Request;
+using New_College.IRepository;
 
 namespace New_College.Services
 {
     public class V_CustomerInfoServices : BaseServices<V_CustomerInfo>, IV_CustomerInfoServices
     {
         private readonly IBaseRepository<V_CustomerInfo> _dal;
-        public V_CustomerInfoServices(IBaseRepository<V_CustomerInfo> dal)
+        private readonly IT_BatchlineRepository t_BatchlineRepository;
+        public V_CustomerInfoServices(IBaseRepository<V_CustomerInfo> dal, IT_BatchlineRepository t_Batchline)
         {
             this._dal = dal;
             base.BaseDal = dal;
+            t_BatchlineRepository = t_Batchline;
         }
 
 
@@ -134,7 +137,7 @@ namespace New_College.Services
             {
                 info.AreaId = query.AreaId;
             }
-            if (query.Gender.HasValue&&query.Gender>0)
+            if (query.Gender.HasValue && query.Gender > 0)
             {
                 info.Gender = query.Gender.Value;
             }
@@ -219,6 +222,9 @@ namespace New_College.Services
             var info = await _dal.QueryById(query.Id);
             if (info == null)
                 return new MessageModel<CustomerInfoResult>() { success = false, msg = "获取失败，用户信息为空" };
+            var years = info.Year > 2023 ? 2023 : info.Year;
+            var batchlist = await t_BatchlineRepository.Query(c => c.Year == years && c.AreaName == info.AreaName && c.Type_name == "综合");
+
             return new MessageModel<CustomerInfoResult>()
             {
                 success = true,
@@ -243,7 +249,8 @@ namespace New_College.Services
                     IsUpdateScore = info.IsUpdateScore,
                     Year = info.Year,
                     SchoolName = info.SchoolName,
-                    ClassName = info.ClassName
+                    ClassName = info.ClassName,
+                    BatchName = batchlist.Where(c => c.Batch_name == "普通类一段" && c.Average <= info.Expectedscore).Any() ? "普通类一段" : "普通类二段"
                 }
             };
         }
@@ -395,7 +402,7 @@ namespace New_College.Services
                     Subjectgroup = userinfo.Subjectgroup,
                     subjectgroupName = userinfo.subjectgroupName,
                     Year = userinfo.Year,
-                    Id= userinfo.Id,   
+                    Id = userinfo.Id,
                 });
             }
             else

New_College.Services/V_OrderInfoServices.cs

@@ -90,15 +90,19 @@ namespace New_College.Services
                     _unitOfWork.CommitTran();
                     return await WeChatPayV3.QrCodePay(outorderNo, cardtypeinfo.Money, cardtypeinfo.Name);
                 }
-                return QrCodeHelper.GetTextImageStream("无法显示二维码");
+                else
+                {
+                    return QrCodeHelper.GetTextImageStream("baseResult<0无法显示二维码");
+                }
             }
-            catch (System.Exception)
+            catch (System.Exception ex)
             {
                 _unitOfWork.RollbackTran();
                 // response.msg = "订单创建失败";
+                return QrCodeHelper.GetTextImageStream(ex.Message);
             }
 
-            return QrCodeHelper.GetTextImageStream("无法显示二维码");
+           
         }
 
         /// <summary>