|
@@ -307,6 +307,16 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
actualTotalAmount = courseActualAmount.add(memberActualAmount)
|
|
|
.add(repairActualAmount)
|
|
|
.add(activityActualAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
+ //标记是否云教练缴费
|
|
|
+ if(musicGroupPaymentCalender.getPayUserType() == STUDENT && musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
|
|
|
+ if(musicGroupPaymentCalender.getPaymentType() == ADD_STUDENT){
|
|
|
+ musicGroupPaymentCalender.setCloudTeacherPaymentFlag(true);
|
|
|
+ }else if(memberActualAmount.compareTo(BigDecimal.ZERO) > 0 &&
|
|
|
+ ((courseActualAmount.compareTo(BigDecimal.ZERO) == 0 && CollectionUtils.isNotEmpty(musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList()))
|
|
|
+ || (activityActualAmount.compareTo(BigDecimal.ZERO) == 0 && CollectionUtils.isNotEmpty(musicGroupPaymentBaseCalender.getCalenderActivityList())))) {
|
|
|
+ musicGroupPaymentCalender.setCloudTeacherPaymentFlag(true);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
PaymentCalenderStatusEnum status;
|
|
@@ -353,17 +363,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
// 设置批次号
|
|
|
String batchNo = idGeneratorService.generatorId() + "";
|
|
|
musicGroupPaymentCalender.setBatchNo(batchNo);
|
|
|
- //标记是否云教练缴费
|
|
|
- if(musicGroupPaymentCalender.getPayUserType() == STUDENT && musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
|
|
|
- if(musicGroupPaymentCalender.getPaymentType() == ADD_STUDENT){
|
|
|
- musicGroupPaymentCalender.setCloudTeacherPaymentFlag(true);
|
|
|
- }/*else if(memberActualAmount.compareTo(BigDecimal.ZERO) > 0 &&
|
|
|
- ((courseActualAmount.compareTo(BigDecimal.ZERO) == 0 && CollectionUtils.isNotEmpty(musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList()))
|
|
|
- || (activityActualAmount.compareTo(BigDecimal.ZERO) == 0 && CollectionUtils.isNotEmpty(musicGroupPaymentBaseCalender.getCalenderActivityList())))) {
|
|
|
- musicGroupPaymentCalender.setCloudTeacherPaymentFlag(true);
|
|
|
- }*/
|
|
|
- }
|
|
|
+
|
|
|
musicGroupPaymentCalenderDao.insert(musicGroupPaymentCalender);
|
|
|
+ musicGroupPaymentBaseCalender.setCurrentTotalAmount(musicGroupPaymentCalender.getCurrentTotalAmount());
|
|
|
musicGroupPaymentBaseCalender.setCalenderId(musicGroupPaymentCalender.getId());
|
|
|
//如果是学校缴费,需要保存还款周期
|
|
|
musicGroupCalenderRefundPeriodService.savePeriod(musicGroupPaymentBaseCalender);
|