update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -134,6 +134,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         	throw new BizException("该用户不存在");
 		}
 
+        Date now=new Date();
+
 		VipGroupApplyBaseInfoDto vipGroupApplyBaseInfoDto=vipGroup.getVipGroupApplyBaseInfo();
 
 		//获取活动信息
@@ -199,6 +201,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		classGroup.setType(ClassGroupTypeEnum.VIP);
 		classGroup.setDelFlag(YesOrNoEnum.NO);
 		classGroup.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
+		classGroup.setCreateTime(now);
+		classGroup.setUpdateTime(now);
 		classGroupDao.insert(classGroup);
 
 		//创建vip课班级关联记录
@@ -519,21 +523,20 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		BigDecimal onlineVipGroupCharge = onlineClassesUnitPrice.multiply(onlineClassNum);
 		BigDecimal offlineVipGroupCharge = offlineClassesUnitPrice.multiply(offlineClassNum);
 		BigDecimal totalClassNum=offlineClassNum.add(onlineClassNum);
-		BigDecimal teacherOnlineSalary,teacherOfflineSalary;
+		BigDecimal teacherOnlineSalary=null,teacherOfflineSalary=null;
 
 		//教师课酬线上单课酬计算
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOnlineSalarySettlement())){
 			switch (vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
-					if(Objects.isNull(teacherDefaultVipGroupSalary)){
-						if(vipGroup instanceof VipGroupApplyBaseInfoDto){
-							teacherOnlineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOnlineTeacherSalary();
-						}else{
-							throw new BizException("未设置教师默认课酬");
-						}
-					}else{
+					if(vipGroup instanceof VipGroupApplyBaseInfoDto){
+						teacherOnlineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOnlineTeacherSalary();
+					}
+
+					if(!Objects.isNull(teacherOnlineSalary)){
 						teacherOnlineSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
 					}
+
 					if(Objects.isNull(teacherOnlineSalary)){
 						throw new BizException("请设置教师课酬");
 					}
@@ -554,13 +557,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOfflineSalarySettlement())){
 			switch (vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
-					if(Objects.isNull(teacherDefaultVipGroupSalary)){
-						if(vipGroup instanceof VipGroupApplyBaseInfoDto){
-							teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
-						}else{
-							throw new BizException("未设置教师默认课酬");
-						}
-					}else{
+					if(vipGroup instanceof VipGroupApplyBaseInfoDto){
+						teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
+					}
+					if(Objects.isNull(teacherOfflineSalary)){
 						teacherOfflineSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
 					}
 					if(Objects.isNull(teacherOfflineSalary)){