XCKJ
/
CostCalculationItem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

master
he 2022-09-14 15:40:41 +08:00
parent 4e0053f8ec
commit 0157ecde51
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
IRaCIS.Core.Application/Financial/FinancialService.cs
View File

@ -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<PaymentDetailDTO>(_mapper.ConfigurationProvider).ToList();
detailList = _paymentDetailRepository.GetAll()
.Where(t => t.PaymentId == paymentId)
.OrderBy(t => t.ShowCodeOrder).ThenBy(t => t.ShowTypeOrder).ProjectTo<PaymentDetailDTO>(_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();
}
//费用调整