|
@@ -3,10 +3,7 @@ package com.ym.mec.biz.service.impl;
|
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
|
import com.ym.mec.biz.dal.dto.MusicalListDetailDto;
|
|
|
import com.ym.mec.biz.dal.entity.*;
|
|
|
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
|
|
|
-import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
|
|
|
-import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
|
|
|
-import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
|
|
|
+import com.ym.mec.biz.dal.enums.*;
|
|
|
import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
@@ -587,7 +584,6 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
|
|
|
studentCourseFeeDetail.setOperator(studentPaymentOrder.getUserId());
|
|
|
studentCourseFeeDetailDao.insert(studentCourseFeeDetail);
|
|
|
}
|
|
|
- studentRegistrationDao.update(studentRegistration);
|
|
|
|
|
|
//缴费项目详情
|
|
|
musicGroupPaymentCalenderDetailService.addCalenderDetail(studentPaymentOrder, studentRegistration);
|
|
@@ -632,11 +628,15 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
|
|
|
|
|
|
//学生云教练处理
|
|
|
if (detailTypeEnums.contains(CLOUD_TEACHER)) {
|
|
|
+ if(studentPaymentOrder.getType() == OrderTypeEnum.APPLY){
|
|
|
+ studentRegistration.setHasCloudTeacher(1);
|
|
|
+ }
|
|
|
BigDecimal cloudTeacherFee = allDetails.stream().filter(o -> o.getType() == CLOUD_TEACHER)
|
|
|
.map(o -> o.getPrice().subtract(o.getRemitFee() == null ? BigDecimal.ZERO : o.getRemitFee()))
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
cloudTeacherOrderService.addOrderDetail2CloudTeacher(studentPaymentOrder, cloudTeacherFee);
|
|
|
}
|
|
|
+ studentRegistrationDao.update(studentRegistration);
|
|
|
}
|
|
|
|
|
|
@Override
|