Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -203,7 +203,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     EMAIL_TENANT_EXPIRATION_REMINDERS("EMAIL_TENANT_EXPIRATION_REMINDERS",   "过期提醒"),
     EMAIL_TENANT_INSUFFICIENT_BALANCE("EMAIL_TENANT_INSUFFICIENT_BALANCE",  "余额不足"),
 
-    SMS_TENANT_ACTIVATION_SUCCESSFUL("EMAIL_TENANT_ACTIVATION_SUCCESSFUL",   "开通成功"),
+    sms_tenant_activation_successful("EMAIL_TENANT_ACTIVATION_SUCCESSFUL",   "开通成功"),
     SMS_TENANT_RENEWAL_SUCCESSFUL("EMAIL_TENANT_RENEWAL_SUCCESSFUL", "续费成功"),
     SMS_TENANT_EXPIRATION_REMINDERS("EMAIL_TENANT_EXPIRATION_REMINDERS",   "过期提醒"),
     SMS_TENANT_INSUFFICIENT_BALANCE("EMAIL_TENANT_INSUFFICIENT_BALANCE",  "余额不足"),

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

@@ -3252,7 +3252,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(newCourseSchedule.getStartClassTime().compareTo(date)<0){
 				throw new BizException("调整无效,不能调整至已结束");
 			}
-			if (newCourseSchedule.getType() == CourseScheduleType.PRACTICE) {
+			/*if (newCourseSchedule.getType() == CourseScheduleType.PRACTICE) {
 				PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(newCourseSchedule.getMusicGroupId()));
 				if (practiceGroup.getType() != TRIAL) {
 					if (DateUtil.minutesBetween(newCourseSchedule.getStartClassTime(), practiceGroup.getCoursesStartDate()) > 0) {
@@ -3262,7 +3262,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						throw new BizException("调整失败: 截止时间超过课程有效期");
 					}
 				}
-			}
+			}*/
         }
 
 		Set<String> musicGroupIds = oldCourseScheduleList.stream().filter(c -> MUSIC.equals(c.getGroupType())).map(CourseSchedule::getMusicGroupId).collect(Collectors.toSet());

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

@@ -25,6 +25,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.im.entity.GroupMember;
 import com.ym.mec.im.entity.GroupModel;
@@ -138,7 +139,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//删除当前用户角色
 		employeeDao.delEmployeeRole(employee.getId());
 		//新增用户角色
-		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), sysUser.getTeacherId());
+		Integer tenantId = TenantContextHolder.getTenantId();
+		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), tenantId);
 		teacherDao.updateUser(employee);
 		imGroupDao.updateNickname(employee.getUserId(), employee.getRealName());
 		imGroupDao.updateUserFriendNickname(employee.getUserId(), employee.getRealName());

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

@@ -207,13 +207,17 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         }
 
         ChargeTypeSubjectMapper subjectDiscount = chargeTypeSubjectMapperDao.getSubjectDiscount(chargeTypeId, subjectId);
