Преглед на файлове

feat:vip课活动购买限制

Joburgess преди 4 години
родител
ревизия
8dcb3a26b4

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentExercisesSituationQueryInfo.java

@@ -48,6 +48,17 @@ public class StudentExercisesSituationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "作业提交截至时间")
     private String submitEndDate;
 
+    @ApiModelProperty(value = "服务是否异常")
+    private Boolean serviceIsError;
+
+    public Boolean getServiceIsError() {
+        return serviceIsError;
+    }
+
+    public void setServiceIsError(Boolean serviceIsError) {
+        this.serviceIsError = serviceIsError;
+    }
+
     public String getSubmitStartDate() {
         return submitStartDate;
     }

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

@@ -3686,7 +3686,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					ts.setUpdateTime(date);
 					ts.setUserId(teacherId);
 
-					if(Objects.nonNull(mainTeacherSalary)&&!mainTeacherSalary.getEnableChangeSalary()){
+					if(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole())&&Objects.nonNull(mainTeacherSalary)&&!mainTeacherSalary.getEnableChangeSalary()){
 						ts.setExpectSalary(mainTeacherSalary.getExpectSalary());
 						ts.setSubsidy(mainTeacherSalary.getSubsidy());
 						ts.setEnableChangeSalary(mainTeacherSalary.getEnableChangeSalary());