|  | @@ -144,7 +144,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 | 
											
												
													
														|  |          //乐团计划及收费信息
 |  |          //乐团计划及收费信息
 | 
											
												
													
														|  |          MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 |  |          MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 | 
											
												
													
														|  |          musicOneSubjectClassPlan.setFee(studentRegistration.getTemporaryCourseFee());
 |  |          musicOneSubjectClassPlan.setFee(studentRegistration.getTemporaryCourseFee());
 | 
											
												
													
														|  | -        
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |          //乐团乐器及辅件信息
 |  |          //乐团乐器及辅件信息
 | 
											
												
													
														|  |          List<MusicGroupSubjectGoodsGroup> goodsGroups = new ArrayList<>();
 |  |          List<MusicGroupSubjectGoodsGroup> goodsGroups = new ArrayList<>();
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -160,6 +160,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 | 
											
												
													
														|  |                  musicGroupSubjectGoodsGroup.setType(GoodsType.ACCESSORIES);
 |  |                  musicGroupSubjectGoodsGroup.setType(GoodsType.ACCESSORIES);
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
												
													
														|  |              musicGroupSubjectGoodsGroup.setId(orderDetail.getId());
 |  |              musicGroupSubjectGoodsGroup.setId(orderDetail.getId());
 | 
											
												
													
														|  | 
 |  | +            musicGroupSubjectGoodsGroup.setGoodsIdList(orderDetail.getGoodsIdList());
 | 
											
												
													
														|  |              musicGroupSubjectGoodsGroup.setMusicGroupId(musicGroupId);
 |  |              musicGroupSubjectGoodsGroup.setMusicGroupId(musicGroupId);
 | 
											
												
													
														|  |              musicGroupSubjectGoodsGroup.setPrice(orderDetail.getPrice());
 |  |              musicGroupSubjectGoodsGroup.setPrice(orderDetail.getPrice());
 | 
											
												
													
														|  |              List<Goods> goodies = goodsService.findGoodsByIds(orderDetail.getGoodsIdList());
 |  |              List<Goods> goodies = goodsService.findGoodsByIds(orderDetail.getGoodsIdList());
 |