| 
														
															@@ -309,7 +309,7 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @Override 
														 | 
														
														 | 
														
															     @Override 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     public void addOrderDetail2Activity(StudentPaymentOrder studentPaymentOrder, List<StudentPaymentOrderDetail> activity) { 
														 | 
														
														 | 
														
															     public void addOrderDetail2Activity(StudentPaymentOrder studentPaymentOrder, List<StudentPaymentOrderDetail> activity) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.queryByIds(activity.stream(). 
														 | 
														
														 | 
														
															 		List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.queryByIds(activity.stream(). 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-				map(e -> e.getIncomeItem()).distinct().collect(Collectors.joining(","))); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+				map(e -> e.getStudentInstrumentId().toString()).distinct().collect(Collectors.joining(","))); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		Map<Integer, VipGroupActivity> collect = vipGroupActivities.stream().collect(Collectors.groupingBy(e -> e.getId(), 
														 | 
														
														 | 
														
															 		Map<Integer, VipGroupActivity> collect = vipGroupActivities.stream().collect(Collectors.groupingBy(e -> e.getId(), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0)))); 
														 | 
														
														 | 
														
															 				Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0)))); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		List<ActivityUserMapper> activityUserMapperList = new ArrayList<>(); 
														 | 
														
														 | 
														
															 		List<ActivityUserMapper> activityUserMapperList = new ArrayList<>(); 
														 |