|
@@ -5043,9 +5043,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
}
|
|
|
Map<Integer, ClassGroupStudentMapper> studentMapperMap = studentMapperList.stream().collect(Collectors.toMap(ClassGroupStudentMapper::getUserId, o->o ,(k1,k2)->k2));
|
|
|
|
|
|
- List<StudentApplyRefunds> applyRefunds = studentApplyRefundsDao.findByGroupAndType(query.getLiveGroupId().toString(), GroupType.LIVE.getCode());
|
|
|
- Map<Integer, List<StudentApplyRefunds>> studentApplyRefundsMap = applyRefunds.stream()
|
|
|
- .collect(Collectors.groupingBy(StudentApplyRefunds::getUserId));
|
|
|
+// List<StudentApplyRefunds> applyRefunds = studentApplyRefundsDao.findByGroupAndType(query.getLiveGroupId().toString(), GroupType.LIVE.getCode());
|
|
|
+// Map<Integer, List<StudentApplyRefunds>> studentApplyRefundsMap = applyRefunds.stream()
|
|
|
+// .collect(Collectors.groupingBy(StudentApplyRefunds::getUserId));
|
|
|
records.forEach(data -> {
|
|
|
ClassGroupStudentMapper classGroupStudentMapper = studentMapperMap.get(data.getStudentId());
|
|
|
if (Objects.isNull(classGroupStudentMapper)) {
|
|
@@ -5060,14 +5060,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- List<StudentApplyRefunds> studentApplyRefunds = studentApplyRefundsMap.get(data.getStudentId());
|
|
|
+ /*List<StudentApplyRefunds> studentApplyRefunds = studentApplyRefundsMap.get(data.getStudentId());
|
|
|
if (!CollectionUtils.isEmpty(studentApplyRefunds)) {
|
|
|
StudentApplyRefunds studentApplyRefund = studentApplyRefunds.get(0);
|
|
|
if (data.getStudentStatus() == 0 && studentApplyRefund.getStatus().equals(StudentApplyRefundsStatus.ING)) {
|
|
|
data.setStudentStatus(2);
|
|
|
return;
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
data.setStudentStatus(0);
|
|
|
});
|
|
|
|