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

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -177,6 +177,9 @@
             <if test="hid != null">
                 AND hidden_ = #{hid}
             </if>
+            <if test="tenantId != null">
+                AND hidden_ = #{tenantId}
+            </if>
         </where>
         ORDER BY sort_ DESC,id_ DESC
     </select>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -58,7 +58,7 @@
                 organ_id_ = #{organId},
             </if>
         </set>
-        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
+        WHERE id_ = #{id} AND tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -88,6 +88,6 @@
         SELECT * FROM sys_role WHERE role_name_ = #{roleName} AND del_flag_ = 0 and tenant_id_ = #{tenantId} LIMIT 1
     </select>
     <select id="getMinRoleId" resultType="java.lang.Integer">
-        SELECT sr.id_ FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} LIMIT 1
+        SELECT id_ FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} LIMIT 1
     </select>
 </mapper>

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

@@ -17,6 +17,16 @@ public class SubjectChangeParamDto{
     @ApiModelProperty(value = "优惠券列表", required = false)
     private List<Integer> couponIdList;
 
+    private Integer tenantId;
+
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -84,7 +84,7 @@ public class MusicGroup extends BaseEntity {
 	private String courseForm;
 
 	@ApiModelProperty(value = "老师课酬结算方式",required = false)
-	private SalarySettlementTypeEnum settlementType = SalarySettlementTypeEnum.TEACHER_DEFAULT;
+	private SalarySettlementTypeEnum settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY;
 
 	@ApiModelProperty(value = "课程展现形式",required = false)
 	private CourseViewTypeEnum courseViewType;

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

@@ -3,9 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.entity.BaseEntity;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -59,94 +57,6 @@ public class Organization extends BaseEntity {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Organization> organizations;
 
-	@ApiModelProperty(value = "分部经理",required = false)
-	private String organManager;
-
-	@ApiModelProperty(value = "乐团主管",required = false)
-	private String educationId;
-
-	@ApiModelProperty(value = "维修技师",required = false)
-	private String repairId;
-
-	@ApiModelProperty(value = "衔接老师",required = false)
-	private String joinTeacherId;
-
-	@ApiModelProperty(value = "分部经理",required = false)
-	private String organManagerName;
-
-	@ApiModelProperty(value = "乐团主管",required = false)
-	private String educationName;
-
-	@ApiModelProperty(value = "维修技师",required = false)
-	private String repairName;
-
-	@ApiModelProperty(value = "衔接老师",required = false)
-	private String joinTeacherName;
-
-	public String getJoinTeacherId() {
-		return joinTeacherId;
-	}
-
-	public void setJoinTeacherId(String joinTeacherId) {
-		this.joinTeacherId = joinTeacherId;
-	}
-
-	public String getJoinTeacherName() {
-		return joinTeacherName;
-	}
-
-	public void setJoinTeacherName(String joinTeacherName) {
-		this.joinTeacherName = joinTeacherName;
-	}
-
-	public String getOrganManagerName() {
-		return organManagerName;
-	}
-
-	public void setOrganManagerName(String organManagerName) {
-		this.organManagerName = organManagerName;
-	}
-
-	public String getEducationName() {
-		return educationName;
-	}
-
-	public void setEducationName(String educationName) {
-		this.educationName = educationName;
-	}
-
-	public String getRepairName() {
-		return repairName;
-	}
-
-	public void setRepairName(String repairName) {
-		this.repairName = repairName;
-	}
-
-	public String getOrganManager() {
-		return organManager;
-	}
-
-	public void setOrganManager(String organManager) {
-		this.organManager = organManager;
-	}
-
-	public String getEducationId() {
-		return educationId;
-	}
-
-	public void setEducationId(String educationId) {
-		this.educationId = educationId;
-	}
-
-	public String getRepairId() {
-		return repairId;
-	}
-
-	public void setRepairId(String repairId) {
-		this.repairId = repairId;
-	}
-
 	public String getAreaName() {
 		return areaName;
 	}

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

@@ -6,8 +6,10 @@ import com.ym.mec.common.enums.BaseEnum;
  * 班级类型
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
-	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"), SNAP("SNAP",
-			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "网络基础训练课"),MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"),
+	VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"), SNAP("SNAP",
+			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "网络基础训练课"),
+	MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
 
 	private String code;
 

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

@@ -35,12 +35,6 @@ public interface OrganizationService extends BaseService<Integer, Organization>
      */
     Map<Integer, String> getGradeList(Integer id);
 
-    int updateOrgan(Organization organization);
-
-    Long add(Organization organization);
-
-    Map<String,Map<Integer,String>> getOrganRole(List<Integer> organIds);
-
     /**
     * @description: 获取员工能访问的分部列表
      * @param userId 当前用户
@@ -82,12 +76,4 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     */
     <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo);
 
