|
@@ -2443,7 +2443,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
break;
|
|
|
case MUSICAL:
|
|
|
if(StringUtils.equals(orderDetail.getIncomeItem(), OrderDetailTypeEnum.CLOUD_TEACHER.name())){
|
|
|
- row.setCloudTeacherFee(orderDetail.getIncome());
|
|
|
+ row.setCloudTeacherFee(row.getCloudTeacherFee().add(orderDetail.getIncome()));
|
|
|
break;
|
|
|
}
|
|
|
if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
|
|
@@ -2459,14 +2459,14 @@ public class ExportServiceImpl implements ExportService {
|
|
|
case ACCESSORIES:
|
|
|
case TEACHING:
|
|
|
if(StringUtils.equals(orderDetail.getIncomeItem(), OrderDetailTypeEnum.CLOUD_TEACHER.name())){
|
|
|
- row.setCloudTeacherFee(orderDetail.getIncome());
|
|
|
+ row.setCloudTeacherFee(row.getCloudTeacherFee().add(orderDetail.getIncome()));
|
|
|
break;
|
|
|
}
|
|
|
row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
|
|
|
break;
|
|
|
case OTHER:
|
|
|
if(StringUtils.equals(orderDetail.getIncomeItem(), OrderDetailTypeEnum.CLOUD_TEACHER.name())){
|
|
|
- row.setCloudTeacherFee(orderDetail.getIncome());
|
|
|
+ row.setCloudTeacherFee(row.getCloudTeacherFee().add(orderDetail.getIncome()));
|
|
|
break;
|
|
|
}
|
|
|
row.setOtherFee(row.getOtherFee().add(orderDetail.getPrice()));
|
|
@@ -2484,7 +2484,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
cloudTeacherFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
|
|
|
}
|
|
|
- row.setCloudTeacherFee(cloudTeacherFee);
|
|
|
+ row.setCloudTeacherFee(row.getCloudTeacherFee().add(cloudTeacherFee));
|
|
|
break;
|
|
|
case DEGREE_REGISTRATION:
|
|
|
BigDecimal degreeFee = BigDecimal.ZERO;
|