|
@@ -187,7 +187,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
|
|
|
Map<Long, BigDecimal> accessoriesAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo,"ACCESSORIES"));
|
|
|
Map<Long, BigDecimal> courseAmountMap = MapUtil.convertIntegerMap(studentPaymentOrderDetailDao.queryGoodsPrice(paymentOrderNo,"COURSE"));
|
|
|
Map<Long, String> purchaseTypeMap = MapUtil.convertIntegerMap(studentRegistrationDao.queryPurchaseTypeMap(musicGroupId));
|
|
|
- Map<Integer,String> userSubjectMap = MapUtil.convertIntegerMap(subjectDao.findByMusicGroupAndUsers(musicGroupId, userIds));
|
|
|
+ Map<Integer,String> userSubjectMap = MapUtil.convertIntegerMap(subjectDao.findByMusicGroupUserSubject(musicGroupId, userIds));
|
|
|
MusicalListDetailDtos.forEach(e->{
|
|
|
e.setGoodsNames(goodsNameMap.get(e.getPaymentOrderId()));
|
|
|
e.setMusicGroupName(musicGroup.getName());
|