-    /**
-    * @description: 校验当前用户是否只有教务老师角色,并给教务老师角色赋值
-     * @param queryInfo
-    * @return T
-    * @author zx
-    * @date 2022/1/6 18:11
-    */
-    <T extends EducationBaseQueryInfo> T onlyEducationInitClassId(T queryInfo);
 }

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

@@ -0,0 +1,6 @@
+package com.ym.mec.biz.service;
+
+public interface TenantInfoSendMsgService {
+
+    void sendToAll(String type, Integer userId, String email, Object... objs);
+}

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

@@ -750,7 +750,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 							//课堂课课酬
 							if (type == CourseScheduleType.CLASSROOM) {
-								BigDecimal salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary();
+								BigDecimal salary = courseScheduleTeacherSalary.getTeacherRole().equals(TeachTypeEnum.BISHOP) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary();
 								courseScheduleTeacherSalary.setExpectSalary(salary);
 							}
 							//基础技能提高课

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

@@ -340,7 +340,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
         // 查询需要修改的课酬记录
         List<TeacherVipSalaryDto> teacherSalaryList = courseScheduleTeacherSalaryDao.queryOnlineCourseByGroupType(startDate, endDate, tenantId);
-
+        if (CollectionUtils.isEmpty(teacherSalaryList)) {
+            LOGGER.info("未获取到未结算课酬记录!");
+            return;
+        }
         Set<Integer> teacherIds = teacherSalaryList.stream().map(TeacherVipSalaryDto::getUserId).collect(Collectors.toSet());
         List<Teacher> teachers = teacherDao.findByTeacherIds(new ArrayList<>(teacherIds));
         Map<Integer, Teacher> idTeacherMap = teachers.stream().collect(Collectors.toMap(Teacher::getId, t -> t, (t1, t2) -> t1));
@@ -1310,7 +1313,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
             //课堂课课酬改为按分钟数计算，并且时长占比向下取整
             if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)){
-                baseSalary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
+                baseSalary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary();
                 classTimeDuty = new BigDecimal(classCourseDuration).divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN);
             }
             

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

@@ -179,23 +179,26 @@ public class MusicGroupPaymentCalenderCourseSettingsServiceImpl extends BaseServ
 	public BigDecimal getCurrentAmount(MusicGroupPaymentBaseCalender baseCalender) {
 		BigDecimal totalAmount = BigDecimal.ZERO;
 		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = baseCalender.getMusicGroupPaymentCalenderCourseSettingsList();
-		if(baseCalender.getMusicGroupOrganizationCourseSettingId() != null){
-			List<MusicGroupOrganizationCourseSettingsDetail> musicGroupOrganizationCourseSettingsDetails = musicGroupOrganizationCourseSettingsDetailDao
-					.queryByMusicGroupOrganizationCourseSettingsId(baseCalender.getMusicGroupOrganizationCourseSettingId());
-			return musicGroupOrganizationCourseSettingsDetails.stream().map(e -> e.getCourseCurrentPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
-		}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("请先设置分部课程类型单价");
+		if(musicGroupPaymentCalenderCourseSettingsList != null && musicGroupPaymentCalenderCourseSettingsList.size() > 0){
+			if(baseCalender.getMusicGroupOrganizationCourseSettingId() != null){
+				List<MusicGroupOrganizationCourseSettingsDetail> musicGroupOrganizationCourseSettingsDetails = musicGroupOrganizationCourseSettingsDetailDao
+						.queryByMusicGroupOrganizationCourseSettingsId(baseCalender.getMusicGroupOrganizationCourseSettingId());
+				return musicGroupOrganizationCourseSettingsDetails.stream().map(e -> e.getCourseCurrentPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
+			}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("请先设置分部课程类型单价");
+					}
+					totalAmount = totalAmount.add(defaultUnitPrice.getUnitPrice().multiply(new BigDecimal(courseSettings.getCourseTotalMinuties())));
 				}
-				totalAmount = totalAmount.add(defaultUnitPrice.getUnitPrice().multiply(new BigDecimal(courseSettings.getCourseTotalMinuties())));
+				return totalAmount;
 			}
-			return totalAmount;
 		}
