yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

develop
old易 2024-01-24 23:22:26 +08:00
parent 04df8eac43
commit 8284b1c601
7 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
New_College.Api/New_College.Api.csproj
View File

@ -95,6 +95,9 @@
</ItemGroup>
<ItemGroup>
<None Update="cert\apiclient_cert.p12">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="cert\apiclient_key.pem">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

2
New_College.Model/ViewModels/Query/CustomerInfoQuery.cs
View File

@ -74,6 +74,8 @@ namespace New_College.Model.ViewModels
/// 选科文字展示
/// </summary>
public string Subjectgroup { get; set; }
public string subjectgroupName { get;set; }
}
/// <summary>

2
New_College.Model/ViewModels/Query/RecommendUniversityQuery.cs
View File

@ -11,7 +11,7 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 学生分数
/// </summary>
public float Score { get; set; }
public int Score { get; set; }
/// <summary>
/// 学生位次

7
New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs
View File

@ -99,7 +99,7 @@ namespace New_College.Repository
{
UniversityId = p.UId,
PlanId = p.Id,
// Scoreline = p.LowScore
// Scoreline = p.LowScore
})
.ToListAsync();
var universitylist = recommendInfo.Select(c => c.UniversityId).Distinct().ToList();
@ -283,10 +283,13 @@ 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);
recommendInfo.ForEach(recommendInfo =>
{
recommendInfo.Percentage = MajorPlanScoreTool.GetPlanPercentage((int)recommendInfo.ScoreLine, query.Score);
});
return new PageModel<UniversityResult>()
{
data = recommendInfo,

48
New_College.Services/D_LongIdMapServices.cs
View File

@ -201,7 +201,7 @@ namespace New_College.Services
{
var expression = Expressionable.Create<D_Major>()
.And(x => x.IsDelete == false)
.And(x => x.Type != 3)
//.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 }); ;
@ -219,14 +219,18 @@ namespace New_College.Services
MajorNum = majorinfo.Count(x => x.Name != s.Name && x.Id == s.Id),
}).ToList();
if (scond.Count() == 0)
continue;
list.Add(new uniMajorInfoResult()
if (scond.Count() > 0)
{
FirstName = item.Name,
RootId = item.Id,
SecondInfo = scond
});
if (scond.Select(c => c.MajorNum).Sum() > 0)
{
list.Add(new uniMajorInfoResult()
{
FirstName = item.Name,
RootId = item.Id,
SecondInfo = scond.Where(w=>w.MajorNum>0).ToList(),
});
}
}
}
return list;
}
@ -1991,7 +1995,7 @@ namespace New_College.Services
public async Task<bool> UpdatePlanProInf()
{
var tbinfo = await t_TbSNeedDataInfoRepository.Query();
//var universitylist=await un
#region 更新专业计划信息
//var plist = await this._PlanMajorDescRepository.Query(c => c.Location == "山东省" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0);
//plist.ForEach(p =>
@ -2020,19 +2024,23 @@ namespace New_College.Services
#region 更新专业分数先选科数据
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();
if (tmpany)
{
var tmp = tbinfo.Where(e => e.UniversityName == c.UniversityName && e.MajorCode == c.MajorCode).FirstOrDefault();
c.SelectSubject = tmp._23subject;
await d_PlanMajorScoreLineRepository.Update(c);
}
});
//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();
// if (tmpany)
// {
// var tmp = tbinfo.Where(e => e.UniversityName == c.UniversityName && e.MajorCode == c.MajorCode).FirstOrDefault();
// c.SelectSubject = tmp._23subject;
// await d_PlanMajorScoreLineRepository.Update(c);
// }
//});
#endregion
return true;
}

1
New_College.Services/V_CustomerInfoServices.cs
View File

@ -90,6 +90,7 @@ namespace New_College.Services
info.Expectedscore = query.Score;
info.Subject = query.Subject;
info.Subjectgroup = query.Subjectgroup;
info.subjectgroupName=query.subjectgroupName;
var result = await _dal.Update(info);
if (result)
{

25
New_College.Services/V_OrderInfoServices.cs
View File

@ -22,6 +22,7 @@ using SqlSugar;
using System.Linq.Expressions;
using StackExchange.Redis;
using Ubiety.Dns.Core;
using Microsoft.VisualBasic;
namespace New_College.Services
{
@ -61,14 +62,28 @@ namespace New_College.Services
public async Task<MemoryStream> QrCodePay(WeChatPayTransactionsNativeQuery viewModel)
{
var orderNo = OrderGenerateHelper.GenerateOrderNo("ZY");//outorderNo//系统创建订单逻辑
var outorderNo = OrderGenerateHelper.GenerateOrderNo("OT").ToLower();
Random rd = new Random();
//外部商户订单号
var outorderNo = DateTime.Now.ToString("yyyyMMddHHmmss") + rd.Next(0, 1000).ToString().PadLeft(3, '0');
// viewModel.Total = 0.09;
var customer = await v_CustomerInfoRepository.QueryById(viewModel.CustomerId);
var cardtypeinfo = await v_VipCardTypeRepository.QueryById(viewModel.ProductId);//5 test produtId
try
{
_unitOfWork.BeginTran();
var createtime = TimeUtil.GetCstDateTime();
var code = RadomHelper.GetGuid();
_unitOfWork.BeginTran();
var addcard = await v_VipCardInfoRepository.Add(new V_VipCardInfo()
{
CardTypeId = cardtypeinfo.Id,
CardTypeName = cardtypeinfo.Name,
Code = code,
IsBind = 1,
Money = cardtypeinfo.Money,
Day = cardtypeinfo.Day,
EndTime = DateTime.Now.AddDays(cardtypeinfo.Day)
});
var baseResult = await _dal.Add(new V_OrderInfo
{
//out_trade_no = payNum,
@ -80,9 +95,9 @@ namespace New_College.Services
Price = cardtypeinfo.Money,
PayPrice = cardtypeinfo.Money,
Name = cardtypeinfo.Name,
CardNo = orderNo,
CardNo = code,
out_trade_no = outorderNo,
CardId = -1,
CardId = addcard,
CreateTime = createtime
});
if (baseResult > 0)
@ -102,7 +117,7 @@ namespace New_College.Services
return QrCodeHelper.GetTextImageStream(ex.Message);
}
}
/// <summary>