From fea194161146fe965cf5f4509a7310acc3d9cb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com> Date: Mon, 22 Jan 2024 16:13:20 +0800 Subject: [PATCH] feat:ww --- New_College.Api/Controllers/Front/WeixinPayController.cs | 9 ++++++++- New_College.Services/D_PlanMajorDescServices.cs | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/New_College.Api/Controllers/Front/WeixinPayController.cs b/New_College.Api/Controllers/Front/WeixinPayController.cs index f180e58..d6e60a1 100644 --- a/New_College.Api/Controllers/Front/WeixinPayController.cs +++ b/New_College.Api/Controllers/Front/WeixinPayController.cs @@ -223,6 +223,13 @@ namespace New_College.Api.Controllers.Front customerinfo.IsVIP = true; customerinfo.VipCode = oneinfo.CardNo; await v_CustomerInfoRepository.Update(customerinfo); + + var oldorderlist = await v_OrderInfoRepository.Query(c => c.CustomerId == oneinfo.CustomerId && c.Status == EnumOrderType.payment); + oldorderlist.ForEach(async a => + { + a.Status = EnumOrderType.Cancel; + await v_OrderInfoRepository.Update(a); + }); //支付成功后根据用户code找到对应用户修改vip 状态 res.SetValue("return_code", "SUCCESS"); res.SetValue("return_msg", "OK"); @@ -240,6 +247,6 @@ namespace New_College.Api.Controllers.Front } - + } } diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs index 5d8ffe6..2efa9d1 100644 --- a/New_College.Services/D_PlanMajorDescServices.cs +++ b/New_College.Services/D_PlanMajorDescServices.cs @@ -76,6 +76,7 @@ namespace New_College.Services .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership) .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature) .ToExpression(); + //var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, " LowScoreRank desc "); //var majorarry = query.data.Select(c => c.Major).Distinct().ToArray(); @@ -129,8 +130,8 @@ namespace New_College.Services // SubjectClam = c.SelectSubject, Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//冲稳保院校 Percentage = MajorPlanScoreTool.GetPlanPercentage(c.LowScore, request.Score), - planCount = list.Where(w => w.Years == DateTime.Now.Year && w.UId == c.UId).Sum(c => c.PlanCount), - iGoPlanMajorItems = list.Where(w => w.Years == DateTime.Now.Year && w.UId == c.UId).Select(t => new AIGoPlanMajorItem() + planCount = list.Where(w => w.Years == (DateTime.Now.Year-1) && w.UId == c.UId).Sum(c => c.PlanCount), + iGoPlanMajorItems = list.Where(w => w.Years == (DateTime.Now.Year-1) && w.UId == c.UId).Select(t => new AIGoPlanMajorItem() { PlanId = t.Id, MajorCode = t.MajorCode,