+		return totalAmount;
 	}
 
 	@Override

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

@@ -770,35 +770,37 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 			musicGroupPaymentCalenderDetailDao.update(musicGroupPaymentCalenderDetail);
 		}
 
-		List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetails = new ArrayList<>();
-		List<String> orderDetailTypes = studentPaymentOrderDetailDao.getOrderDetailType(studentPaymentOrder.getId());
-		List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsDao
-				.getWithPaymentCalender(musicGroupPaymentCalender.getId());
-		for (MusicGroupPaymentCalenderCourseSettings courseSetting : courseSettingsList) {
-			if (musicGroupPaymentCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.STUDENT)
-					&& !orderDetailTypes.contains(courseSetting.getCourseType().getCode())) {
-				continue;
+		//续费项目加学员时就生成了课程时长，报名项目在缴费成功后才需要添加课程时长
+		if(musicGroupPaymentCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.MUSIC_APPLY){
+			List<MusicGroupPaymentStudentCourseDetail> musicGroupPaymentStudentCourseDetails = new ArrayList<>();
+			List<String> orderDetailTypes = studentPaymentOrderDetailDao.getOrderDetailType(studentPaymentOrder.getId());
+			List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsDao
+					.getWithPaymentCalender(musicGroupPaymentCalender.getId());
+			for (MusicGroupPaymentCalenderCourseSettings courseSetting : courseSettingsList) {
+				if (musicGroupPaymentCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.STUDENT)
+						&& !orderDetailTypes.contains(courseSetting.getCourseType().getCode())) {
+					continue;
+				}
+				if (courseSetting.getCourseTotalMinuties() == null || courseSetting.getCourseTotalMinuties() == 0) {
+					continue;
+				}
+				MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
+				musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
+				musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
+				musicGroupPaymentStudentCourseDetail.setUserId(studentPaymentOrder.getUserId());
+				musicGroupPaymentStudentCourseDetail.setCourseType(courseSetting.getCourseType());
+				musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSetting.getCourseTotalMinuties());
+				musicGroupPaymentStudentCourseDetail.setCourseOriginalPrice(courseSetting.getCourseOriginalPrice());
+				musicGroupPaymentStudentCourseDetail.setCourseCurrentPrice(courseSetting.getCourseCurrentPrice());
+				musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
+				musicGroupPaymentStudentCourseDetail.setCreateTime(nowDate);
+				musicGroupPaymentStudentCourseDetail.setUpdateTime(nowDate);
+				musicGroupPaymentStudentCourseDetail.setTenantId(tenantId);
+				musicGroupPaymentStudentCourseDetails.add(musicGroupPaymentStudentCourseDetail);
 			}
-			if (courseSetting.getCourseTotalMinuties() == null || courseSetting.getCourseTotalMinuties() == 0) {
-				continue;
+			if (musicGroupPaymentStudentCourseDetails.size() > 0) {
+				musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetails);
 			}
-			MusicGroupPaymentStudentCourseDetail musicGroupPaymentStudentCourseDetail = new MusicGroupPaymentStudentCourseDetail();
-			musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
-			musicGroupPaymentStudentCourseDetail.setMusicGroupPaymentCalenderDetailId(musicGroupPaymentCalenderDetail.getId());
-			musicGroupPaymentStudentCourseDetail.setUserId(studentPaymentOrder.getUserId());
-			musicGroupPaymentStudentCourseDetail.setCourseType(courseSetting.getCourseType());
-			musicGroupPaymentStudentCourseDetail.setTotalCourseMinutes(courseSetting.getCourseTotalMinuties());
-			musicGroupPaymentStudentCourseDetail.setCourseOriginalPrice(courseSetting.getCourseOriginalPrice());
-			musicGroupPaymentStudentCourseDetail.setCourseCurrentPrice(courseSetting.getCourseCurrentPrice());
-			musicGroupPaymentStudentCourseDetail.setUsedCourseMinutes(0);
-			musicGroupPaymentStudentCourseDetail.setCreateTime(nowDate);
-			musicGroupPaymentStudentCourseDetail.setUpdateTime(nowDate);
-			musicGroupPaymentStudentCourseDetail.setTenantId(tenantId);
-			musicGroupPaymentStudentCourseDetails.add(musicGroupPaymentStudentCourseDetail);
-		}
-
-		if (musicGroupPaymentStudentCourseDetails.size() > 0) {
-			musicGroupPaymentStudentCourseDetailDao.batchInsert(musicGroupPaymentStudentCourseDetails);
 		}
     }
 }

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

