Joburgess преди 4 години
родител
ревизия
019b7fd846
променени са 1 файла, в които са добавени 19 реда и са изтрити 3 реда
  1. 19 3
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

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

@@ -5389,19 +5389,35 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		List<CourseScheduleStudentPayment> otherCoursePayments = courseScheduleStudentPayments.stream().filter(c -> c.getCourseScheduleId().equals(mainCourseId)).collect(Collectors.toList());
 
-		List<Long> deletePaymentIds = new ArrayList<>();
+		List<Integer> deletePaymentIds = new ArrayList<>();
 		List<CourseScheduleStudentPayment> updatePayments = new ArrayList<>();
 
 		for (CourseScheduleStudentPayment otherCoursePayment : otherCoursePayments) {
 			CourseScheduleStudentPayment mainCoursePayment = studentMainCoursePaymentMap.get(otherCoursePayment.getUserId());
 			if(Objects.nonNull(mainCoursePayment.getBeMerged())&&mainCoursePayment.getBeMerged()){
-				deletePaymentIds.add(mainCoursePayment.getId());
+				deletePaymentIds.add(mainCoursePayment.getId().intValue());
 				continue;
 			}
 			mainCoursePayment.setExpectPrice(mainCoursePayment.getExpectPrice().subtract(otherCoursePayment.getExpectPrice()));
 			updatePayments.add(mainCoursePayment);
 		}
 
-//		courseScheduleStudentPaymentDao.batchDeleteWithID()
+		courseScheduleStudentPaymentDao.batchDeleteWithID(deletePaymentIds);
+		courseScheduleStudentPaymentDao.batchUpdate(updatePayments);
+
+		List<CourseScheduleModifyLog> insertCourseScheduleModifyLogList = new ArrayList<>();
+		for (CourseSchedule courseSchedule : courseSchedules) {
+			CourseScheduleModifyLog courseScheduleModifyLog = new CourseScheduleModifyLog();
+			courseScheduleModifyLog.setCourseScheduleId(courseSchedule.getId());
+			courseScheduleModifyLog.setCreateTime(now);
+			courseScheduleModifyLog.setPreviousCourseSchedule(JsonUtil.toJSONString(courseSchedule));
+
+			//课程信息变更
+			courseSchedule.setNewCourseId(courseSchedule.getId());
+
+			courseScheduleModifyLog.setCurrentCourseSchedule(JsonUtil.toJSONString(courseSchedule));
+//			courseScheduleModifyLog.setOperatorId(courseMergeInfo.getOperatorId());
+			insertCourseScheduleModifyLogList.add(courseScheduleModifyLog);
+		}
     }
 }