update

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

@@ -175,31 +175,26 @@ public class MusicGroupPaymentCalenderCourseSettingsServiceImpl extends BaseServ
 	public BigDecimal getCurrentAmount(MusicGroupPaymentBaseCalender baseCalender) {
 		BigDecimal totalAmount = BigDecimal.ZERO;
 		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = baseCalender.getMusicGroupPaymentCalenderCourseSettingsList();
-		if(musicGroupPaymentCalenderCourseSettingsList != null && musicGroupPaymentCalenderCourseSettingsList.size() > 0){
-			if (baseCalender.getPaymentType() == MUSIC_APPLY || baseCalender.getPaymentType() == MUSIC_RENEW) {
-				List<MusicGroupOrganizationCourseSettingsDetail> musicGroupOrganizationCourseSettingsDetails = musicGroupOrganizationCourseSettingsDetailDao
-						.queryByMusicGroupOrganizationCourseSettingsId(baseCalender.getMusicGroupOrganizationCourseSettingId());
-				for (MusicGroupOrganizationCourseSettingsDetail detail : musicGroupOrganizationCourseSettingsDetails) {
-					totalAmount = detail.getUnitPrice().multiply(detail.getCourseCurrentPrice());
-				}
-				return totalAmount;
-			} else if (baseCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.ADD_COURSE) {
-				MusicGroup musicGroup = baseCalender.getMusicGroup();
-				// 如果是课程收费，判断是否审核
-				for (MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList) {
-					OrganizationCourseUnitPriceSettings defaultUnitPrice = organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(
-							musicGroup.getOrganId(), courseSettings.getCourseType(), musicGroup.getChargeTypeId());
-					if (defaultUnitPrice == null) {
-						throw new BizException("请先设置分部课程类型单价");
-					}
-					totalAmount = defaultUnitPrice.getUnitPrice().multiply(new BigDecimal(courseSettings.getCourseTotalMinuties()));
-					return totalAmount;
+		if(baseCalender.getMusicGroupOrganizationCourseSettingId() != null){
+			List<MusicGroupOrganizationCourseSettingsDetail> musicGroupOrganizationCourseSettingsDetails = musicGroupOrganizationCourseSettingsDetailDao
+					.queryByMusicGroupOrganizationCourseSettingsId(baseCalender.getMusicGroupOrganizationCourseSettingId());
+			for (MusicGroupOrganizationCourseSettingsDetail detail : musicGroupOrganizationCourseSettingsDetails) {
+				totalAmount = totalAmount.add(detail.getUnitPrice().multiply(detail.getCourseCurrentPrice()));
+			}
+			return totalAmount;
+		}else {
+			MusicGroup musicGroup = baseCalender.getMusicGroup();
+			// 如果是课程收费，判断是否审核
+			for (MusicGroupPaymentCalenderCourseSettings courseSettings : musicGroupPaymentCalenderCourseSettingsList) {
+				OrganizationCourseUnitPriceSettings defaultUnitPrice = organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(
+						musicGroup.getOrganId(), courseSettings.getCourseType(), musicGroup.getChargeTypeId());
+				if (defaultUnitPrice == null) {
+					throw new BizException("请先设置分部课程类型单价");
 				}
-			}else {
-				throw new BizException("错误的缴费类型");
+				totalAmount = totalAmount.add(defaultUnitPrice.getUnitPrice().multiply(new BigDecimal(courseSettings.getCourseTotalMinuties())));
 			}
+			return totalAmount;
 		}
-		return totalAmount;
 	}
 
 	@Override

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -191,7 +191,7 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "获取教务人员")
     @GetMapping("/findEducationUsers")
-    public HttpResponseResult findEducationUsers(Integer userId){
+    public HttpResponseResult findEducationUsers(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");