j

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

@@ -216,10 +216,21 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(null==user){
 			throw new BizException("请登录");
 		}
+		Date now = new Date();
 		Map<String,Object> result=new HashMap<>(3);
 		result.put("vipAppealDaysRange",sysConfigDao.findConfigValue(SysConfigService.VIP_APPEAL_DAYS_RANGE));
 		result.put("advanceLeaveHours",Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_LEAVE_HOURS)));
-		result.put("list",courseScheduleDao.getStudentCourseSchedulesWithDate(classDate,user.getId().longValue()));
+		List<CourseScheduleDto> studentCourseSchedulesWithDate = courseScheduleDao.getStudentCourseSchedulesWithDate(classDate, user.getId().longValue());
+		studentCourseSchedulesWithDate.forEach(courseScheduleDto -> {
+			if(now.before(courseScheduleDto.getStartClassTime())){
+				courseScheduleDto.setStatus(CourseStatusEnum.NOT_START);
+			}else if(now.after(courseScheduleDto.getEndClassTime())){
+				courseScheduleDto.setStatus(CourseStatusEnum.OVER);
+			}else{
+				courseScheduleDto.setStatus(CourseStatusEnum.UNDERWAY);
+			}
+		});
+		result.put("list",studentCourseSchedulesWithDate);
 		return result;
 	}
 

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

@@ -634,63 +634,62 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//教师课酬线上单课酬计算
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOnlineSalarySettlement())){
-			switch (vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType()){
-				case TEACHER_DEFAULT:
-					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
-							&&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
-						teacherOnlineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOnlineTeacherSalary();
-					}
-
-					if(Objects.isNull(teacherOnlineSalary)){
-						if(Objects.isNull(teacherDefaultVipGroupSalary)||Objects.isNull(teacherDefaultVipGroupSalary.getOnlineClassesSalary())){
-//							throw new BizException("请设置教师课酬");
-							teacherOnlineSalary=new BigDecimal(0);
-						}else{
-							teacherOnlineSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
-						}
-						teacherOnlineSalary=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));
-					break;
-				case FIXED_SALARY:
-					results.put("onlineTeacherSalary",vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue());
-					break;
-				default:
-					throw new BizException("未指定课酬结算标准!");
-			}
+            if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
+                    &&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
+                teacherOnlineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOnlineTeacherSalary();
+                results.put("onlineTeacherSalary",teacherOnlineSalary);
+            }
+            if(Objects.isNull(teacherOnlineSalary)){
+                switch (vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType()){
+                    case TEACHER_DEFAULT:
+                        if(Objects.isNull(teacherDefaultVipGroupSalary)||Objects.isNull(teacherDefaultVipGroupSalary.getOnlineClassesSalary())){
+                            teacherOnlineSalary=new BigDecimal(0);
+                        }else{
+                            teacherOnlineSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
+                        }
+                        teacherOnlineSalary=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));
+                        break;
+                    case FIXED_SALARY:
+                        results.put("onlineTeacherSalary",vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue());
+                        break;
+                    default:
+                        throw new BizException("未指定课酬结算标准!");
+                }
+            }
 		}
 
 		//教师线下单课酬计算
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOfflineSalarySettlement())){
-			switch (vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType()){
-				case TEACHER_DEFAULT:
-					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
-							&&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
-						teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
-					}
-					if(Objects.isNull(teacherOfflineSalary)||Objects.isNull(Objects.isNull(teacherDefaultVipGroupSalary))){
-						if(Objects.isNull(teacherDefaultVipGroupSalary)){
-//							throw new BizException("请设置教师课酬");
-							teacherOfflineSalary=new BigDecimal(0);
-						}else{
-							teacherOfflineSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
-						}
-						teacherOfflineSalary=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));
-					break;
-				case FIXED_SALARY:
-					results.put("offlineTeacherSalary",vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSettlementValue());
-					break;
-				default:
-					throw new BizException("未指定课酬结算标准!");
-			}
+            if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary
+                    &&vipGroupActivity.getSalaryReadonlyFlag().equals("1")){
+                teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
+                results.put("offlineTeacherSalary",teacherOfflineSalary);
+            }
+            if(Objects.isNull(teacherOfflineSalary)){
+                switch (vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType()){
+                    case TEACHER_DEFAULT:
+                        if(Objects.isNull(teacherDefaultVipGroupSalary)||Objects.isNull(teacherDefaultVipGroupSalary.getOfflineClassesSalary())){
+                            teacherOfflineSalary=new BigDecimal(0);
+                        }else{
+                            teacherOfflineSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
+                        }
+                        teacherOfflineSalary=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));
+                        break;
+                    case FIXED_SALARY:
+                        results.put("offlineTeacherSalary",vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSettlementValue());
+                        break;
+                    default:
+                        throw new BizException("未指定课酬结算标准!");
+                }
+            }
 		}
 
 		if(computeTotalPrice){

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -741,6 +741,7 @@
         cs.class_date_,
         CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
         CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+        cs.status_,
         sc.paran_value_
         FROM
         course_schedule cs