From 0157ecde5185794b319b6a633574216a2b13f694 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 14 Sep 2022 15:40:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Financial/FinancialService.cs | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/IRaCIS.Core.Application/Financial/FinancialService.cs b/IRaCIS.Core.Application/Financial/FinancialService.cs index 213f40c..86dec92 100644 --- a/IRaCIS.Core.Application/Financial/FinancialService.cs +++ b/IRaCIS.Core.Application/Financial/FinancialService.cs @@ -202,34 +202,34 @@ namespace IRaCIS.Application.Services // TrialId = challengeQuery.TrialId //}; - //detailList = _paymentDetailRepository.AsQueryable() - // .Where(t => t.PaymentId == paymentId) - // .OrderBy(t => t.ShowCodeOrder).ThenBy(t => t.ShowTypeOrder).ProjectTo(_mapper.ConfigurationProvider).ToList(); + detailList = _paymentDetailRepository.GetAll() + .Where(t => t.PaymentId == paymentId) + .OrderBy(t => t.ShowCodeOrder).ThenBy(t => t.ShowTypeOrder).ProjectTo(_mapper.ConfigurationProvider).ToList(); - detailList =(from pay in _paymentDetailRepository.GetAll().Where(t => t.PaymentId == paymentId) - //join enroll in _enrollRepository.GetAll() on new { pay.DoctorId, pay.TrialId } equals new { enroll.DoctorId, enroll.TrialId } - join price in _TrialPaymentPriceRepository.GetAll() on pay.TrialId equals price.TrialId - orderby pay.ShowCodeOrder - orderby pay.ShowTypeOrder - select new PaymentDetailDTO() - { - Id = pay.Id, - ShowCodeOrder = pay.ShowCodeOrder, - ShowTypeOrder = pay.ShowTypeOrder, - PaymentUSD = pay.PaymentUSD, - BasePrice = pay.BasePrice, - PaymentType=pay.PaymentType, - PersonalAdditional = pay.PersonalAdditional, - TrialAdditional = pay.TrialAdditional, - TrialCode = pay.TrialCode, - PaymentCNY = pay.PaymentCNY, - DoctorId = pay.DoctorId, - ExchangeRate = pay.ExchangeRate, - IsNewTrial = price.IsNewTrial, - // NewPersonalAdditional = enroll.AdjustmentMultiple, - Count=pay.Count, - }).ToList(); + //detailList =(from pay in _paymentDetailRepository.GetAll().Where(t => t.PaymentId == paymentId) + // //join enroll in _enrollRepository.GetAll() on new { pay.DoctorId, pay.TrialId } equals new { enroll.DoctorId, enroll.TrialId } + // //join price in _TrialPaymentPriceRepository.GetAll() on pay.TrialId equals price.TrialId + // orderby pay.ShowCodeOrder + // orderby pay.ShowTypeOrder + // select new PaymentDetailDTO() + // { + // Id = pay.Id, + // ShowCodeOrder = pay.ShowCodeOrder, + // ShowTypeOrder = pay.ShowTypeOrder, + // PaymentUSD = pay.PaymentUSD, + // BasePrice = pay.BasePrice, + // PaymentType=pay.PaymentType, + // PersonalAdditional = pay.PersonalAdditional, + // TrialAdditional = pay.TrialAdditional, + // TrialCode = pay.TrialCode, + // PaymentCNY = pay.PaymentCNY, + // DoctorId = pay.DoctorId, + // ExchangeRate = pay.ExchangeRate, + // //IsNewTrial = price.IsNewTrial, + // // NewPersonalAdditional = enroll.AdjustmentMultiple, + // Count=pay.Count, + // }).ToList(); } //费用调整