浏览代码

feat:vip课活动课配置是否允许线上调线下

Joburgess 4 年之前
父节点
当前提交
ed82c79fb0

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroupActivity.java

@@ -92,13 +92,13 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "适用学生类型:-1:所有;0:老用户;1:新用户")
 	private Integer  applyToStudentType = -1;
 
-	private Boolean allowOnlineToOffline = false;
+	private Integer allowOnlineToOffline = 0;
 
-	public Boolean getAllowOnlineToOffline() {
+	public Integer getAllowOnlineToOffline() {
 		return allowOnlineToOffline;
 	}
 
-	public void setAllowOnlineToOffline(Boolean allowOnlineToOffline) {
+	public void setAllowOnlineToOffline(Integer allowOnlineToOffline) {
 		this.allowOnlineToOffline = allowOnlineToOffline;
 	}
 

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

@@ -2754,7 +2754,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     if (Objects.nonNull(vipGroupCourseAdjustInfo.getTeachMode())) {
                     	boolean onlineToOffline = courseSchedules.get(courseStartDates.size() - 1).getTeachMode().equals(TeachModeEnum.ONLINE)
 								&&vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE);
-                        if(onlineToOffline&&!vipGroupActivity.getAllowOnlineToOffline()){
+                        if(onlineToOffline&&vipGroupActivity.getAllowOnlineToOffline()==0){
                             throw new BizException("此VIP课活动不支持线上课调整为线下课");
                         }
 						if(onlineToOffline&&Objects.isNull(vipGroupCourseAdjustInfo.getSchoolId())){
@@ -3378,7 +3378,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				if(Objects.isNull(vipGroupActivity)){
 					throw new BizException("课程组信息异常");
 				}
-				if(TeachModeEnum.OFFLINE.equals(newCourseSchedule.getTeachMode())&&TeachModeEnum.ONLINE.equals(oldCourseSchedule.getTeachMode())&&!vipGroupActivity.getAllowOnlineToOffline()){
+				if(TeachModeEnum.OFFLINE.equals(newCourseSchedule.getTeachMode())&&TeachModeEnum.ONLINE.equals(oldCourseSchedule.getTeachMode())&&vipGroupActivity.getAllowOnlineToOffline()==0){
 					throw new BizException("此VIP课活动不支持线上课调整为线下课");
 				}
 			}