@@ -21,12 +21,14 @@ import com.ym.mec.common.dal.BaseDAO;
 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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.enums.SysUserRoleEnum.EDUCATION;
@@ -43,8 +45,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Autowired
 	private EmployeeDao employeeDao;
 	@Autowired
-	private ClassGroupDao classGroupDao;
-	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
 	private SysEmployeePositionService employeePositionService;
@@ -101,56 +101,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	}
 
 	@Override
-	public int updateOrgan(Organization organization) {
-		return organizationDao.update(initOrganization(organization));
-	}
-
-	@Override
-	public Long add(Organization organization) {
-		return organizationDao.insert(initOrganization(organization));
-	}
-
-	@Override
-	public Map<String,Map<Integer,String>> getOrganRole(List<Integer> organIds) {
-		List<Organization> organizationList = organizationDao.findOrgans(organIds);
-		if(organizationList == null || organizationList.size() == 0){
-			throw new BizException("分部信息不存在");
-		}
-		StringJoiner organManager = new StringJoiner(",")
-				,repairId = new StringJoiner(",")
-				,educationId = new StringJoiner(",")
-				,joinTeacherId = new StringJoiner(","),
-				userId = new StringJoiner(",");
-		for (Organization organization : organizationList) {
-			if(StringUtils.isNotEmpty(organization.getOrganManager())){
-				organManager.add(organization.getOrganManager());
-				userId.add(organization.getOrganManager());
-			}
-			if(StringUtils.isNotEmpty(organization.getRepairId())){
-				repairId.add(organization.getRepairId());
-				userId.add(organization.getRepairId());
-			}
-			if(StringUtils.isNotEmpty(organization.getEducationId())){
-				educationId.add(organization.getEducationId());
-				userId.add(organization.getEducationId());
-			}
-			if(StringUtils.isNotEmpty(organization.getJoinTeacherId())){
-				joinTeacherId.add(organization.getJoinTeacherId());
-				userId.add(organization.getJoinTeacherId());
-			}
-		}
-		Map<String,Map<Integer,String>> resultMap = new HashMap<>(4);
-		if(userId.length() > 0){
-			Map<Integer, String> educationalTeacherNameMap = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(userId.toString()));
-			resultMap.put("organManager",getOrganManagerName(educationalTeacherNameMap,organManager.toString()));
-			resultMap.put("repairId",getOrganManagerName(educationalTeacherNameMap,repairId.toString()));
-			resultMap.put("educationId",getOrganManagerName(educationalTeacherNameMap,educationId.toString()));
-			resultMap.put("joinTeacherId",getOrganManagerName(educationalTeacherNameMap,joinTeacherId.toString()));
-		}
-		return resultMap;
-	}
-
-	@Override
 	public String getEmployeeOrgan(Integer userId, String organIds,Boolean isSuper) {
 		if(StringUtils.isEmpty(organIds)){
 			Integer tenantId = TenantContextHolder.getTenantId();
@@ -205,14 +155,6 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		return organizationDao.getOrgans(organIds,tenantId);
 	}
 
-    @Override
-    public <T extends EducationBaseQueryInfo> T onlyEducationInitClassId(T queryInfo) {
-		queryInfo = onlyEducation(queryInfo);
-		if(queryInfo.getEducationUserId() != null){
-			queryInfo.setClassGroupIds(classGroupDao.queryGroupClassGroupIds(queryInfo.getEducationUserId()));
-		}
-		return queryInfo;
-	}
 
     @Override
     public <T extends EducationBaseQueryInfo> T onlyEducation(T queryInfo) {
@@ -228,30 +170,4 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 		return queryInfo;
     }
-
-    private Map<Integer,String> getOrganManagerName(Map<Integer, String> nameMap, String organManager){
-		Map<Integer,String> map = new HashMap<>();
-		if(StringUtils.isNotEmpty(organManager)){
-			List<Integer> organIds = Arrays.stream(organManager.split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
-			for (Integer organId : organIds) {
-				map.put(organId,nameMap.get(organId));
-			}
-		}
-		return map;
-	}
-	private String getName(String userIds){
-		if(StringUtils.isNotEmpty(userIds)){
-			return teacherDao.queryTeacherNameByTeacherIds(userIds);
-		}
-		return "";
-	}
-
-
-	private Organization initOrganization(Organization organization){
-		organization.setOrganManagerName(getName(organization.getOrganManager()));
-		organization.setEducationName(getName(organization.getEducationId()));
-		organization.setRepairName(getName(organization.getRepairId()));
-		organization.setJoinTeacherName(getName(organization.getJoinTeacherId()));
-		return organization;
-	}
 }

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

@@ -122,6 +122,7 @@ public class PlatformProductServiceImpl extends ServiceImpl<PlatformProductDao,
             return null;
         }
         return strings.stream()
