update

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

@@ -367,13 +367,17 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         	subjectChange = subjectChangeMap.get(studentRegistration.getUserId());
         	if(subjectChange != null && minPaymentOrderId <= subjectChange.getOriginalOrderId()){
         		dto.setAccessoriesAmount(subjectChange.getChangeAccessoriesPrice());
-        		dto.setAccessoriesName(subjectChange.getChangeAccessoriesGoods().stream().map(Goods::getName).collect(Collectors.joining(",")));
+        		if(subjectChange.getChangeAccessoriesGoods() != null){
+        			dto.setAccessoriesName(subjectChange.getChangeAccessoriesGoods().stream().map(Goods::getName).collect(Collectors.joining(",")));
+        		}
         		
         		dto.setCourseAmount(userOrderTypeMap.get(OrderDetailTypeEnum.COURSE));
         		//dto.setGoodsNames(goodsNames);
         		dto.setKitGroupPurchaseTypeEnum(subjectChange.getKitGroupPurchaseType());
         		dto.setMusicalAmount(subjectChange.getChangeMusicalPrice());
-        		dto.setMusicalName(subjectChange.getChangeMusicalGoods().getName());
+        		if(subjectChange.getChangeMusicalGoods() != null){
+        			dto.setMusicalName(subjectChange.getChangeMusicalGoods().getName());
+        		}
         		dto.setMusicGroupName(musicGroup.getName());
         		dto.setOrganName(organization.getName());
         		dto.setOrderAmount(withoutMusicalTotalAmount.add(subjectChange.getChangeMusicalPrice().add(subjectChange.getChangeAccessoriesPrice())));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -404,6 +404,9 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         List<Long> paymentOrderIdList = studentPaymentOrderList.stream().map(t -> t.getId()).collect(Collectors.toList());
 
         List<StudentPaymentOrderDetail> details = studentPaymentOrderDetailDao.getWithIds(paymentOrderIdList);
+        
+        //查询乐器订单
+        StudentPaymentOrderDetail musicalOrderDetail = details.stream().filter(t -> t.getType().equals(OrderDetailTypeEnum.MUSICAL)).findFirst().get();
 
         Set<Integer> refundSellOrderGoodsIds = getRefundGoodsId(details.stream().map(t -> t.getPaymentOrderId()).collect(Collectors.toList()));
 
@@ -412,7 +415,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChange.setOrganId(musicGroup.getOrganId());
         subjectChange.setCooperationOrganId(musicGroup.getCooperationOrganId());
         subjectChange.setMusicGroupId(musicGroupId);
-        subjectChange.setOrderId(details.get(0).getPaymentOrderId().intValue());
+        subjectChange.setOrderId(musicalOrderDetail.getPaymentOrderId().intValue());
         String accessoriesIds = "";
         BigDecimal accessoriesPrice = BigDecimal.ZERO;
         for (StudentPaymentOrderDetail detail : details) {