-        if (subjectDiscount == null || subjectDiscount.getGoodsDiscountRate() == null || subjectDiscount.getGoodsDiscountRate().compareTo(new BigDecimal(100)) == 0) {
-            return goodsList;
+        
+        if (subjectDiscount == null){
+        	throw new BizException("未查询到[收费类型与声部的关联关系]");
+        }
+        if (subjectDiscount.getGoodsDiscountRate() == null) {
+        	subjectDiscount.setGoodsDiscountRate(new BigDecimal(100));
         }
         for (MusicGroupGoodsAndDiscountDto musicGroupGoodsAndDiscountDto : goodsList) {
             if (musicGroupGoodsAndDiscountDto.getType() != null && musicGroupGoodsAndDiscountDto.getType().equals(GoodsType.INSTRUMENT)) {
                 musicGroupGoodsAndDiscountDto.setDiscountRate(subjectDiscount.getGoodsDiscountRate());
-                musicGroupGoodsAndDiscountDto.setGroupPurchasePrice(musicGroupGoodsAndDiscountDto.getDiscountPrice().multiply(subjectDiscount.getGoodsDiscountRate()).divide(new BigDecimal(100), 0, BigDecimal.ROUND_HALF_UP));
+                musicGroupGoodsAndDiscountDto.setGroupPurchasePrice(musicGroupGoodsAndDiscountDto.getGroupPurchasePrice().multiply(subjectDiscount.getGoodsDiscountRate()).divide(new BigDecimal(100), 0, BigDecimal.ROUND_HALF_UP));
             }
         }
         return goodsList;

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

@@ -277,7 +277,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         CompletableFuture.runAsync(() -> {
             //检查5次
             Boolean ret = false;
-            for (int i = 0; i <= 15; i++) {
+            for (int i = 0; i <= 100; i++) { // 检查5分钟
                 try {
                     ret = cloudTeacherOrderService.payCheck(record);
                     if (ret) break;
@@ -305,7 +305,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         //异步
         CompletableFuture.runAsync(() -> {
             //检查5次
-            for (int i = 0; i <= 15; i++) {
+            for (int i = 0; i <= 100; i++) { // 检查5分钟
                 try {
                     Boolean ret = tenantOrderRecordService.rechargeCheck(record);
                     if (ret) break;

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

@@ -1,5 +1,25 @@
 package com.ym.mec.biz.service.impl;
 
+import static com.ym.mec.biz.dal.enums.SysUserRoleEnum.EDUCATIONAL_TEACHER;
+import static com.ym.mec.biz.dal.enums.SysUserRoleEnum.JOIN_TEACHER;
+import static com.ym.mec.biz.dal.enums.SysUserRoleEnum.REPAIR;
+import static com.ym.mec.biz.dal.enums.SysUserRoleEnum.SECTION_MANAGER;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
@@ -15,19 +35,10 @@ import com.ym.mec.biz.dal.enums.SysUserRoleEnum;
 import com.ym.mec.biz.dal.page.EducationBaseQueryInfo;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.entity.Mapper;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.ym.mec.biz.dal.enums.SysUserRoleEnum.*;
 
 @Service
 public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organization> implements OrganizationService {
@@ -251,11 +262,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
 	@Override
 	public String getEmployeeOrgan(Integer userId, String organIds,Boolean isSuper) {
-		if(StringUtils.isEmpty(organIds)){
-			Employee employee = employeeDao.get(userId);
-			organIds = employee.getOrganIdList();
-		}
-		if(StringUtils.isEmpty(organIds) && isSuper){
+		if(isSuper){
 			Map<String,Object> param = new HashMap<>();
 			Integer tenantId = TenantContextHolder.getTenantId();
 			param.put("tenantId",tenantId);
@@ -264,6 +271,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				organIds = StringUtils.join(all.stream().map(e->e.getId()).collect(Collectors.toSet()),",");
 			}
 		}
+		if(StringUtils.isEmpty(organIds)){
+			Employee employee = employeeDao.get(userId);
+			organIds = employee.getOrganIdList();
+		}
 		return organIds;
 	}
 

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

@@ -253,7 +253,7 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         if (!bucket.trySet(1, 3L, TimeUnit.SECONDS)) {
             return false;
         }
-        log.info("checkRechargeCheck  checkTenantOrder>>>>>");
+        log.info("checkRechargeCheck  rechargeCheck>>>>>");
         checkTransOrderState(record);
         if (record.getOrderState() == 1) {
             baseMapper.updateById(record);
@@ -265,7 +265,6 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
                 e.printStackTrace();
                 return false;
             }
-            // 发送短信
         }
         bucket.delete();
         return false;

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

@@ -871,7 +871,7 @@
         SELECT mg.id_ musicGroupId,o.name_ organName,mg.name_ musicGroupName,mg.status_ musicGroupStatus,mg.course_view_type_ courseViewType FROM
         music_group mg
         LEFT JOIN organization o ON mg.organ_id_ = o.id_
-        WHERE status_ IN ('PRE_APPLY','PRE_BUILD_FEE','FEE_AUDIT','APPLY','PAY') and tenant_id_ = #{tenantId}
+        WHERE status_ IN ('PRE_APPLY','PRE_BUILD_FEE','FEE_AUDIT','APPLY','PAY') and mg.tenant_id_ = #{tenantId}
         <if test="organId != null">
             AND FIND_IN_SET(mg.organ_id_,#{organId})
         </if>

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

@@ -35,6 +35,7 @@
 	
 	<sql id="queryPaymentOrder">
         <where>
+			su.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(tpo.organ_id_,#{organId})
             </if>

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/CommEmailPlugin.java

@@ -98,7 +98,7 @@ public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 		try {
 			email.setFrom(from, fromName);
 			email.setSubject(subject);
-			email.setMsg(content);
+			email.setContent(content, "text/html");
 			email.addTo(receiver);
 			email.send();
 			return true;

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

@@ -205,7 +205,7 @@ public class MusicGroupQuitController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('musicGroupQuit/quitMusicGroup')")
     public HttpResponseResult quitMusicGroup(@RequestBody MusicGroupQuit musicGroupQuit){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
+		if (sysUser == null || sysUser.getId() == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
         List<SysUserRoleEnum> roleIds;
@@ -215,10 +215,13 @@ public class MusicGroupQuitController extends BaseController {
             roleIds.add(SysUserRoleEnum.EDUCATIONAL_TEACHER);
         } else {
             MusicGroup musicGroup = musicGroupService.get(musicGroupQuit.getMusicGroupId());
+            if(musicGroup == null){
+            	return failed("乐团信息查询失败");
+            }
             roleIds = organizationService.queryOrganRole(musicGroup.getOrganId(), sysUser.getId());
         }
 		if (!(roleIds.contains(SysUserRoleEnum.SECTION_MANAGER) || roleIds.contains(SysUserRoleEnum.EDUCATIONAL_TEACHER))) {
-			throw new BizException("未经授权，不能操作");
+			return failed("未经授权，不能操作");
 		}
         return succeed(musicGroupService.approveQuitMusicGroup(roleIds, musicGroupQuit));
     }