Merge remote-tracking branch 'origin/master'

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

@@ -5120,8 +5120,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			return null;
 		}
 		List<CourseScheduleAuditDetailDto> courseSchedules = new ArrayList<>();
-		for (int i = 0; i < scheduleModifyLogs.size(); i++) {
+		for (int i = scheduleModifyLogs.size() - 1; i >= 0; i--) {
 			CourseScheduleModifyLog modifyLog = scheduleModifyLogs.get(i);
+			CourseScheduleAuditDetailDto detailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
+			detailDto.setOperatorId(modifyLog.getOperatorId());
+			detailDto.setAuditTime(modifyLog.getCreateTime());
+			courseSchedules.add(detailDto);
 			if(i == 0){
 				//如果是第一次调整
 				CourseScheduleAuditDetailDto dto = JSON.parseObject(modifyLog.getPreviousCourseSchedule(), CourseScheduleAuditDetailDto.class);
@@ -5129,18 +5133,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				dto.setAuditTime(modifyLog.getCreateTime());
 				courseSchedules.add(dto);
 			}
-			if(i == 1){
-				continue;
-			}
-			CourseScheduleAuditDetailDto detailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
-			detailDto.setOperatorId(modifyLog.getOperatorId());
-			detailDto.setAuditTime(modifyLog.getCreateTime());
-			courseSchedules.add(detailDto);
 		}
 		if(courseSchedules.size() > 0){
 			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
 			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet()));
-			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet()));
+			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet()));
 			Set<Integer> schoolIds = courseSchedules.stream().map(e -> e.getSchoolId()).collect(Collectors.toSet());
 			Map<Integer, String> actualTeacherMap = getMap("sys_user", "id_", "real_name_", actualTeacherIds, Integer.class, String.class);
 			Map<Integer, String> schoolMap = getMap("school", "id_", "name_", schoolIds, Integer.class, String.class);

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

@@ -1835,6 +1835,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
                 oldStudentPaymentOrder.setStatus(CLOSE);
                 studentPaymentOrderService.update(oldStudentPaymentOrder);
+                if (oldStudentPaymentOrder.getBalancePaymentAmount() != null && oldStudentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    sysUserCashAccountService.updateBalance(oldStudentPaymentOrder.getUserId(), oldStudentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "关闭订单");
+                }
             }
         }
         String orderNo = idGeneratorService.generatorId("payment") + "";