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 // TrialId = challengeQuery.TrialId
//}; //};
//detailList = _paymentDetailRepository.AsQueryable() detailList = _paymentDetailRepository.GetAll()
// .Where(t => t.PaymentId == paymentId) .Where(t => t.PaymentId == paymentId)
// .OrderBy(t => t.ShowCodeOrder).ThenBy(t => t.ShowTypeOrder).ProjectTo<PaymentDetailDTO>(_mapper.ConfigurationProvider).ToList(); .OrderBy(t => t.ShowCodeOrder).ThenBy(t => t.ShowTypeOrder).ProjectTo<PaymentDetailDTO>(_mapper.ConfigurationProvider).ToList();
detailList =(from pay in _paymentDetailRepository.GetAll().Where(t => t.PaymentId == paymentId) //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 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 // //join price in _TrialPaymentPriceRepository.GetAll() on pay.TrialId equals price.TrialId
orderby pay.ShowCodeOrder // orderby pay.ShowCodeOrder
orderby pay.ShowTypeOrder // orderby pay.ShowTypeOrder
select new PaymentDetailDTO() // select new PaymentDetailDTO()
{ // {
Id = pay.Id, // Id = pay.Id,
ShowCodeOrder = pay.ShowCodeOrder, // ShowCodeOrder = pay.ShowCodeOrder,
ShowTypeOrder = pay.ShowTypeOrder, // ShowTypeOrder = pay.ShowTypeOrder,
PaymentUSD = pay.PaymentUSD, // PaymentUSD = pay.PaymentUSD,
BasePrice = pay.BasePrice, // BasePrice = pay.BasePrice,
PaymentType=pay.PaymentType, // PaymentType=pay.PaymentType,
PersonalAdditional = pay.PersonalAdditional, // PersonalAdditional = pay.PersonalAdditional,
TrialAdditional = pay.TrialAdditional, // TrialAdditional = pay.TrialAdditional,
TrialCode = pay.TrialCode, // TrialCode = pay.TrialCode,
PaymentCNY = pay.PaymentCNY, // PaymentCNY = pay.PaymentCNY,
DoctorId = pay.DoctorId, // DoctorId = pay.DoctorId,
ExchangeRate = pay.ExchangeRate, // ExchangeRate = pay.ExchangeRate,
IsNewTrial = price.IsNewTrial, // //IsNewTrial = price.IsNewTrial,
// NewPersonalAdditional = enroll.AdjustmentMultiple, // // NewPersonalAdditional = enroll.AdjustmentMultiple,
Count=pay.Count, // Count=pay.Count,
}).ToList(); // }).ToList();
} }
//费用调整 //费用调整