+                .distinct()
                 .map(WrapperUtil::toInt)
                 .collect(Collectors.toList());
     }

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

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -98,8 +97,6 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
     @Autowired
-    private EmployeeDao employeeDao;
-    @Autowired
     private OrganizationDegreeCourseFeeDao organizationDegreeCourseFeeDao;
     @Autowired
     private ActivityUserMapperDao activityUserMapperDao;

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

@@ -18,6 +18,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.yqpay.Msg;
@@ -357,8 +358,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         if (StringUtils.isBlank(order.getTransNo())) {
             order.setTransNo(rpMap.get("orderNo"));
         }
+
         order.setPaymentBusinessChannel(rpMap.get("channelType"));
         order.setTenantId(this.get(order.getId()).getTenantId());
+        TenantContextHolder.setTenantId(order.getTenantId());
         callOrderCallBack(order);
 
         if (status.equals(DealStatusEnum.SUCCESS)
@@ -367,6 +370,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 && !rpMap.containsKey("simulation")) {
             confirmOrder(order);
         }
+        TenantContextHolder.clearTenantId();
     }
 
     private Boolean confirmOrder(StudentPaymentOrder order) {

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

@@ -171,7 +171,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 
         String channelType = "";
 
-        Integer tenantId = TenantContextHolder.getTenantId();
+        Integer tenantId = subjectChangeParamDto.getTenantId();
 
         //只允许使用这类型的优惠券
         String[] checkCoupon = CouponDetailTypeEnum.getAllowType(CouponDetailTypeEnum.ACCESSORIES, CouponDetailTypeEnum.MUSICAL);

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

@@ -9,6 +9,8 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
@@ -26,7 +28,7 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 	@Autowired
 	private SysTenantConfigDao sysTenantConfigDao;
 	@Autowired
-	private RedisCache<String,ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> redisCache;
+	private RedissonClient redissonClient;
 	private static final String tenantKey = "sysTenantConfig";
 
 	@Override
@@ -44,12 +46,14 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 
 	@Override
 	public void setTenantConfig(ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfig) {
-		redisCache.put(tenantKey,tenantConfig);
+		RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
+		bucket.set(tenantConfig);
 	}
 
 	@Override
 	public String getTenantConfigValue(String paramName,Integer tenantId) {
-		ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfigMap = redisCache.get(tenantKey);
+		RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
+		ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> tenantConfigMap = bucket.get();
 		ConcurrentHashMap<String, String> map = tenantConfigMap.get(tenantId);
 		if(map != null){
 			return map.get(paramName);
@@ -60,7 +64,8 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 
 	@Override
 	public ConcurrentHashMap<Integer, ConcurrentHashMap<String, String>> getAllTenantConfig() {
-		return redisCache.get(tenantKey);
+		RBucket<ConcurrentHashMap<Integer,ConcurrentHashMap<String,String>>> bucket = redissonClient.getBucket(tenantKey);
+		return bucket.get();
 	}
 
 	@Override

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

@@ -172,7 +172,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									}
 									//课堂课课酬改为按分钟数计算，并且时长占比向下取整
 									if (CourseSchedule.CourseScheduleType.CLASSROOM.equals(tdms.getCourseScheduleType())){
-										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary());
+										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary());
 										ts.setExpectSalary(duration.divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN).multiply(ts.getExpectSalary()).setScale(2, BigDecimal.ROUND_HALF_UP));
 									}
 									list.add(ts);
