|
@@ -859,7 +859,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
if(studentPaymentNum.equals(classGroup.getExpectStudentNum())&&updateVipStatus){
|
|
if(studentPaymentNum.equals(classGroup.getExpectStudentNum())&&updateVipStatus){
|
|
classGroup.setStudentNum(studentPaymentNum);
|
|
classGroup.setStudentNum(studentPaymentNum);
|
|
classGroup.setDelFlag(0);
|
|
classGroup.setDelFlag(0);
|
|
- vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
|
|
|
|
|
|
+ vipGroup.setStatus(VipGroupStatusEnum.APPLYING_END);
|
|
vipGroupDao.update(vipGroup);
|
|
vipGroupDao.update(vipGroup);
|
|
createVipGroupCourseScheInfo(vipGroupId,classGroup);
|
|
createVipGroupCourseScheInfo(vipGroupId,classGroup);
|
|
}
|
|
}
|
|
@@ -1373,7 +1373,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
vipGroupSalaryBaseInfo.setTotalFeeDeduction(new BigDecimal(0));
|
|
vipGroupSalaryBaseInfo.setTotalFeeDeduction(new BigDecimal(0));
|
|
}
|
|
}
|
|
|
|
|
|
- BigDecimal totalCoursePrice= studentPaymentOrderDao.sumGroupIncomeFee(classGroup.getId().toString(),GroupType.VIP.getCode());
|
|
|
|
|
|
+ BigDecimal totalCoursePrice= studentPaymentOrderDao.sumGroupIncomeFee(vipGroup.getId().toString(),GroupType.VIP.getCode());
|
|
if(Objects.isNull(totalCoursePrice)){
|
|
if(Objects.isNull(totalCoursePrice)){
|
|
totalCoursePrice=new BigDecimal(0);
|
|
totalCoursePrice=new BigDecimal(0);
|
|
}
|
|
}
|