|
|
@@ -686,12 +686,12 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
|
|
|
Map<Long,CourseScheduleStudentPayment> courseActivityUserMap = courseScheduleStudentPayments.stream().collect(Collectors.groupingBy(CourseScheduleStudentPayment::getCourseScheduleId,
|
|
|
Collectors.collectingAndThen(Collectors.toList(),value->value.get(0))));
|
|
|
for (CourseScheduleTeacherSalary teacherSalary : courseScheduleTeacherSalaries) {
|
|
|
- String s = settlementMap.get(teacherSalary.getCourseScheduleId());
|
|
|
+ CourseScheduleStudentPayment studentPayment = courseActivityUserMap.get(teacherSalary.getCourseScheduleId());
|
|
|
+ String s = settlementMap.get(studentPayment.getActivityUserMapperId());
|
|
|
if (StringUtils.isEmpty(s)) {
|
|
|
continue;
|
|
|
}
|
|
|
VipGroupSalarySettlementDto settlementDto = JSON.parseObject(s, VipGroupSalarySettlementDto.class);
|
|
|
- CourseScheduleStudentPayment studentPayment = courseActivityUserMap.get(teacherSalary.getCourseScheduleId());
|
|
|
//判断是否使用的赠送的排课资格
|
|
|
VipGroupSalarySettlementTypeDto vipOfflineSalarySettlement;
|
|
|
if(studentPayment.getGiveFlag()){
|