@@ -199,7 +199,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 									}
 									//课堂课课酬改为按分钟数计算，并且时长占比向下取整
 									if (CourseSchedule.CourseScheduleType.CLASSROOM.equals(tdms.getCourseScheduleType())){
-										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher30MinSalary() : tdms.getAssistantTeacher30MinSalary());
+										ts.setExpectSalary(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole()) ? tdms.getMainTeacher90MinSalary() : tdms.getAssistantTeacher90MinSalary());
 										ts.setExpectSalary(duration.divide(new BigDecimal(40), BigDecimal.ZERO.intValue(), BigDecimal.ROUND_DOWN).multiply(ts.getExpectSalary()).setScale(2, BigDecimal.ROUND_HALF_UP));
 									}
 									list.add(ts);

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

@@ -0,0 +1,62 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.TenantInfoSendMsgService;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
+    private static final Logger log = LoggerFactory.getLogger(TenantInfoSendMsgServiceImpl.class);
+
+    @Autowired
+    private SysMessageService sysMessageService;
+
+    //开通
+    public static final String OPEN = "open";
+    //续费
+    public static final String RENEW = "renew";
+
+    //发送邮件和短信
+    public static final Object[] sendAll = {MessageSenderPluginContext.MessageSender.EMAIL, MessageSenderPluginContext.MessageSender.AWSMS};
+    //开通
+    private static final Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum> openMsgEnum = new HashMap<>();
+    //续费
+    private static final Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum> renewMsgEnum = new HashMap<>();
+    //init
+    private static final Map<String, Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum>> sendMsgTypeEn = new HashMap<>();
+
+    static {
+        //开通
+        openMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL);
+        openMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_TENANT_ACTIVATION_SUCCESSFUL);
+        //续费
+        renewMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_RENEWAL_SUCCESSFUL);
+        renewMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_TENANT_RENEWAL_SUCCESSFUL);
+        //init
+        sendMsgTypeEn.put(OPEN, openMsgEnum);
+        sendMsgTypeEn.put(RENEW, renewMsgEnum);
+    }
+
+    //发送邮件及短信提醒
+    @Override
+    public void sendToAll(String type, Integer userId, String email, Object... objs) {
+        Map<Integer, String> receivers = new HashMap<>();
+        receivers.put(userId, email);
+        Arrays.stream(sendAll).forEach(o -> {
+            MessageSenderPluginContext.MessageSender msgType = (MessageSenderPluginContext.MessageSender) o;
+            sysMessageService.batchSendMessage(msgType,
+                    sendMsgTypeEn.get(type).get(msgType), receivers, null, 0, null,
+                    "SYSTEM", objs);
+        });
+    }
+
+}

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

@@ -2755,6 +2755,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public void orderCallback(StudentPaymentOrder studentPaymentOrder) {
         Integer userId = studentPaymentOrder.getUserId();
+        Integer tenantId = studentPaymentOrder.getTenantId();
         StudentPaymentOrder order = studentPaymentOrderDao.lockOrder(studentPaymentOrder.getId());
         if (!order.getStatus().equals(DealStatusEnum.ING)) {
             return;
@@ -2822,6 +2823,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         courseScheduleTeacherSalary.setClassGroupId(courseSchedule.getClassGroupId());
                         courseScheduleTeacherSalary.setExpectSalary(stringBigDecimalMap.get("offlineTeacherSalary"));
                         courseScheduleTeacherSalary.setActualSalary(null);
+                        courseScheduleTeacherSalary.setTenantId(tenantId);
                         courseScheduleTeacherSalaries.add(courseScheduleTeacherSalary);
 
                         TeacherAttendance teacherAttendance = new TeacherAttendance();
@@ -2830,6 +2832,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         teacherAttendance.setMusicGroupId(courseSchedule.getMusicGroupId());
                         teacherAttendance.setTeacherId(courseSchedule.getActualTeacherId());
                         teacherAttendance.setCourseScheduleId(courseSchedule.getId());
+                        teacherAttendance.setTenantId(tenantId);
                         teacherAttendances.add(teacherAttendance);
                     }
                     courseScheduleTeacherSalaryDao.batchInsert(courseScheduleTeacherSalaries);
@@ -2874,7 +2877,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     studentDao.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
 
                     courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
-//				courseScheduleService.checkNewCourseSchedules(courseSchedules, false,false);
 
                     imGroupService.create(classGroup.getId().longValue(), null, classGroup.getName(), classGroup.getName(), vipGroup.getName(), null, null, GroupType.VIP.getCode());
                     imGroupMemberService.join(classGroup.getId().longValue(), userRoleMap);

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

@@ -18,14 +18,6 @@
         <result column="linkman_" property="linkman"/>
         <result column="mobile_" property="mobile"/>
         <result column="address_" property="address"/>
-        <result column="organ_manager_" property="organManager"/>
-        <result column="education_id_" property="educationId"/>
-        <result column="join_teacher_id_" property="joinTeacherId"/>
-        <result column="join_teacher_name_" property="joinTeacherName"/>
-        <result column="repair_id_" property="repairId"/>
-        <result column="organ_manager_name_" property="organManagerName"/>
-        <result column="education_name_" property="educationName"/>
-        <result column="repair_name_" property="repairName"/>
         <result column="tenant_id_" property="tenantId"/>
         <result column="grade_type_" property="gradeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -44,12 +36,9 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Organization" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO organization (id_,name_,area_id_,create_time_,update_time_,
-                                  register_date_,linkman_,mobile_,address_,grade_type_,organ_manager_,education_id_,repair_id_,join_teacher_id_,
-                                  organ_manager_name_,education_name_,repair_name_,join_teacher_name_,tenant_id_)
+                                  register_date_,linkman_,mobile_,address_,grade_type_,tenant_id_)
         VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address},
