Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -5298,15 +5298,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		Map<Integer, List<CourseScheduleStudentPayment>> otherStudentCourseMap = courseScheduleStudentPayments.stream().filter(c -> !courseMergeInfo.getId().equals(c.getCourseScheduleId())).collect(Collectors.groupingBy(CourseScheduleStudentPayment::getUserId));
 
 		List<CourseScheduleStudentPayment> newPayments = new ArrayList<>();
-		List<CourseScheduleStudentPayment> updatePayments = new ArrayList<>();
+//		List<CourseScheduleStudentPayment> updatePayments = new ArrayList<>();
 
 		for (Map.Entry<Integer, List<CourseScheduleStudentPayment>> otherStudentCourseMapEntry : otherStudentCourseMap.entrySet()) {
 			List<CourseScheduleStudentPayment> studentCoursePayments = otherStudentCourseMapEntry.getValue();
 			BigDecimal salary = studentCoursePayments.stream().map(CourseScheduleStudentPayment::getExpectPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
 			if(mainStudentCourseMap.containsKey(otherStudentCourseMapEntry.getKey())){
-				CourseScheduleStudentPayment updatePayment = mainStudentCourseMap.get(otherStudentCourseMapEntry.getKey());
-				updatePayment.setExpectPrice(updatePayment.getExpectPrice().add(salary));
-				updatePayments.add(updatePayment);
+//				CourseScheduleStudentPayment updatePayment = mainStudentCourseMap.get(otherStudentCourseMapEntry.getKey());
+//				updatePayment.setExpectPrice(updatePayment.getExpectPrice().add(salary));
+//				updatePayments.add(updatePayment);
 
 //				for (CourseScheduleStudentPayment studentCoursePayment : studentCoursePayments) {
 //					studentCoursePayment.setExpectPrice(BigDecimal.ZERO);
@@ -5357,9 +5357,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 		courseScheduleDao.batchUpdate(mergeCourses);
 
-		if(!CollectionUtils.isEmpty(updatePayments)){
-			courseScheduleStudentPaymentDao.batchUpdate(updatePayments);
-		}
+//		if(!CollectionUtils.isEmpty(updatePayments)){
+//			courseScheduleStudentPaymentDao.batchUpdate(updatePayments);
+//		}
 		if(!CollectionUtils.isEmpty(newPayments))
 			courseScheduleStudentPaymentDao.batchInsert(newPayments);
 
@@ -5390,7 +5390,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseScheduleStudentPayment> otherCoursePayments = courseScheduleStudentPayments.stream().filter(c -> c.getCourseScheduleId().equals(mainCourseId)).collect(Collectors.toList());
 
 		List<Integer> deletePaymentIds = new ArrayList<>();
-		List<CourseScheduleStudentPayment> updatePayments = new ArrayList<>();
+//		List<CourseScheduleStudentPayment> updatePayments = new ArrayList<>();
 
 		otherCoursePayments.sort(Comparator.comparing(CourseScheduleStudentPayment::getCreateTime).reversed());
 		for (CourseScheduleStudentPayment otherCoursePayment : otherCoursePayments) {
@@ -5398,16 +5398,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(Objects.isNull(mainCoursePayment.getBeMerged())){
 				throw new BizException("当前课程暂不支持此操作");
 			}
-			if(mainCoursePayment.getBeMerged()){
-				deletePaymentIds.add(mainCoursePayment.getId().intValue());
-				continue;
-			}
-			mainCoursePayment.setExpectPrice(mainCoursePayment.getExpectPrice().subtract(otherCoursePayment.getExpectPrice()));
-			updatePayments.add(mainCoursePayment);
+//			if(mainCoursePayment.getBeMerged()){
+//				deletePaymentIds.add(mainCoursePayment.getId().intValue());
+//				continue;
+//			}
+//			mainCoursePayment.setExpectPrice(mainCoursePayment.getExpectPrice().subtract(otherCoursePayment.getExpectPrice()));
+//			updatePayments.add(mainCoursePayment);
 		}
 
 		courseScheduleStudentPaymentDao.batchDeleteWithID(deletePaymentIds);
-		courseScheduleStudentPaymentDao.batchUpdate(updatePayments);
+//		courseScheduleStudentPaymentDao.batchUpdate(updatePayments);
 
 		List<CourseScheduleModifyLog> insertCourseScheduleModifyLogList = new ArrayList<>();
 		for (CourseSchedule courseSchedule : courseSchedules) {

mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -630,12 +630,14 @@
 			cs.status_ course_status_
 		FROM
 			course_schedule_student_payment cssp
-		LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+			LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+			LEFT JOIN course_schedule cs1 ON cs.new_course_id_=cs1.id_
 		WHERE
 			cssp.batch_no_ IS NOT NULL
 			AND cs.id_ IS NOT NULL
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
-			AND ((cs.status_ IN ('OVER', 'UNDERWAY') AND (cssp.actual_price_ IS NULL OR cssp.actual_price_ < cssp.expect_price_))
+			AND (((cs.status_ IN ('OVER', 'UNDERWAY') OR OR cs1.status_ IN ( 'OVER', 'UNDERWAY' ))
+			          AND (cssp.actual_price_ IS NULL OR cssp.actual_price_ < cssp.expect_price_))
 			OR ( cs.status_ = 'NOT_START' AND cssp.actual_price_ IS NOT NULL AND cssp.actual_price_ > 0))
 			<if test="groupIds!=null and groupIds.size()>0">
 				AND cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}