Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebMvcConfig.java

@@ -36,7 +36,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/queryUserInfo");
+		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").
+				excludePathPatterns("/queryUserInfo","/user/queryUserByPhone","/user/add",
+						"user/queryUserById/*","/role/queryRoleCodeListByUserId","/user/updateSysUser");
 		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/userDevice/unbind").excludePathPatterns("/*");
 	}
 	

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-im/src/main/java/com/ym/config/WebMvcConfig.java

@@ -54,10 +54,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/v2/api-docs","/user/register",
-				"/group/join","/group/create","/group/quit","/room/leave","/room/statusSync",
-				"/room/statusImMsg","/group/batchDismiss","/private/send","/group/send",
-				"/group/dismiss","/room/statusImMsg","/history/get");
+		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/v2/api-docs",
+				"/group/*","/room/statusSync",
+				"/room/statusImMsg","/private/*","/system/*",
+				"/room/statusImMsg","/history/get","/user/*","/push/*");
 	}
 
 	@SuppressWarnings("rawtypes")

mec-im/src/main/java/com/ym/controller/GroupController.java

@@ -1,8 +1,6 @@
 package com.ym.controller;
 
-import com.ym.mec.common.entity.ImBaseMessage;
 import com.ym.mec.common.entity.ImGroupMessage;
-import com.ym.mec.common.entity.ImNoticeMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
 import com.ym.pojo.NoticeMessage;
 import com.ym.service.GroupService;
@@ -13,9 +11,7 @@ import io.rong.models.group.GroupModel;
 import io.rong.models.group.UserGroup;
 import io.rong.models.message.GroupMessage;
 import io.rong.models.message.MentionMessage;
-import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -1,12 +1,9 @@
 package com.ym.controller;
 
-import com.ym.mec.common.entity.ImGroupMessage;
 import com.ym.mec.common.entity.ImPrivateMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
-import com.ym.pojo.CustomMessage;
 import com.ym.service.MessageService;
 import io.rong.messages.TxtMessage;
-import io.rong.models.message.GroupMessage;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
 import io.rong.models.message.TemplateMessage;

mec-im/src/main/java/com/ym/interceptor/TenantInterceptor.java

@@ -49,5 +49,4 @@ public class TenantInterceptor extends HandlerInterceptorAdapter {
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
 		TenantContextHolder.clearTenantId();
 	}
-
 }

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, "请登录");