|
|
@@ -1150,8 +1150,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
BigDecimal ots = results.get("onlineTeacherSalary");
|
|
|
BigDecimal ofts = results.get("offlineTeacherSalary");
|
|
|
- if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)
|
|
|
- &&vipGroup.getStatus().equals(VipGroupStatusEnum.NOT_START)
|
|
|
+ if(!vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)
|
|
|
+ &&!vipGroup.getStatus().equals(VipGroupStatusEnum.NOT_START)
|
|
|
+ &&!vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING_END)
|
|
|
&&normalStudentNum!=vipGroupCategory.getStudentNum()){
|
|
|
ots = ots.divide(new BigDecimal(vipGroupCategory.getStudentNum()),CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
ofts = ofts.divide(new BigDecimal(vipGroupCategory.getStudentNum()),CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
Joburgess