Merge remote-tracking branch 'origin/master'

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

@@ -350,6 +350,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                         || musicGroupSubjectGoodsGroup.getKitGroupPurchaseTypeJson().equals("{}"))) {
                     throw new BizException(musicGroupSubjectGoodsGroup.getName() + " 请选择提供方式");
                 }
+                if(musicGroupSubjectGoodsGroup.getGroupRemissionCourseFee() == null){
+                    musicGroupSubjectGoodsGroup.setGroupRemissionCourseFee(0);
+                }
             }
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups, musicGroupId);
         }
@@ -977,6 +980,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                             || musicGroupSubjectGoodsGroup.getKitGroupPurchaseTypeJson().equals("{}"))) {
                         throw new BizException(musicGroupSubjectGoodsGroup.getName() + " 请选择提供方式");
                     }
+                    if(musicGroupSubjectGoodsGroup.getGroupRemissionCourseFee()==null){
+                        musicGroupSubjectGoodsGroup.setGroupRemissionCourseFee(0);
+                    }
                 }
 
                 musicGroupSubjectGoodsGroupDao.batchInsert(subFeeSettingDto.getMusicGroupSubjectGoodsGroups(), musicGroupId);

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

@@ -350,8 +350,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         ArrayList<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<>();
         StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
         studentPaymentOrderDetail.setType(OrderDetailTypeEnum.COURSE);
-        studentPaymentOrderDetail.setPrice(courseFee.subtract(courseRemitFee));
-        studentPaymentOrderDetail.setRemitFee(courseRemitFee);
+        studentPaymentOrderDetail.setPrice(BigDecimal.ZERO);
+        studentPaymentOrderDetail.setRemitFee(BigDecimal.ZERO);
         studentPaymentOrderDetail.setCreateTime(date);
         studentPaymentOrderDetail.setUpdateTime(date);
         studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
@@ -427,6 +427,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());
@@ -486,8 +493,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         List<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<>();
         StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
         studentPaymentOrderDetail.setType(OrderDetailTypeEnum.COURSE);
-        studentPaymentOrderDetail.setPrice(courseFee.subtract(courseRemitFee));
-        studentPaymentOrderDetail.setRemitFee(courseRemitFee);
+        studentPaymentOrderDetail.setPrice(BigDecimal.ZERO);
+        studentPaymentOrderDetail.setRemitFee(BigDecimal.ZERO);
         studentPaymentOrderDetail.setCreateTime(date);
         studentPaymentOrderDetail.setUpdateTime(date);
         studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
@@ -563,7 +570,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());