-               #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-               ,#{organManager},#{educationId},#{repairId},#{joinTeacherId},#{organManagerName},
-               #{educationName},#{repairName},#{joinTeacherName},#{tenantId})
+               #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -59,14 +48,6 @@
             <if test="delFlag != null">
                 del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-                organ_manager_ = #{organManager},
-                education_id_ = #{educationId},
-                repair_id_ = #{repairId},
-                join_teacher_id_ = #{joinTeacherId},
-                organ_manager_name_ = #{organManagerName},
-                education_name_ = #{educationName},
-                repair_name_ = #{repairName},
-                join_teacher_name_ = #{joinTeacherName},
             <if test="areaId != null">
                 area_id_ = #{areaId},
             </if>

mec-student/src/main/java/com/ym/mec/student/controller/SubjectChangeController.java

@@ -57,6 +57,7 @@ public class SubjectChangeController extends BaseController {
         	}
             return failed(HttpStatus.CONTINUE, "您有待支付的订单");
         }
+        subjectChangeParamDto.setTenantId(subjectChange.getTenantId());
         Map payMap = subjectChangeService.payChange(subjectChangeParamDto);
         if (payMap.containsKey("tradeState")) {
             return failed(HttpStatus.CREATED, payMap, "恭喜您,支付成功!");

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

@@ -2,26 +2,20 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
-import com.ym.mec.biz.service.EmployeeService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.tenant.TenantContextHolder;
-import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.Map;
 
 @RequestMapping("organization")
 @Api(tags = "分部服务")
@@ -62,7 +56,7 @@ public class OrganizationController extends BaseController {
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('organization/add')")
     public Object add(Organization organization){
-        return succeed(organizationService.add(organization));
+        return succeed(organizationService.insert(organization));
     }
 
     @ApiOperation(value = "根据分部编号删除分部")
@@ -77,7 +71,7 @@ public class OrganizationController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('organization/update')")
     public Object update(Organization organization){
         organization.setUpdateTime(new Date());
-        return succeed(organizationService.updateOrgan(organization));
+        return succeed(organizationService.update(organization));
     }
 
     @ApiOperation(value = "根据分部编号查询分部详情")
@@ -88,19 +82,6 @@ public class OrganizationController extends BaseController {
         return succeed(organizationService.get(id));
     }
 
-    @ApiOperation(value = "根据分部角色列表map")
-    @GetMapping("/getOrganRole")
-    @PreAuthorize("@pcs.hasPermissions('organization/getOrganRole')")
-    @ApiParam(value = "分部编号", required = true)
-    public Object getOrganRole(String organIds){
-        organIds = organizationService.getEmployeeOrgan(organIds);
-        if(StringUtils.isEmpty(organIds)){
-            return failed("分部信息异常");
-        }
-        List<Integer> collect = Arrays.stream(organIds.split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
-        return succeed(organizationService.getOrganRole(collect));
-    }
-
     @ApiOperation(value = "获取用户所在分部的年级列表）")
     @GetMapping("/getGradeList")
     @PreAuthorize("@pcs.hasPermissions('organization/getGradeList')")