1、vip课加课增加课程单价

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupApplyDto.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -17,6 +18,16 @@ public class VipGroupApplyDto {
     @ApiModelProperty(value = "课程计划列表",required = false)
     private List<CourseSchedule> courseSchedules;
 
+    private BigDecimal singleClassPrice;
+
+    public BigDecimal getSingleClassPrice() {
+        return singleClassPrice;
+    }
+
+    public void setSingleClassPrice(BigDecimal singleClassPrice) {
+        this.singleClassPrice = singleClassPrice;
+    }
+
     private String studentIds;
 
     public String getStudentIds() {

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupCourseAdjustInfoDto.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -24,6 +25,9 @@ public class VipGroupCourseAdjustInfoDto {
     @ApiModelProperty(value = "教学形式")
     private TeachModeEnum teachMode;
 
+    @ApiModelProperty(value = "课程单价")
+    private BigDecimal singleClassPrice;
+
     @ApiModelProperty(value = "排课次数", required = true)
     private Integer courseCount;
 
@@ -33,6 +37,14 @@ public class VipGroupCourseAdjustInfoDto {
     @ApiModelProperty(value = "是否跳过节假日 true-跳过 false-不跳过")
     private boolean isHoliday;
 
+    public BigDecimal getSingleClassPrice() {
+        return singleClassPrice;
+    }
+
+    public void setSingleClassPrice(BigDecimal singleClassPrice) {
+        this.singleClassPrice = singleClassPrice;
+    }
+
     public TeachModeEnum getTeachMode() {
         return teachMode;
     }

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

@@ -1006,6 +1006,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(CollectionUtils.isEmpty(vipGroupCourseAdjustInfo.getCourseTimes())){
 			throw new BizException("请指定排课周期");
 		}
+		if(Objects.isNull(vipGroupCourseAdjustInfo.getSingleClassPrice())){
+			throw new BizException("请指定课程单价");
+		}
 		if(Objects.isNull(vipGroupCourseAdjustInfo.getCourseCount())){
 			throw new BizException("请指定排课次数");
 		}
@@ -1104,6 +1107,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		vipGroupApplyBaseInfoDto.setId(vipGroup.getId());
 		vipGroupApplyDto.setVipGroupApplyBaseInfo(vipGroupApplyBaseInfoDto);
 		vipGroupApplyDto.setCourseSchedules(courseSchedules);
+		vipGroupApplyDto.setSingleClassPrice(vipGroupCourseAdjustInfo.getSingleClassPrice());
 		vipGroupService.appendVipGroupCourseSchedules(vipGroupApplyDto);
 		classGroupService.updateClassGroupInfo(classGroup.getId());
 	}

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

@@ -1649,6 +1649,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 
 		BigDecimal surplusCourseTotalPrice = new BigDecimal(0);
+		BigDecimal singleClassPrice=vipGroupApplyDto.getSingleClassPrice();
 
 		//课程信息调整
 		for (CourseSchedule courseSchedule : vipGroupApplyDto.getCourseSchedules()) {
@@ -1660,11 +1661,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			courseSchedule.setClassGroupId(classGroup.getId());
 			courseSchedule.setGroupType(GroupType.VIP);
 			courseSchedule.setMusicGroupId(vipGroup.getId().toString());
-			if (courseSchedule.getTeachMode().equals(TeachModeEnum.ONLINE)) {
-				surplusCourseTotalPrice = surplusCourseTotalPrice.add(onlineCoursePrice);
-			} else if (courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)) {
-				surplusCourseTotalPrice = surplusCourseTotalPrice.add(offlineCoursePrice);
-			}
+//			if (courseSchedule.getTeachMode().equals(TeachModeEnum.ONLINE)) {
+//				surplusCourseTotalPrice = surplusCourseTotalPrice.add(onlineCoursePrice);
+//			} else if (courseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)) {
+//				surplusCourseTotalPrice = surplusCourseTotalPrice.add(offlineCoursePrice);
+//			}
+			surplusCourseTotalPrice.add(singleClassPrice);
 		}
 
 		courseScheduleService.batchAddCourseSchedule(vipGroupApplyDto.getCourseSchedules());
@@ -1705,11 +1707,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				courseScheduleStudentPayment.setClassGroupId(vipGroupCourseSchedule.getClassGroupId());
 				courseScheduleStudentPayment.setCourseScheduleId(vipGroupCourseSchedule.getId());
 				courseScheduleStudentPayment.setUserId(classGroupStudent.getUserId());
-				if(vipGroupCourseSchedule.getTeachMode().equals(TeachModeEnum.ONLINE)){
-					courseScheduleStudentPayment.setExpectPrice(onlineCoursePrice);
-				}else if(vipGroupCourseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)){
-					courseScheduleStudentPayment.setExpectPrice(offlineCoursePrice);
-				}
+//				if(vipGroupCourseSchedule.getTeachMode().equals(TeachModeEnum.ONLINE)){
+//					courseScheduleStudentPayment.setExpectPrice(onlineCoursePrice);
+//				}else if(vipGroupCourseSchedule.getTeachMode().equals(TeachModeEnum.OFFLINE)){
+//					courseScheduleStudentPayment.setExpectPrice(offlineCoursePrice);
+//				}
+				courseScheduleStudentPayment.setExpectPrice(singleClassPrice);
 				courseScheduleStudentPayment.setCreateTime(now);
 				courseScheduleStudentPayment.setUpdateTime(now);
 				courseScheduleStudentPayments.add(courseScheduleStudentPayment);