增加乐团减免课程费用

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

@@ -356,7 +356,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
         studentPaymentOrderDetail.setType(OrderDetailTypeEnum.COURSE);
         studentPaymentOrderDetail.setPrice(courseFee.subtract(courseRemitFee));
-        studentPaymentOrderDetail.setRemitFee(courseRemitFee);
+        studentPaymentOrderDetail.setRemitFee(BigDecimal.ZERO);
         studentPaymentOrderDetail.setCreateTime(date);
         studentPaymentOrderDetail.setUpdateTime(date);
         studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
@@ -432,6 +432,13 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 StudentPaymentOrderDetail studentPaymentOrderDetailCourse = new StudentPaymentOrderDetail();
                 studentPaymentOrderDetailCourse.setType(OrderDetailTypeEnum.valueOf(newCourse.getCourseType().getCode()));
                 studentPaymentOrderDetailCourse.setPrice(newCourse.getCourseCurrentPrice());
+                if (courseRemitFee.compareTo(BigDecimal.ZERO) > 0 && !newCourse.getIsStudentOptional()) {
+                    studentPaymentOrderDetailCourse.setPrice(BigDecimal.ZERO);
+                    studentPaymentOrderDetailCourse.setRemitFee(newCourse.getCourseCurrentPrice());
+                }else {
+                    studentPaymentOrderDetailCourse.setPrice(newCourse.getCourseCurrentPrice());
+                    studentPaymentOrderDetailCourse.setRemitFee(BigDecimal.ZERO);
+                }
                 studentPaymentOrderDetailCourse.setCreateTime(date);
                 studentPaymentOrderDetailCourse.setUpdateTime(date);
                 studentPaymentOrderDetailCourse.setPaymentOrderId(studentPaymentOrder.getId());
@@ -568,7 +575,13 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             for (MusicGroupPaymentCalenderCourseSettings newCourse : newCourses) {
                 StudentPaymentOrderDetail studentPaymentOrderDetailCourse = new StudentPaymentOrderDetail();
                 studentPaymentOrderDetailCourse.setType(OrderDetailTypeEnum.valueOf(newCourse.getCourseType().getCode()));
-                studentPaymentOrderDetailCourse.setPrice(newCourse.getCourseCurrentPrice());
+                if (courseRemitFee.compareTo(BigDecimal.ZERO) > 0 && !newCourse.getIsStudentOptional()) {
+                    studentPaymentOrderDetailCourse.setPrice(BigDecimal.ZERO);
+                    studentPaymentOrderDetailCourse.setRemitFee(newCourse.getCourseCurrentPrice());
+                }else {
+                    studentPaymentOrderDetailCourse.setPrice(newCourse.getCourseCurrentPrice());
+                    studentPaymentOrderDetailCourse.setRemitFee(BigDecimal.ZERO);
+                }
                 studentPaymentOrderDetailCourse.setCreateTime(date);
                 studentPaymentOrderDetailCourse.setUpdateTime(date);
                 studentPaymentOrderDetailCourse.setPaymentOrderId(studentPaymentOrder.getId());