活动排课去掉VIP线上课课酬

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -456,4 +456,13 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @return
      */
     Integer getOrderIdByMusical(@Param("musicGroupId") String musicGroupId, @Param("studentId") Integer studentId);
+
+    /**
+    * @description: 根据课程组编号获取学员的订单列表
+     * @param vipGroupId
+    * @return java.util.Map<java.lang.Integer,java.math.BigDecimal>
+    * @author zx
+    * @date 2021/10/20 18:56
+    */
+    List<Map<Integer, BigDecimal>> queryStudentCourseAmountMap(Long vipGroupId);
 }

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

@@ -29,8 +29,8 @@ public class VipGroupApplyBaseInfoDto extends VipGroup {
     @ApiModelProperty(value = "预计招生人数",hidden = true)
     private Integer expectStudentNum;
 
-    @ApiModelProperty(value = "教师线上课课酬")
-    private BigDecimal onlineTeacherSalary;
+//    @ApiModelProperty(value = "教师线上课课酬")
+//    private BigDecimal onlineTeacherSalary;
 
     @ApiModelProperty(value = "教师线下课课酬")
     private BigDecimal offlineTeacherSalary;
@@ -76,14 +76,6 @@ public class VipGroupApplyBaseInfoDto extends VipGroup {
         this.subjectIdList = subjectIdList;
     }
 
-    public BigDecimal getOnlineTeacherSalary() {
-        return onlineTeacherSalary;
-    }
-
-    public void setOnlineTeacherSalary(BigDecimal onlineTeacherSalary) {
-        this.onlineTeacherSalary = onlineTeacherSalary;
-    }
-
     public BigDecimal getOfflineTeacherSalary() {
         return offlineTeacherSalary;
     }

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

@@ -10,14 +10,14 @@ import java.io.Serializable;
  */
 public class VipGroupSalarySettlementDto implements Serializable {
 
-    @ApiModelProperty("收费VIP线上课收费标准")
-    private VipGroupSalarySettlementTypeDto vipOnlineSalarySettlement;
+//    @ApiModelProperty("收费VIP线上课收费标准")
+//    private VipGroupSalarySettlementTypeDto vipOnlineSalarySettlement;
 
     @ApiModelProperty("收费VIP线下课收费标准")
     private VipGroupSalarySettlementTypeDto vipOfflineSalarySettlement;
 
-    @ApiModelProperty("赠送VIP线上课收费标准")
-    private VipGroupSalarySettlementTypeDto giveVipOnlineSalarySettlement;
+//    @ApiModelProperty("赠送VIP线上课收费标准")
+//    private VipGroupSalarySettlementTypeDto giveVipOnlineSalarySettlement;
 
     @ApiModelProperty("赠送VIP线下课收费标准")
     private VipGroupSalarySettlementTypeDto giveVipOfflineSalarySettlement;
@@ -28,14 +28,6 @@ public class VipGroupSalarySettlementDto implements Serializable {
     @ApiModelProperty("赠送网管课收费标准")
     private VipGroupSalarySettlementTypeDto givePracticeSalarySettlement;
 
-    public VipGroupSalarySettlementTypeDto getVipOnlineSalarySettlement() {
-        return vipOnlineSalarySettlement;
-    }
-
-    public void setVipOnlineSalarySettlement(VipGroupSalarySettlementTypeDto vipOnlineSalarySettlement) {
-        this.vipOnlineSalarySettlement = vipOnlineSalarySettlement;
-    }
-
     public VipGroupSalarySettlementTypeDto getVipOfflineSalarySettlement() {
         return vipOfflineSalarySettlement;
     }
@@ -44,14 +36,6 @@ public class VipGroupSalarySettlementDto implements Serializable {
         this.vipOfflineSalarySettlement = vipOfflineSalarySettlement;
     }
 
-    public VipGroupSalarySettlementTypeDto getGiveVipOnlineSalarySettlement() {
-        return giveVipOnlineSalarySettlement;
-    }
-
-    public void setGiveVipOnlineSalarySettlement(VipGroupSalarySettlementTypeDto giveVipOnlineSalarySettlement) {
-        this.giveVipOnlineSalarySettlement = giveVipOnlineSalarySettlement;
-    }
-
     public VipGroupSalarySettlementTypeDto getGiveVipOfflineSalarySettlement() {
         return giveVipOfflineSalarySettlement;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherDefaultVipGroupSalary.java

@@ -25,9 +25,7 @@ public class TeacherDefaultVipGroupSalary {
 
 	private Boolean musicTheory;
 	
-	/** 线上课薪酬 */
-	@ApiModelProperty(value = "线上课薪酬", required = false)
-	private java.math.BigDecimal onlineClassesSalary;
+//	private java.math.BigDecimal onlineClassesSalary;
 	
 	/** 线下课薪酬 */
 	@ApiModelProperty(value = "线下课薪酬", required = false)
@@ -71,14 +69,6 @@ public class TeacherDefaultVipGroupSalary {
 		return this.vipGroupCategoryId;
 	}
 			
-	public void setOnlineClassesSalary(java.math.BigDecimal onlineClassesSalary){
-		this.onlineClassesSalary = onlineClassesSalary;
-	}
-	
-	public java.math.BigDecimal getOnlineClassesSalary(){
-		return this.onlineClassesSalary;
-	}
-			
 	public void setOfflineClassesSalary(java.math.BigDecimal offlineClassesSalary){
 		this.offlineClassesSalary = offlineClassesSalary;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleTeacherSalaryService.java

@@ -31,7 +31,6 @@ public interface CourseScheduleTeacherSalaryService extends BaseService<Long, Co
      */
     void createCourseScheduleTeacherVipSalary(VipGroup vipGroup,
                                              List<CourseSchedule> vipCourseSchedules,
-                                             BigDecimal onlineTeacherSalary,
                                              BigDecimal offlineTeacherSalary);
 
     void createCourseScheduleTeacherPracticeSalary(List<CourseSchedule> courseSchedules,

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -204,20 +204,6 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
                                                                          Integer teacherId);
 
     /**
-     * @describe 计算vip课程购买总价,及老师课酬-只是学生人数统计方式不同
-     * @author Joburgess
-     * @date 2019/10/23
-     * @param vipGroup: vip课程
-     * @param teacherId: 要计算课酬的老师的编号
-     * @return java.util.Map
-     */
-    @Deprecated
-//    <K extends VipGroup> Map<String, BigDecimal> countVipGroupCoursePredictFee(K vipGroup,
-//                                                                         Integer teacherId,
-//                                                                               Long courseId);
-
-
-    /**
      * @Author: Joburgess
      * @Date: 2019/10/3
      * @params [queryInfo]

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

@@ -3760,7 +3760,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							BigDecimal teacherSalary=null;
 
 							if(Objects.nonNull(salaryMap)){
-								teacherSalary=newCourseSchedule.getTeachMode() == TeachModeEnum.OFFLINE?salaryMap.get("offlineTeacherSalary"):salaryMap.get("onlineTeacherSalary");
+								teacherSalary = salaryMap.get("offlineTeacherSalary");
 							}
 
 							ts.setExpectSalary(teacherSalary);
@@ -3969,16 +3969,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 if (teacherIsChange) {
                     VipGroup byCourseSchedule = vipGroupDao.findByCourseSchedule(newCourseSchedule.getId());
 
-                    BigDecimal onlineTeacherSalary = new BigDecimal(0), offlineTeacherSalary = new BigDecimal(0);
-
 					Map<String, BigDecimal> salaryMap = vipGroupService.countVipGroupPredictFee1(byCourseSchedule, newCourseSchedule.getActualTeacherId(), newCourseSchedule.getId());
 
                     List<CourseSchedule> courseSchedules = new ArrayList<>();
                     courseSchedules.add(newCourseSchedule);
-                    courseScheduleTeacherSalaryService.createCourseScheduleTeacherVipSalary(byCourseSchedule,
-                            courseSchedules,
-							salaryMap.get("onlineTeacherSalary"),
-							salaryMap.get("offlineTeacherSalary"));
+                    courseScheduleTeacherSalaryService.createCourseScheduleTeacherVipSalary(byCourseSchedule,courseSchedules,salaryMap.get("offlineTeacherSalary"));
                     if (Objects.nonNull(oldCourseSchedule.getActualTeacherId()) && teacherIsChange) {
                         beReplaceTeacherIds.add(oldCourseSchedule.getActualTeacherId().intValue());
                     }

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

@@ -75,8 +75,6 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 	@Autowired
 	private MusicGroupStudentClassAdjustDao musicGroupStudentClassAdjustDao;
 	@Autowired
-	private SysConfigDao sysConfigDao;
-	@Autowired
 	private StudentPaymentOrderDao studentPaymentOrderDaop;
 
 	@Override
@@ -98,73 +96,54 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		}
 
 		//获取活动信息
-		BigDecimal discount = new BigDecimal(100);
 		VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId());
-		if(vipGroupActivity != null){
-			discount = vipGroupActivity.getDiscount();
-		}
 
 		List<CourseSchedule> vipGroupCourseSchedules=courseScheduleDao.findGroupCourseSchedules(vipGroupId.toString(),GroupType.VIP.getCode());
 
 		if(CollectionUtils.isEmpty(vipGroupCourseSchedules)){
 			throw new BizException("未获取到排课信息");
 		}
-		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
+
+		int giveClassTimes=0;
 
 		StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDaop.findByStudentVipGroup(vipGroupId, userId, DealStatusEnum.SUCCESS.getCode());
+		BigDecimal couponFee = new BigDecimal(0);
 		if(Objects.nonNull(studentPaymentOrder)){
-			//实际支付金额，去除优惠券
-			BigDecimal actualPrice = studentPaymentOrder.getExpectAmount().subtract(studentPaymentOrder.getCouponRemitFee());
-			BigDecimal divide = actualPrice.divide(new BigDecimal(vipGroupCourseSchedules.size()), ROUND_DOWN);
-			BigDecimal firstAmount = actualPrice.subtract(divide.multiply(new BigDecimal(vipGroupCourseSchedules.size()))).add(divide);
-			for (int i = 0; i < vipGroupCourseSchedules.size(); i++) {
-				CourseSchedule courseSchedule = vipGroupCourseSchedules.get(i);
+			couponFee = studentPaymentOrder.getCouponRemitFee().divide(new BigDecimal(vipGroupCourseSchedules.size()-giveClassTimes), CommonConstants.DECIMAL_PLACE);
+		}
+
+		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
+		Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroupByTeachMode = vipGroupCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode));
+		for(TeachModeEnum teachModeEnum:courseScheduleGroupByTeachMode.keySet()){
+			List<CourseSchedule> courseSchedules = courseScheduleGroupByTeachMode.get(teachModeEnum)
+					.stream()
+					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime)).collect(Collectors.toList());
+			for(int i=0;i<courseSchedules.size();i++) {
+				//创建学生课程应缴费记录
 				CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
 				courseScheduleStudentPayment.setUserId(userId);
-				courseScheduleStudentPayment.setGroupType(courseSchedule.getGroupType());
-				courseScheduleStudentPayment.setMusicGroupId(courseSchedule.getMusicGroupId());
-				courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
-				courseScheduleStudentPayment.setClassGroupId(courseSchedule.getClassGroupId());
-				if (i == 0) {
-					courseScheduleStudentPayment.setExpectPrice(firstAmount);
+	            courseScheduleStudentPayment.setGroupType(courseSchedules.get(i).getGroupType());
+	            courseScheduleStudentPayment.setMusicGroupId(courseSchedules.get(i).getMusicGroupId());
+				courseScheduleStudentPayment.setCourseScheduleId(courseSchedules.get(i).getId());
+				courseScheduleStudentPayment.setClassGroupId(courseSchedules.get(i).getClassGroupId());
+
+				if (teachModeEnum == TeachModeEnum.ONLINE) {
+					//学生线上单节课应缴费计算
+					courseScheduleStudentPayment.setExpectPrice(
+							vipGroup.getOnlineClassesUnitPrice().multiply(vipGroupActivity.getDiscount())
+									.divide(new BigDecimal(100), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP)
+									.subtract(couponFee));
 				}else{
-					courseScheduleStudentPayment.setExpectPrice(actualPrice);
+					//学生线下单节课应缴费计算
+					courseScheduleStudentPayment.setExpectPrice(
+							vipGroup.getOfflineClassesUnitPrice().multiply(vipGroupActivity.getDiscount())
+									.divide(new BigDecimal(100), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP)
+									.subtract(couponFee));
 				}
-				courseScheduleStudentPayment.setOriginalPrice(TeachModeEnum.ONLINE.equals(courseSchedule.getTeachMode())?vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice():vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());
+                courseScheduleStudentPayment.setOriginalPrice(TeachModeEnum.ONLINE.equals(teachModeEnum)?vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice():vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());
 				courseScheduleStudentPayment.setActualPrice(courseScheduleStudentPayment.getExpectPrice());
 				courseScheduleStudentPayments.add(courseScheduleStudentPayment);
 			}
-		}else {
-			Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroupByTeachMode = vipGroupCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode));
-			for(TeachModeEnum teachModeEnum:courseScheduleGroupByTeachMode.keySet()){
-				List<CourseSchedule> courseSchedules = courseScheduleGroupByTeachMode.get(teachModeEnum)
-						.stream()
-						.sorted(Comparator.comparing(CourseSchedule::getStartClassTime)).collect(Collectors.toList());
-				for(int i=0;i<courseSchedules.size();i++) {
-					//创建学生课程应缴费记录
-					CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
-					courseScheduleStudentPayment.setUserId(userId);
-					courseScheduleStudentPayment.setGroupType(courseSchedules.get(i).getGroupType());
-					courseScheduleStudentPayment.setMusicGroupId(courseSchedules.get(i).getMusicGroupId());
-					courseScheduleStudentPayment.setCourseScheduleId(courseSchedules.get(i).getId());
-					courseScheduleStudentPayment.setClassGroupId(courseSchedules.get(i).getClassGroupId());
-
-					if (teachModeEnum == TeachModeEnum.ONLINE) {
-						//学生线上单节课应缴费计算
-						courseScheduleStudentPayment.setExpectPrice(
-								vipGroup.getOnlineClassesUnitPrice().multiply(discount)
-										.divide(new BigDecimal(100), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
-					}else{
-						//学生线下单节课应缴费计算
-						courseScheduleStudentPayment.setExpectPrice(
-								vipGroup.getOfflineClassesUnitPrice().multiply(discount)
-										.divide(new BigDecimal(100), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
-					}
-					courseScheduleStudentPayment.setOriginalPrice(TeachModeEnum.ONLINE.equals(teachModeEnum)?vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice():vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());
-					courseScheduleStudentPayment.setActualPrice(courseScheduleStudentPayment.getExpectPrice());
-					courseScheduleStudentPayments.add(courseScheduleStudentPayment);
-				}
-			}
 		}
 		return courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 	}

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

@@ -107,14 +107,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     @Override
     public void createCourseScheduleTeacherVipSalary(VipGroup vipGroup,
                                                      List<CourseSchedule> vipCourseSchedules,
-                                                     BigDecimal onlineTeacherSalary,
                                                      BigDecimal offlineTeacherSalary) {
-        //获取活动信息
-        VipGroupActivity vipGroupActivity = null;
-        if(vipGroup.getVipGroupActivityId() != null){
-            vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
-        }
-
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = new ArrayList<>();
         Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroupByTeachMode = vipCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode));
 
@@ -134,13 +127,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
                 courseScheduleTeacherSalary.setUserId(courseSchedules.get(i).getActualTeacherId().intValue());
                 courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());
-//                courseScheduleTeacherSalary.setSubsidy(subsidy);
-
-                if (teachModeEnum == TeachModeEnum.ONLINE) {
-                    courseScheduleTeacherSalary.setExpectSalary(onlineTeacherSalary);
-                } else {
-                    courseScheduleTeacherSalary.setExpectSalary(offlineTeacherSalary);
-                }
+                courseScheduleTeacherSalary.setExpectSalary(offlineTeacherSalary);
                 courseScheduleTeacherSalary.setActualSalary(null);
                 if (Objects.isNull(courseScheduleTeacherSalary.getId())) {
                     courseScheduleTeacherSalaries.add(courseScheduleTeacherSalary);
@@ -936,33 +923,19 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public void updateVipGroupCourseTeacherSalary(Integer vipGroupId, Integer oldTeacherId) {
         VipGroup vipGroup = vipGroupService.get(vipGroupId.longValue());
-
-        BigDecimal onlineTeacherSalary=BigDecimal.ZERO,
-                offlineTeacherSalary=BigDecimal.ZERO;
+        BigDecimal offlineTeacherSalary=BigDecimal.ZERO;
 
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByGroupWithNotStart(vipGroupId.toString(), GroupType.VIP.getCode());
         if(!CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
-            List<Long> courseIds = courseScheduleTeacherSalaries.stream().map(CourseScheduleTeacherSalary::getCourseScheduleId).collect(Collectors.toList());
-            List<Map<Integer, String>> teachModeById = courseScheduleDao.getTeachModeById(courseIds);
-            Map<Integer, String> coureTeachModeMap = MapUtil.convertIntegerMap(teachModeById);
             for(int i=0;i<courseScheduleTeacherSalaries.size();i++){
                 if(!courseScheduleTeacherSalaries.get(i).getEnableChangeSalary()){
                     continue;
                 }
-                String courseType = coureTeachModeMap.get(courseScheduleTeacherSalaries.get(i).getCourseScheduleId());
-
                 Map<String, BigDecimal> salary = vipGroupService.countVipGroupPredictFee1(vipGroup, vipGroup.getUserId(), courseScheduleTeacherSalaries.get(i).getCourseScheduleId());
-
                 if(Objects.nonNull(salary)){
-                    onlineTeacherSalary=salary.get("onlineTeacherSalary");
                     offlineTeacherSalary=salary.get("offlineTeacherSalary");
                 }
-
-                if(courseType.equals(TeachModeEnum.ONLINE.getCode())){
-                    courseScheduleTeacherSalaries.get(i).setExpectSalary(onlineTeacherSalary);
-                }else if(courseType.equals(TeachModeEnum.OFFLINE.getCode())){
-                    courseScheduleTeacherSalaries.get(i).setExpectSalary(offlineTeacherSalary);
-                }
+                courseScheduleTeacherSalaries.get(i).setExpectSalary(offlineTeacherSalary);
             }
             courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalarys(courseScheduleTeacherSalaries);
         }
@@ -1432,7 +1405,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         VipGroup vipGroup = vipGroupService.get(Long.valueOf(courseSchedule.getMusicGroupId()));
         for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
             Map<String, BigDecimal> salaryMap = vipGroupService.countVipGroupPredictFee1(vipGroup, courseSchedule.getActualTeacherId(), courseSchedule.getId());
-            courseScheduleTeacherSalary.setExpectSalary(courseSchedule.getTeachMode() == TeachModeEnum.OFFLINE?salaryMap.get("offlineTeacherSalary"):salaryMap.get("onlineTeacherSalary"));
+            courseScheduleTeacherSalary.setExpectSalary(salaryMap.get("offlineTeacherSalary"));
         }
     }
 

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

@@ -5004,7 +5004,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }else {
             applyBaseInfo.setOnlineTeacherSalary(costInfo.get("onlineTeacherSalary"));
         }
-        practiceGroupDao.update(applyBaseInfo);
 
         //创建班级老师关联记录
         ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();

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

@@ -64,7 +64,6 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 		if (Objects.isNull(byTeacherAndCategory)) {
 			byTeacherAndCategory = new TeacherDefaultVipGroupSalary();
 			byTeacherAndCategory.setOfflineClassesSalary(new BigDecimal(0));
-			byTeacherAndCategory.setOnlineClassesSalary(new BigDecimal(0));
 		}
 		return byTeacherAndCategory;
 	}
@@ -102,9 +101,9 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 						|| oldMS.getOnlineClassesSalary() == null || oldMS.getOnlineClassesSalary().doubleValue() != ms.getOnlineClassesSalary().doubleValue()) {
 					salaryMap.put(ms.getVipGroupCategoryId(), ms);
 				}*/
-				if(teacher.getJobNature() == JobNatureEnum.FULL_TIME){
-					ms.setOnlineClassesSalary(new BigDecimal(0));
-				}
+//				if(teacher.getJobNature() == JobNatureEnum.FULL_TIME){
+//					ms.setOnlineClassesSalary(new BigDecimal(0));
+//				}
 				salaryMap.put(ms.getVipGroupCategoryId(), ms);
 			}
 
@@ -167,17 +166,8 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 							TeacherDefaultVipGroupSalary tdms = salaryMap.get(vipGroup.getVipGroupCategoryId());
 							TeacherDefaultVipGroupSalary origTdms = map.get(vipGroup.getVipGroupCategoryId());
 							if (tdms != null && origTdms != null) {
-								Map<String, BigDecimal> teachModeSalaryMap = new HashMap<>();
-//								if(vipGroupCategory.getMusicTheory()){
-									teachModeSalaryMap = vipGroupService.countVipGroupPredictFee1(vipGroup, ts.getUserId(), ts.getCourseScheduleId());
-//								}else{
-//									teachModeSalaryMap = vipGroupService.countVipGroupCoursePredictFee(vipGroup, ts.getUserId(), ts.getCourseScheduleId());
-//								}
-								if(TeachModeEnum.ONLINE.equals(ts.getCourseSchedule().getTeachMode())&&teachModeSalaryMap.containsKey("onlineTeacherSalary")){
-									ts.setExpectSalary(teachModeSalaryMap.get("onlineTeacherSalary"));
-								}else if(TeachModeEnum.OFFLINE.equals(ts.getCourseSchedule().getTeachMode())&&teachModeSalaryMap.containsKey("offlineTeacherSalary")){
-									ts.setExpectSalary(teachModeSalaryMap.get("offlineTeacherSalary"));
-								}
+								Map<String, BigDecimal> teachModeSalaryMap = vipGroupService.countVipGroupPredictFee1(vipGroup, ts.getUserId(), ts.getCourseScheduleId());
+								ts.setExpectSalary(teachModeSalaryMap.get("offlineTeacherSalary"));
 								list.add(ts);
 							}
 						}

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.ActivityApplyStudentTypeDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.VipGroupActivityDao;
@@ -12,7 +11,6 @@ import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
-import com.ym.mec.biz.event.source.EntityChangeEventSource;
 import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -26,8 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum.TEACHER_DEFAULT;
-
 @Service
 public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGroupActivity>  implements VipGroupActivityService {
 	
@@ -69,9 +65,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		}
 		VipGroupSalarySettlementDto vipGroupSalarySettlement = vipGroupActivityAddDto.getVipGroupSalarySettlement();
 		if(vipGroupSalarySettlement != null){
-			checkSettlement(vipGroupSalarySettlement.getVipOnlineSalarySettlement());
 			checkSettlement(vipGroupSalarySettlement.getVipOfflineSalarySettlement());
-			checkSettlement(vipGroupSalarySettlement.getGiveVipOnlineSalarySettlement());
 			checkSettlement(vipGroupSalarySettlement.getGiveVipOfflineSalarySettlement());
 			checkSettlement(vipGroupSalarySettlement.getPracticeSalarySettlement());
 			checkSettlement(vipGroupSalarySettlement.getGivePracticeSalarySettlement());
@@ -132,9 +126,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		}else {
 			VipGroupSalarySettlementDto vipGroupSalarySettlement = vipGroupActivityAddDto.getVipGroupSalarySettlement();
 			if(vipGroupSalarySettlement != null){
-				checkSettlement(vipGroupSalarySettlement.getVipOnlineSalarySettlement());
 				checkSettlement(vipGroupSalarySettlement.getVipOfflineSalarySettlement());
-				checkSettlement(vipGroupSalarySettlement.getGiveVipOnlineSalarySettlement());
 				checkSettlement(vipGroupSalarySettlement.getGiveVipOfflineSalarySettlement());
 				checkSettlement(vipGroupSalarySettlement.getPracticeSalarySettlement());
 				checkSettlement(vipGroupSalarySettlement.getGivePracticeSalarySettlement());

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

@@ -1029,4 +1029,9 @@
         WHERE spo.type_ = 'APPLY' AND spo.status_ = 'SUCCESS' AND spo.music_group_id_ = #{musicGroupId}
         AND spo.user_id_ = #{studentId} AND spod.type_ = 'MUSICAL'
     </select>
+    <select id="queryStudentCourseAmountMap" resultType="java.util.Map">
+        SELECT user_id_ 'key',expect_amount_ - coupon_remit_fee_ 'value' FROM student_payment_order
+        WHERE status_ = 'SUCCESS' AND music_group_id_ = #{vipGroupId}
+        GROUP BY user_id_
+    </select>
 </mapper>

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

@@ -12,7 +12,6 @@
         <result column="vip_group_category_id_" property="vipGroupCategoryId"/>
         <result column="vip_group_category_name_" property="vipGroupCategoryName"/>
         <result column="music_theory_" property="musicTheory"/>
-        <result column="online_classes_salary_" property="onlineClassesSalary"/>
         <result column="offline_classes_salary_" property="offlineClassesSalary"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -32,14 +31,14 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO teacher_default_vip_group_salary
-        (user_id_,vip_group_category_id_,online_classes_salary_,offline_classes_salary_,create_time_,update_time_)
-        VALUES(#{userId},#{vipGroupCategoryId},#{onlineClassesSalary},#{offlineClassesSalary},now(),now())
+        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_)
+        VALUES(#{userId},#{vipGroupCategoryId},#{offlineClassesSalary},now(),now())
     </insert>
     <insert id="batchAdd">
         INSERT INTO teacher_default_vip_group_salary
-        (user_id_,vip_group_category_id_,online_classes_salary_,offline_classes_salary_,create_time_,update_time_)VALUES
+        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_)VALUES
         <foreach collection="vipGroupSalaries" item="item" separator=",">
-            (#{item.userId},#{item.vipGroupCategoryId},#{item.onlineClassesSalary},#{item.offlineClassesSalary},now(),now())
+            (#{item.userId},#{item.vipGroupCategoryId},#{item.offlineClassesSalary},now(),now())
         </foreach>
     </insert>
 
@@ -50,9 +49,6 @@
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>
-            <if test="onlineClassesSalary != null">
-                online_classes_salary_ = #{onlineClassesSalary},
-            </if>
             <if test="updateTime != null">
                 update_time_ = NOW(),
             </if>

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

@@ -40,7 +40,7 @@
 	<select id="findTeacherDefaultSalary" resultMap="VipGroupCategory">
 		SELECT
 			vgc.*,
-			tdvgs.online_classes_salary_ online_classes_unit_price_,
+			tdvgs.offline_classes_salary_ online_classes_unit_price_,
 			tdvgs.offline_classes_salary_ offline_classes_unit_price_
 		FROM
 			vip_group_category vgc

mec-education/src/main/java/com/ym/mec/education/entity/TeacherDefaultVipGroupSalary.java

@@ -31,11 +31,8 @@ public class TeacherDefaultVipGroupSalary extends Model<TeacherDefaultVipGroupSa
      */
     @TableField("vip_group_category_id_")
     private String vipGroupCategoryId;
-    /**
-     * 线上课薪酬
-     */
-    @TableField("online_classes_salary_")
-    private BigDecimal onlineClassesSalary;
+//    @TableField("online_classes_salary_")
+//    private BigDecimal onlineClassesSalary;
     /**
      * 线下课薪酬
      */
@@ -74,15 +71,6 @@ public class TeacherDefaultVipGroupSalary extends Model<TeacherDefaultVipGroupSa
         return this;
     }
 
-    public BigDecimal getOnlineClassesSalary() {
-        return onlineClassesSalary;
-    }
-
-    public TeacherDefaultVipGroupSalary setOnlineClassesSalary(BigDecimal onlineClassesSalary) {
-        this.onlineClassesSalary = onlineClassesSalary;
-        return this;
-    }
-
     public BigDecimal getOfflineClassesSalary() {
         return offlineClassesSalary;
     }
@@ -121,7 +109,6 @@ public class TeacherDefaultVipGroupSalary extends Model<TeacherDefaultVipGroupSa
         ", id=" + id +
         ", userId=" + userId +
         ", vipGroupCategoryId=" + vipGroupCategoryId +
-        ", onlineClassesSalary=" + onlineClassesSalary +
         ", offlineClassesSalary=" + offlineClassesSalary +
         ", createTime=" + createTime +
         ", updateTime=" + updateTime +

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupCategoryController.java

@@ -1,7 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
 import com.ym.mec.biz.service.VipGroupCategoryService;
 import com.ym.mec.common.controller.BaseController;
@@ -23,10 +21,6 @@ public class VipGroupCategoryController extends BaseController {
 
 	@Autowired
 	private VipGroupCategoryService vipGroupCategoryService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private EmployeeDao employeeDao;
 
 	@ApiOperation("单查询")
 	@GetMapping(value = "/query")

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -60,10 +60,8 @@ public class VipGroupManageController extends BaseController {
     private ImUserFriendService imUserFriendService;
     @Autowired
     private ImGroupService imGroupService;
-
     @Autowired
     private StudentApplyRefundsService studentApplyRefundsService;
-    
     @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
     @Autowired
@@ -72,8 +70,6 @@ public class VipGroupManageController extends BaseController {
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
     @Autowired
     private CourseScheduleDao courseScheduleDao;
-    @Autowired
-    private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
 
     @GetMapping("/teacherSalarySettlement")
     public Object teacherSalarySettlement(){
@@ -152,12 +148,6 @@ public class VipGroupManageController extends BaseController {
             return failed("请指定指导老师!");
         }
         if(Objects.isNull(vipGroupApplyDto.getVipGroupApplyBaseInfo().getOrganId())){
-//            Employee employee = employeeDao.get(sysUser.getId());
-//            if(StringUtils.isEmpty(employee.getOrganIdList()) || employee.getOrganIdList().contains(",")){
-//                vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(teacher.getTeacherOrganId());
-//            }else {
-//                vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(Integer.parseInt(employee.getOrganIdList()));
-//            }
             Integer firstStudentId = vipGroupApplyDto.getVipGroupApplyBaseInfo().getFirstStudentId();
             SysUser student = teacherDao.getUser(firstStudentId);
             if(Objects.isNull(student)||Objects.isNull(student.getOrganId())){