Browse Source

fix 导出分发清单声部问题

周箭河 5 năm trước cách đây
mục cha
commit
6ff92e4213

+ 6 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderDetailServiceImpl.java

@@ -173,10 +173,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
     @Override
     public List<MusicalListDetailDto> getMusicalListDetail(String musicGroupId) {
-        List<MusicalListDetailDto> MusicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId);
-        if(MusicalListDetailDtos != null && MusicalListDetailDtos.size() > 0){
-            List<Long> paymentOrderNo = MusicalListDetailDtos.stream().map(e -> e.getPaymentOrderId()).collect(Collectors.toList());
-            List<Integer> userIds = MusicalListDetailDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+        List<MusicalListDetailDto> musicalListDetailDtos = studentPaymentOrderDetailDao.getMusicalListDetail(musicGroupId);
+        if(musicalListDetailDtos != null && musicalListDetailDtos.size() > 0){
+            List<Long> paymentOrderNo = musicalListDetailDtos.stream().map(MusicalListDetailDto::getPaymentOrderId).collect(Collectors.toList());
+            List<Integer> userIds = musicalListDetailDtos.stream().map(MusicalListDetailDto::getUserId).collect(Collectors.toList());
             //商品名称
             MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
             Organization organization = organizationDao.get(musicGroup.getOrganId());
@@ -188,7 +188,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             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.findByMusicGroupUserSubject(musicGroupId, userIds));
-            MusicalListDetailDtos.forEach(e->{
+            musicalListDetailDtos.forEach(e->{
                 e.setGoodsNames(goodsNameMap.get(e.getPaymentOrderId()));
                 e.setMusicGroupName(musicGroup.getName());
                 e.setUsername(usernameMap.get(e.getUserId()));
@@ -204,7 +204,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 }
             });
         }
-        return MusicalListDetailDtos;
+        return musicalListDetailDtos;
     }
 
     @Override