|
@@ -2259,7 +2259,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
teacherOfflineSalary = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
|
|
|
}
|
|
|
if(Objects.nonNull(vipOfflineSalarySettlement)){
|
|
|
- if(giveVipOfflineSalarySettlement.getSalarySettlementType() == SalarySettlementTypeEnum.FIXED_SALARY){
|
|
|
+ if(vipOfflineSalarySettlement.getSalarySettlementType() == SalarySettlementTypeEnum.FIXED_SALARY){
|
|
|
teacherOfflineSalary = vipOfflineSalarySettlement.getSettlementValue();
|
|
|
}
|
|
|
}
|
|
@@ -2274,7 +2274,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
if(Objects.nonNull(giveVipOfflineSalarySettlement)){
|
|
|
if(giveVipOfflineSalarySettlement.getSalarySettlementType() == SalarySettlementTypeEnum.FIXED_SALARY){
|
|
|
giveTeacherOfflineSalary = giveVipOfflineSalarySettlement.getSettlementValue();
|
|
|
- results.put("giveOfflineTeacherSalary",giveVipOfflineSalarySettlement.getSettlementValue().setScale(0, BigDecimal.ROUND_HALF_UP));
|
|
|
}
|
|
|
}
|
|
|
results.put("giveOfflineTeacherSalary",giveTeacherOfflineSalary.setScale(0, BigDecimal.ROUND_HALF_UP));
|