|
@@ -563,12 +563,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
if(Objects.isNull(teacherOnlineSalary)){
|
|
|
teacherOnlineSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
|
|
|
+ if(Objects.isNull(teacherOnlineSalary)){
|
|
|
+ throw new BizException("请设置教师课酬");
|
|
|
+ }
|
|
|
+ teacherOnlineSalary=teacherOfflineSalary.multiply(classTimeDuty);
|
|
|
}
|
|
|
-
|
|
|
- if(Objects.isNull(teacherOnlineSalary)){
|
|
|
- throw new BizException("请设置教师课酬");
|
|
|
- }
|
|
|
- results.put("onlineTeacherSalary",teacherOnlineSalary.multiply(classTimeDuty));
|
|
|
+ results.put("onlineTeacherSalary",teacherOnlineSalary);
|
|
|
break;
|
|
|
case RATIO_DISCOUNT:
|
|
|
results.put("onlineTeacherSalary",onlineClassesUnitPrice.multiply((vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue())).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
@@ -590,11 +590,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
}
|
|
|
if(Objects.isNull(teacherOfflineSalary)){
|
|
|
teacherOfflineSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
|
|
|
+ if(Objects.isNull(teacherOfflineSalary)){
|
|
|
+ throw new BizException("请设置教师课酬");
|
|
|
+ }
|
|
|
+ teacherOfflineSalary=teacherOfflineSalary.multiply(classTimeDuty);
|
|
|
}
|
|
|
- if(Objects.isNull(teacherOfflineSalary)){
|
|
|
- throw new BizException("请设置教师课酬");
|
|
|
- }
|
|
|
- results.put("offlineTeacherSalary",teacherOfflineSalary.multiply(classTimeDuty));
|
|
|
+ results.put("offlineTeacherSalary",teacherOfflineSalary);
|
|
|
break;
|
|
|
case RATIO_DISCOUNT:
|
|
|
results.put("offlineTeacherSalary",offlineClassesUnitPrice.multiply(vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSettlementValue()).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
|