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

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysRoleDao.java

@@ -20,12 +20,12 @@ public interface SysRoleDao extends BaseDAO<Integer, SysRole> {
      * @param code
      * @return
      */
-    SysRole findRoleByCode(@Param("code") String code);
+    SysRole findRoleByCode(@Param("code") String code, @Param("tenantId") Integer tenantId);
 
     /**
      * 根据角色名称获取角色
      * @param roleName
      * @return
      */
-    SysRole findByRoleName(String roleName);
+    SysRole findByRoleName(String roleName, @Param("tenantId") Integer tenantId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysRoleService.java

@@ -19,7 +19,7 @@ public interface SysRoleService extends BaseService<Integer, SysRole> {
      * @param code
      * @return
      */
-    SysRole findRoleByCode(String code);
+    SysRole findRoleByCode(String code, Integer tenantId);
 
     /**
      * 添加角色

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleServiceImpl.java

@@ -8,6 +8,8 @@ import com.ym.mec.auth.service.SysRoleService;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,14 +36,14 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	}
 
 	@Override
-	public SysRole findRoleByCode(String code){
-		return sysRoleDao.findRoleByCode(code);
+	public SysRole findRoleByCode(String code, Integer tenantId){
+		return sysRoleDao.findRoleByCode(code, tenantId);
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void addRole(SysRole sysRole) {
-		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName());
+		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName(), sysRole.getTenantId());
 		if(findByName != null){
 			throw new BizException("操作失败：角色 {} 已存在",sysRole.getRoleName());
 		}
@@ -52,7 +54,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateRole(SysRole sysRole) {
-		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName());
+		SysRole findByName = sysRoleDao.findByRoleName(sysRole.getRoleName(), sysRole.getTenantId());
 		if(findByName != null && !findByName.getId().equals(sysRole.getId())){
 			throw new BizException("操作失败：角色 {} 已存在",sysRole.getRoleName());
 		}

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

@@ -15,6 +15,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="organ_id_" property="organId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -24,14 +25,14 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysRole">
-		SELECT * FROM sys_role WHERE del_flag_ = 0 ORDER BY upate_time_ DESC
+		SELECT * FROM sys_role WHERE del_flag_ = 0 and tenant_id_ = #{tenantId} ORDER BY upate_time_ DESC
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysRole" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,organ_id_)
-        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{organId})
+        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,organ_id_,tenant_id_)
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{organId},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -57,7 +58,7 @@
                 organ_id_ = #{organId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -67,13 +68,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysRole" parameterType="map">
-        SELECT * FROM sys_role WHERE del_flag_ = 0 ORDER BY update_time_ DESC
+        SELECT * FROM sys_role WHERE del_flag_ = 0 and tenant_id_ = #{tenantId} ORDER BY update_time_ DESC
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0
+		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0 and tenant_id_ = #{tenantId}
 	</select>
 
     <select id="findRoleByUserId" resultMap="SysRole">
@@ -81,9 +82,9 @@
 	</select>
 
     <select id="findRoleByCode" resultMap="SysRole">
-        SELECT sr.* FROM sys_role WHERE role_code_ = #{code} AND sr.del_flag_ = 0
+        SELECT sr.* FROM sys_role WHERE role_code_ = #{code} AND sr.del_flag_ = 0 and tenant_id_ = #{tenantId}
     </select>
     <select id="findByRoleName" resultMap="SysRole">
-        SELECT * FROM sys_role WHERE role_name_ = #{roleName} AND del_flag_ = 0 LIMIT 1
+        SELECT * FROM sys_role WHERE role_name_ = #{roleName} AND del_flag_ = 0 and tenant_id_ = #{tenantId} LIMIT 1
     </select>
 </mapper>

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

@@ -21,4 +21,7 @@ public interface PlatformProductDao extends BaseMapper<PlatformProduct> {
     <T> IPage<T> queryPage(Page<T> page, @Param("search") String search);
 
     List<String> queryMenuIdList(Integer serveId);
+
+    List<Integer> queryProductInTenant(Integer id);
+
 }

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

@@ -6,8 +6,6 @@ import org.apache.ibatis.annotations.Param;
 
 public interface SysCouponDao extends BaseDAO<Integer, SysCoupon> {
 
-    SysCoupon getWithName(@Param("name") String name);
-
     SysCoupon lockCoupon(@Param("id") Integer id);
 	
 }

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

@@ -58,8 +58,6 @@ public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareR
     List<MusicCompareRankingDto> queryMusicGroupStudentTrainData(Map<String, Object> params);
     int countMusicGroupStudentTrainData(Map<String, Object> params);
 
-    List<EduOrganStudentListDto> queryStudentTrainData(@Param("studentIds") List<Integer> studentIds);
-
     /**
      * 老师端首页学员训练统计
      * @param params

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

@@ -14,6 +14,6 @@ public interface SysMusicCompareWeekDataDao extends BaseDAO<Integer, SysMusicCom
 
     List<MusicCompareRankingDto> getUserTrainStat(@Param("monday") String monday,
                                                   @Param("orderType") Integer orderType,
-                                                  @Param("heardLevel") String heardLevel);
+                                                  @Param("heardLevel") String heardLevel,@Param("tenantId") Integer tenantId);
 	
 }

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

@@ -67,7 +67,7 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
      * @param minutes 分钟数
      * @return
      */
-    List<Mapper> queryNoSignOutListByOverMinutes(Integer minutes);
+    List<Mapper> queryNoSignOutListByOverMinutes(@Param("minutes") Integer minutes,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 根据日期获取部门下异常签到的课程记录

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

@@ -13,13 +13,6 @@ import java.util.Map;
 public interface TeacherCourseRewardDao extends BaseDAO<Long, TeacherCourseReward> {
 
     /**
-     * 根据结算状态获取列表
-     * @param settlementStatus
-     * @return
-     */
-    List<TeacherCourseReward> findBySettlementStatus(@Param("settlementStatus") int settlementStatus);
-
-    /**
      * 批量修改
      * @param teacherCourseRewards
      */
@@ -67,6 +60,6 @@ public interface TeacherCourseRewardDao extends BaseDAO<Long, TeacherCourseRewar
      */
     int updateTeacherRewardConfirmStatusWithMonth(@Param("month") String month,
                                                   @Param("teacherId") Integer teacherId,
-                                                  @Param("confirmStatus")TeacherSalaryConfirmStatus confirmStatus);
+                                                  @Param("confirmStatus")TeacherSalaryConfirmStatus confirmStatus, @Param("tenantId") Integer tenantId);
 
 }

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

@@ -13,7 +13,7 @@ public interface TeacherCourseStatisticsDao extends BaseDAO<Long, TeacherCourseS
     int deleteByMonth(@Param("date") Date date);
 
     List<TeacherCourseStatistics> findUserByWarringSalary(@Param("startDate") Date startDate,
-                                                          @Param("endDate") Date endDate);
+                                                          @Param("endDate") Date endDate,@Param("tenantId") Integer tenantId);
 
     List<TeacherCourseStatistics> findUserCourseSalaryByUserIds(@Param("userIds") List<Integer> userIds,
                                                                 @Param("startDate") Date startDate,

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

@@ -89,7 +89,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @author Joburgess
      * @date 2020/2/10
      */
-    List<SimpleUserDto> findSimpleTeachers(@Param("userIds") List<Integer> userIds);
+    List<SimpleUserDto> findSimpleTeachers(@Param("userIds") List<Integer> userIds, @Param("tenantId") Integer tenantId);
 
     List<SimpleUserDto> getUsersSimpleInfo(@Param("userIds") List<Integer> userIds);
 
@@ -296,16 +296,6 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<Map<Integer, String>> queryUsernameByIds(@Param("userIds") List<Integer> userIds);
 
     /**
-     * @param params: 搜索参数
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
-     * @describe 教师搜索
-     * @author Joburgess
-     * @date 2020/1/7
-     */
-    @Deprecated
-    List<TeacherBasicDto> searchTeachers(Map<String, Object> params);
-
-    /**
      * 获取教师列表
      *
      * @param params
@@ -478,7 +468,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      */
     int countStudent(Map<String, Object> params);
     
-    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(@Param("organIdList") String organIdList);
+    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(@Param("organIdList") String organIdList, @Param("tenantId") Integer tenantId);
 
     BasicUserDto findUserByPhone(String phone);
     /**
@@ -504,8 +494,6 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      */
     String queryTeacherNameByTeacherIds(@Param("teachingTeacherIds") String teachingTeacherIds);
 
-    List<Integer> queryAllIds();
-
     void eduUpdateTeacher(Teacher teacher);
 
     /**

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

@@ -45,6 +45,6 @@ public interface TeacherSalaryComplaintsDao extends BaseDAO<Long, TeacherSalaryC
      * @param month:
      * @return int
      */
-    int updateComplaintStatusTuDoneWithMonth(@Param("month") String month);
+    int updateComplaintStatusTuDoneWithMonth(@Param("month") String month, @Param("tenantId") Integer tenantId);
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.biz.dal.entity.TenantAssetsInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -16,5 +17,6 @@ public interface TenantAssetsInfoDao extends BaseMapper<TenantAssetsInfo> {
 
     int insertBatch(@Param("entities") List<TenantAssetsInfo> entities);
 
+    int updateAmount(BigDecimal frozenAmount);
 }
 

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

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ym.mec.biz.dal.entity.TenantCloudCourseRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * 机构云教室课程扣费记录(TenantCloudCourseRecord)表数据库访问层
+ *
+ * @author hgw
+ * @since 2021-12-26 21:53:20
+ */
+public interface TenantCloudCourseRecordDao extends BaseMapper<TenantCloudCourseRecord> {
+
+    <T> IPage<T> queryPage(Page<T> page, @Param("param") Map<String, Object> param);
+
+}
+

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

@@ -26,7 +26,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 
 	List<VipGroupActivity> queryByIds(@Param("activityIds") String activityIds);
 
-	List<VipGroupActivity> findByName(@Param("name") String name);
+	List<VipGroupActivity> findByName(@Param("name") String name, @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 导出vip活动
@@ -42,7 +42,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 	* @author zx
 	* @date 2021/10/11 11:17
 	*/
-    List<WaitCourseActivityDto> queryWaitCourseActivity(@Param("teacherId") Integer teacherId, @Param("organId") String organId);
+    List<WaitCourseActivityDto> queryWaitCourseActivity(@Param("teacherId") Integer teacherId, @Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
     * @description: 获取活动待排课学员数量

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

@@ -253,7 +253,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @param organId
      * @return
      */
-    Map<String, Integer> queryVipGroupNum(@Param("organId") String organId);
+    Map<String, Integer> queryVipGroupNum(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * 查询当月vip课数量
@@ -261,7 +261,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @param organId
      * @return
      */
-    Integer queryCurrentMonthCoursesNum(@Param("organId") String organId);
+    Integer queryCurrentMonthCoursesNum(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * @param :
@@ -270,7 +270,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @author Joburgess
      * @date 2019/11/13
      */
-    List<VipGroup> findNoCreateSuccessVipGroup();
+    List<VipGroup> findNoCreateSuccessVipGroup(Integer tenantId);
 
 
     /**
@@ -343,14 +343,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      */
     List<Map<Integer, String>> queryUserVipStatus(@Param("userIds") Set<Integer> userIds);
 
-    /**
-     * 临时用
-     *
-     * @return
-     */
-    List<VipCourseStudentInfoDto> queryVipCourseStudentInfo();
-
-    List<VipBuyResultDto> getGroupTeachers(@Param("groupIds") List<Long> groupIds);
+    List<VipBuyResultDto> getGroupTeachers(@Param("groupIds") List<Long> groupIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 根据ids获取课程组信息

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

@@ -1,35 +1,24 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
-import com.ym.mec.common.dal.BaseDAO;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGroupDefaultClassesCycle> {
 
 
-    VipGroupDefaultClassesCycle checkMaxClassTimes(Integer maxClassTimes);
+    VipGroupDefaultClassesCycle checkMaxClassTimes(@Param("maxClassTimes") Integer maxClassTimes,@Param("tenantId") Integer tenantId);
 
     int batchInstert(List<VipGroupDefaultClassesCycle> vipGroupDefaultClassesCycles);
 
-    int deleteAll();
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/8
-     * @params [maxClassTimes]
-     * @return com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle
-     * @describe 根据最大课次获取上一梯度信息
-     */
-    VipGroupDefaultClassesCycle findByMaxClassTimes(Integer maxClassTimes);
-
-
-    VipGroupDefaultClassesCycle findByMinClassTimes(Integer minClassTimes);
+    int deleteAll(Integer tenantId);
 
-    int countAll();
+    int countAll(Integer tenantId);
 
-    List<VipGroupDefaultClassesCycle> findAllCycle();
+    List<VipGroupDefaultClassesCycle> findAllCycle(Integer tenantId);
 
     /**
      * @describe 根据乐团获取指定课次课排课范围
@@ -38,6 +27,6 @@ public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGrou
      * @param classTimes: 课次
      * @return com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle
      */
-    VipGroupDefaultClassesCycle findByOrganAndClassTimes(@Param("classTimes") Integer classTimes);
+    VipGroupDefaultClassesCycle findByOrganAndClassTimes(@Param("classTimes") Integer classTimes,@Param("tenantId") Integer tenantId);
 
 }

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

@@ -28,6 +28,4 @@ public interface VipGroupDefaultClassesUnitPriceDao extends BaseDAO<Integer, Vip
 
     int updateByVipGroupCategory(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice);
 
-    List<VipGroupDefaultClassesUnitPrice> findAllByOrgan(Long organId);
-
 }

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

@@ -30,12 +30,20 @@ public class CourseSchedule  extends BaseEntity{
 
 	public enum CourseScheduleType implements BaseEnum<String, CourseScheduleType> {
 
-		SINGLE("SINGLE", "声部课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"),
-		DEMO("DEMO", "试听课"), COMPREHENSIVE("COMPREHENSIVE", "综合课"), PRACTICE(
-				"PRACTICE", "网管课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING_SINGLE("TRAINING_SINGLE", "集训声部课"),
-		TRAINING_MIX("TRAINING_MIX", "集训合奏课"), CLASSROOM(
-				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),HIGH_ONLINE("HIGH_ONLINE","网络基础训练课"),
-		MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
+        SINGLE("SINGLE", "声部课"),
+        MIX("MIX", "合奏课"),
+        HIGH("HIGH", "小班课"),
+        VIP("VIP", "vip课"),
+        DEMO("DEMO", "试听课"),
+        COMPREHENSIVE("COMPREHENSIVE", "综合课"),
+        PRACTICE("PRACTICE", "网管课"),
+        ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"),
+        TRAINING_SINGLE("TRAINING_SINGLE", "集训声部课"),
+        TRAINING_MIX("TRAINING_MIX", "集训合奏课"),
+        CLASSROOM("CLASSROOM", "课堂课"),
+        COMM("COMM", "对外课程"),
+        HIGH_ONLINE("HIGH_ONLINE", "网络基础训练课"),
+        MUSIC_NETWORK("MUSIC_NETWORK", "乐团网管课");
 
 		private String code;
 
@@ -156,7 +164,7 @@ public class CourseSchedule  extends BaseEntity{
 	private Integer isLock = 0;
 
 	private Integer organId;
-	
+
 	private Organization organization = new Organization();
 
 	private YesOrNoEnum isCallNames;

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

@@ -1,14 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
-import com.ym.mec.common.entity.BaseEntity;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+
 /**
  * 对应数据库表(sys_message_config):
  */
-public class SysMessageConfig extends BaseEntity {
+public class SysMessageConfig {
 
 	/**  */
 	private Integer id;

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

@@ -0,0 +1,134 @@
+package com.ym.mec.biz.dal.entity;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+/**
+ * 机构云教室课程扣费记录(TenantCloudCourseRecord)表实体类
+ *
+ * @author hgw
+ * @since 2021-12-26 21:54:10
+ */
+@ApiModel(value = "tenant_cloud_course_record-机构云教室课程扣费记录")
+public class TenantCloudCourseRecord implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "流水id")
+    private Integer id;
+
+    @TableField("tenant_id_")
+    @ApiModelProperty(value = "机构id")
+    private Integer tenantId;
+
+    @TableField("course_id_")
+    @ApiModelProperty(value = "course_schedule表的id_")
+    private Integer courseId;
+
+    @TableField("deduct_state_")
+    @ApiModelProperty(value = "扣费状态 0冻结 1扣费 2取消冻结")
+    private Integer deductState;
+
+    @TableField("amount_")
+    @ApiModelProperty(value = "金额")
+    private BigDecimal amount;
+
+    @TableField("created_by_")
+    @ApiModelProperty(value = "创建人")
+    private Integer createdBy;
+
+    @TableField("created_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createdTime;
+
+    @TableField("updated_by_")
+    @ApiModelProperty(value = "更新人")
+    private Integer updatedBy;
+
+    @TableField("updated_time_")
+    @ApiModelProperty(value = "更新时间")
+    private Date updatedTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public Integer getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Integer courseId) {
+        this.courseId = courseId;
+    }
+
+    public Integer getDeductState() {
+        return deductState;
+    }
+
+    public void setDeductState(Integer deductState) {
+        this.deductState = deductState;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Integer getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(Integer createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Integer getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(Integer updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public Date getUpdatedTime() {
+        return updatedTime;
+    }
+
+    public void setUpdatedTime(Date updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
+}
+

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TenantCloudCourseRecordVo.java

@@ -0,0 +1,169 @@
+package com.ym.mec.biz.dal.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author hgw
+ * Created by 2021-12-26
+ */
+public class TenantCloudCourseRecordVo implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "流水id")
+    private Integer id;
+
+    @TableField("course_id_")
+    @ApiModelProperty(value = "课程编号 course_schedule表的id_")
+    private Integer courseId;
+
+    @ApiModelProperty(value = "分部名称")
+    private Integer organName;
+
+    @ApiModelProperty(value = "机构名称")
+    private Integer tenantName;
+
+    @ApiModelProperty(value = "课程类型  CourseSchedule.CourseScheduleType")
+    private String type;
+
+    @ApiModelProperty(value = "上课教师名称")
+    private String teacherName;
+
+    @ApiModelProperty(value = "实际上课人数")
+    private Integer studentNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "上课日期")
+    private Date classDate;
+
+    @JsonFormat(pattern = "HH:mm:ss")
+    @ApiModelProperty(value = "上课时间")
+    private Date startClassTime;
+
+    @JsonFormat(pattern = "HH:mm:ss")
+    @ApiModelProperty(value = "结束时间")
+    private Date endClassTime;
+
+    @ApiModelProperty(value = "课程状态 CourseStatusEnum")
+    private String status;
+
+    @TableField("deduct_state_")
+    @ApiModelProperty(value = "扣费状态 0冻结 1扣费 2取消冻结")
+    private Integer deductState;
+
+    @TableField("amount_")
+    @ApiModelProperty(value = "金额")
+    private BigDecimal amount;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Integer courseId) {
+        this.courseId = courseId;
+    }
+
+    public Integer getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(Integer organName) {
+        this.organName = organName;
+    }
+
+    public Integer getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(Integer tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public Integer getStudentNum() {
+        return studentNum;
+    }
+
+    public void setStudentNum(Integer studentNum) {
+        this.studentNum = studentNum;
+    }
+
+    public Date getClassDate() {
+        return classDate;
+    }
+
+    public void setClassDate(Date classDate) {
+        this.classDate = classDate;
+    }
+
+    public Date getStartClassTime() {
+        return startClassTime;
+    }
+
+    public void setStartClassTime(Date startClassTime) {
+        this.startClassTime = startClassTime;
+    }
+
+    public Date getEndClassTime() {
+        return endClassTime;
+    }
+
+    public void setEndClassTime(Date endClassTime) {
+        this.endClassTime = endClassTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Integer getDeductState() {
+        return deductState;
+    }
+
+    public void setDeductState(Integer deductState) {
+        this.deductState = deductState;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+}

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

@@ -28,12 +28,6 @@ public interface TeacherCourseRewardService extends BaseService<Long, TeacherCou
      * @return com.ym.mec.common.page.PageInfo<com.ym.mec.biz.dal.dto.TeacherCourseSalaryDetail4WebDto>
      */
     PageInfo<TeacherCourseSalaryDetail4WebDto> findTeacherRewards(CourseSalaryQueryInfo4Web queryInfo);
-    /**
-     * 根据结算状态获取列表
-     * @param settlementStatus
-     * @return
-     */
-    List<TeacherCourseReward> findBySettlementStatus(int settlementStatus);
 
     /**
      * 批量修改

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

@@ -211,12 +211,6 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
     List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(String organIdList);
 
     /**
-     * 获取所有教师编号列表
-     * @return
-     */
-    List<Integer> queryAllIds();
-
-    /**
      * @describe 查询教师关联的乐团预览信息
      * @author Joburgess
      * @date 2021/8/12 0012

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

@@ -0,0 +1,21 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.entity.TenantCloudCourseRecord;
+import com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo;
+import com.ym.mec.common.page.PageInfo;
+
+import java.util.Map;
+
+/**
+ * 机构云教室课程扣费记录(TenantCloudCourseRecord)表服务接口
+ *
+ * @author hgw
+ * @since 2021-12-26 21:54:10
+ */
+public interface TenantCloudCourseRecordService extends IService<TenantCloudCourseRecord> {
+
+    PageInfo<TenantCloudCourseRecordVo> queryPage(Map<String,Object> param);
+
+}
+

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

@@ -17,6 +17,7 @@ import com.ym.mec.biz.dal.page.VipGroupTeachingRecordQueryInfo;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+
 import org.springframework.web.multipart.MultipartFile;
 
 public interface VipGroupService extends BaseService<Long, VipGroup> {
@@ -429,7 +430,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @date 2019/11/13
      * @return void
      */
-    void stopVipGroupWithNoCreate();
+    void stopVipGroupWithNoCreate(Integer tenantId);
 
     /**
      * @describe 添加vip课学员

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

@@ -1051,7 +1051,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatus(teacherSalaryIds,TeacherSalaryConfirmStatus.CONFIRMED);
-        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, teacherId, TeacherSalaryConfirmStatus.CONFIRMED);
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, teacherId, TeacherSalaryConfirmStatus.CONFIRMED, TenantContextHolder.getTenantId());
     }
 
     @Override
@@ -1154,7 +1154,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatus(teacherSalaryIds,TeacherSalaryConfirmStatus.UNCONFIRMED);
-        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.UNCONFIRMED);
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.UNCONFIRMED, TenantContextHolder.getTenantId());
         String teacherBaseUrl = sysConfigDao.findByParamName(SysConfigService.TEACHER_BASE_URL).getParanValue();
         String notifyUrl="8?"+teacherBaseUrl+"/#/remuneration?month=" + month;
         String monthStr = DateUtil.dateToString(DateUtil.stringToDate(month, "yyyy-MM"),"M月");
@@ -1176,8 +1176,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatusToComplied(teacherSalaryIds);
-        teacherSalaryComplaintsDao.updateComplaintStatusTuDoneWithMonth(month);
-        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.COMPLETED);
+        teacherSalaryComplaintsDao.updateComplaintStatusTuDoneWithMonth(month, TenantContextHolder.getTenantId());
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.COMPLETED, TenantContextHolder.getTenantId());
     }
 
     @Override

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

@@ -402,7 +402,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             List<GroupBaseCourseInfoDto> groupFinishedClassesTimes = groupDao.countGroupFinishedClassesTimes(groupIds, GroupType.COMM);
             Map<String, Integer> groupFinishedClassesTimesMap = groupFinishedClassesTimes.stream().collect(Collectors.toMap(GroupBaseCourseInfoDto::getId, e -> e.getCurrentClassTimes()));
 
-            List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
+            List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
             Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getUserName));
 
             for (CourseGroupExtendDto teacherCourseGroup : teacherCourseGroups) {

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

@@ -106,15 +106,15 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), employee.getTenantId());
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
-		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));
-		employee.setImToken(imResult.getToken());
+//		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));
+//		employee.setImToken(imResult.getToken());
 		teacherDao.updateUser(employee);
 		if(user != null){
 			employee.setAvatar(user.getAvatar());
 		}
 
 		//添加到OA
-		oaUserService.addOaUser(employee);
+//		oaUserService.addOaUser(employee);
 	}
 
 	@Override

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

@@ -217,7 +217,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			dataList = extracurricularExercisesReplyDao.findExtraExercises(params);
 			List<Long> replyIds = dataList.stream().map(ExtraExerciseStudentsDto::getId).collect(Collectors.toList());
 			List<Integer> teacherIds = dataList.stream().map(ExtraExerciseStudentsDto::getTeacherId).collect(Collectors.toList());
-			List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
+			List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
 			Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getUserName));
 			for (ExtraExerciseStudentsDto extraExerciseStudentsDto : dataList) {
 				extraExerciseStudentsDto.setTeacherName(idNameMap.get(extraExerciseStudentsDto.getTeacherId()));

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

@@ -30,7 +30,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;

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

@@ -12,9 +12,11 @@ import com.ym.mec.biz.service.PlatformProductService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -64,6 +66,11 @@ public class PlatformProductServiceImpl extends ServiceImpl<PlatformProductDao,
         platformProduct.setUpdatedBy(userId);
         platformProduct.setUpdatedTime(new Date());
         baseMapper.updateByPrimaryKeySelective(platformProduct);
+        //查询哪些机构用了这个产品，需要修改对应的权限
+//        List<Integer> tenantIds = baseMapper.queryProductInTenant(obj.getId());
+//        if(CollectionUtils.isEmpty(tenantIds)){
+//            return;
+//        }
     }
 
     /**
@@ -77,6 +84,12 @@ public class PlatformProductServiceImpl extends ServiceImpl<PlatformProductDao,
         Integer userId = Optional.ofNullable(sysUserFeignService.queryUserInfo())
                 .map(SysUser::getId)
                 .orElseThrow(() -> new BizException("用户信息获取失败"));
+        //校验哪些机构用了该产品
+        List<Integer> tenantIds = baseMapper.queryProductInTenant(id);
+        if(CollectionUtils.isNotEmpty(tenantIds)){
+            throw new BizException("该产品关联的服务已有机构在使用，无法删除！");
+        }
+
         PlatformProduct platformProduct = new PlatformProduct();
         platformProduct.setId(id);
         platformProduct.setDeleted(1);

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

@@ -355,7 +355,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             dataList = studentCourseHomeworkDao.findStudentHomeworkRecord(params);
             if (!CollectionUtils.isEmpty(dataList)) {
                 List<Integer> teacherIds = dataList.stream().map(StudentHomeworkRecordDto::getTeacherId).collect(Collectors.toList());
-                List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
+                List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
                 Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, u -> u.getUserName()));
                 for (StudentHomeworkRecordDto studentHomeworkRecordDto : dataList) {
                     studentHomeworkRecordDto.setTeacherName(idNameMap.get(studentHomeworkRecordDto.getTeacherId()));

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

@@ -166,7 +166,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		StatDto result = new StatDto();
 		MusicCompareRankingDto head = new MusicCompareRankingDto();
 		head.setUserId(queryInfo.getUserId());
-		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareWeekDataDao.getUserTrainStat(queryInfo.getStartTime(), queryInfo.getOrderType(), Objects.isNull(queryInfo.getHeardLevel())?null:queryInfo.getHeardLevel().getCode());
+		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareWeekDataDao.getUserTrainStat(queryInfo.getStartTime(), queryInfo.getOrderType(), Objects.isNull(queryInfo.getHeardLevel())?null:queryInfo.getHeardLevel().getCode(),queryInfo.getTeacherId());
 		List<MusicCompareRankingDto> detail = new ArrayList<>();
 
 		List<Integer> studentIds = userTrainStat.stream().limit(10).map(MusicCompareRankingDto::getUserId).collect(Collectors.toList());

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

@@ -587,7 +587,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			return true;
 		}
 		Integer minutes = Integer.parseInt(configValue);
-		List<Mapper> list = teacherAttendanceDao.queryNoSignOutListByOverMinutes(minutes);
+		List<Mapper> list = teacherAttendanceDao.queryNoSignOutListByOverMinutes(minutes, tenantId);
 		if(CollectionUtils.isEmpty(list)){
 			return true;
 		}

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

@@ -113,11 +113,6 @@ public class TeacherCourseRewardServiceImpl extends BaseServiceImpl<Long, Teache
     }
 
     @Override
-    public List<TeacherCourseReward> findBySettlementStatus(int settlementStatus) {
-        return teacherCourseRewardDao.findBySettlementStatus(settlementStatus);
-    }
-
-    @Override
     @Transactional(rollbackFor = Exception.class)
     public void batchUpdate(List<TeacherCourseReward> teacherCourseRewards) {
         teacherCourseRewardDao.batchUpdate(teacherCourseRewards);

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

@@ -12,9 +12,10 @@ import com.ym.mec.biz.service.TeacherCourseStatisticsService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
-
 import com.ym.mec.util.date.DateUtil;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,7 @@ public class TeacherCourseStatisticsServiceImpl extends BaseServiceImpl<Long, Te
         Date nextMonthDate = new Date();
         Date startDate = DateUtil.getFirstDayOfMonth(nextMonthDate);
         Date endDate = DateUtil.getLastDayOfMonth(nextMonthDate);
-        List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate);
+        List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate, TenantContextHolder.getTenantId());
         if (teacherCourseStatisticsList.size() == 0) {
             return;
         }

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

@@ -19,6 +19,7 @@ import java.util.stream.Collectors;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.page.*;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 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.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -742,12 +744,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(String organIdList) {
-		return teacherDao.queryTeacherDefaultSalary(organIdList);
-	}
-
-	@Override
-	public List<Integer> queryAllIds() {
-		return teacherDao.queryAllIds();
+		return teacherDao.queryTeacherDefaultSalary(organIdList,TenantContextHolder.getTenantId());
 	}
 
 	@Override

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

@@ -2,20 +2,21 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TenantAssetsInfoDao;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.TenantAssetsInfo;
-import com.ym.mec.biz.dal.entity.TenantConfig;
-import com.ym.mec.biz.dal.entity.TenantConfigDetail;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.TenantConfigDetail.CloudRoomRule;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import com.ym.mec.biz.service.TenantAssetsInfoService;
+import com.ym.mec.biz.service.TenantCloudCourseRecordService;
 import com.ym.mec.biz.service.TenantConfigService;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.tenant.TenantContextHolder;
+import com.ym.mec.thirdparty.yqpay.DateUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +26,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.text.ParseException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,6 +43,12 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
 
     @Autowired
     private TenantConfigService tenantConfigService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private TenantCloudCourseRecordService tenantCloudCourseRecordService;
+    @Autowired
+    private RedissonClient redissonClient;
 
     /**
      * 排课扣费计算
@@ -53,43 +58,107 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void courseDeductionRules(List<CourseSchedule> dto) {
-        dto = Optional.ofNullable(dto)
+        Integer tenantId = TenantContextHolder.getTenantId();
+
+        //校验课程 筛选出线上课
+        dto = getOnlineCourse(dto);
+        if (CollectionUtils.isEmpty(dto)) {
+            return;
+        }
+
+        TenantAssetsInfo assetsInfo = this.getOne(new WrapperUtil<TenantAssetsInfo>()
+                .hasEq("tenant_id_", tenantId).queryWrapper());
+        if (Objects.isNull(assetsInfo)) {
+            throw new BizException("未查询到该账户资产信息!");
+        }
+
+        //获取云教室规则  String人数-BigDecimal每分钟扣费标准
+        Map<String, BigDecimal> rule = getRule(tenantId);
+        BigDecimal frozenAmount = BigDecimal.ZERO;
+
+        for (CourseSchedule course : dto) {//获取总人数 ，+1是算上老师
+            Integer totalPeople = course.getStudentNum() + 1;
+            //获取每分钟扣费标准
+            BigDecimal minutePrice = rule.get(String.valueOf(totalPeople));
+            if (Objects.isNull(minutePrice)) {
+                //实际上是没有这个扣费标准
+                throw new BizException("课程人数已达上限，请联系教务老师！");
+            }
+            //计算总上课时间
+            BigDecimal courseDate = getCourseDate(course);
+            //课程单价 = 每分钟扣费标准 * 总上课时间
+            BigDecimal coursePrice = minutePrice.multiply(courseDate, new MathContext(2, RoundingMode.HALF_UP));
+            frozenAmount = frozenAmount.add(coursePrice);
+
+            //写入流水
+            TenantCloudCourseRecord record = new TenantCloudCourseRecord();
+            record.setCourseId(course.getId().intValue());
+            record.setAmount(coursePrice);
+            record.setTenantId(tenantId);
+            record.setDeductState(0);
+            record.setCreatedBy(getUserId());
+            record.setCreatedTime(new Date());
+            tenantCloudCourseRecordService.save(record);
+        }
+
+        //直接修改余额，利用数据库的规则来防ABA的出现
+        if (baseMapper.updateAmount(frozenAmount) != 1) {
+            //可能是余额不足
+            throw new BizException("线上课预约火爆，请联系教务老师！");
+        }
+
+    }
+
+    private List<CourseSchedule> getOnlineCourse(List<CourseSchedule> dto) {
+        return Optional.ofNullable(dto)
                 .filter(CollectionUtils::isNotEmpty)
-                .orElseThrow(() -> new BizException("请传入课程表参数!"))
+                .orElseThrow(() -> new BizException("请传入课程数据!"))
                 .stream()
                 .filter(c -> c.getTeachMode().equals(TeachModeEnum.ONLINE))
                 .collect(Collectors.toList());
+    }
 
-        Integer tenantId = TenantContextHolder.getTenantId();
+    private Map<String, BigDecimal> getRule(Integer tenantId) {
+        //查询云教室扣费标准
         TenantConfig tenantConfig = tenantConfigService.getOne(new WrapperUtil<TenantConfig>()
                 .hasEq("tenant_id_", tenantId).queryWrapper());
         if (Objects.isNull(tenantConfig)) {
-            throw new BizException("未查询到机构云教室规则信息!");
+            throw new BizException("未查询到云教室规则信息!");
         }
-        //获取云教室规则
-        Map<String, BigDecimal> rule = Optional.ofNullable(tenantConfig.getConfig())
+        return Optional.ofNullable(tenantConfig.getConfig())
                 .map(c -> JSON.parseObject(c, TenantConfigDetail.class))
                 .map(TenantConfigDetail::getCloud_room_rule)
                 .map(CloudRoomRule::getCloud_room_config)
-                .orElseThrow(() -> new BizException("未查询到机构云教室规则！"));
-        BigDecimal total = BigDecimal.ZERO;
-//        dto.forEach(course -> {
-//            Integer peopleNum = course.getPeopleNum();
-//            BigDecimal minutePrice = rule.get(String.valueOf(peopleNum));
-//            BigDecimal duration = BigDecimal.valueOf(course.getCourseDuration());
-//            BigDecimal coursePrice = minutePrice.multiply(duration, new MathContext(2, RoundingMode.HALF_UP));
-//
-//        });
-
-        System.out.println(1);
+                .orElseThrow(() -> new BizException("未查询到云教室规则！"));
+    }
 
-        TenantAssetsInfo assetsInfo = this.getOne(new WrapperUtil<TenantAssetsInfo>()
-                .hasEq("tenant_id_", tenantId).queryWrapper());
-        if (Objects.isNull(assetsInfo)) {
-            throw new BizException("未查询到该机构的账户资产信息!");
+    private BigDecimal getCourseDate(CourseSchedule course) {
+        String date = DateUtils.formatDate(course.getClassDate(), DateUtils.YYYY_MM_DD_DEF);
+        Date startDT = getDateTime(date, course.getStartClassTime());
+        Date endDT = getDateTime(date, course.getEndClassTime());
+        //课程结束时间-课程开始时间
+        long durationTime = endDT.getTime() - startDT.getTime();
+        //相差多少分钟
+        int durationMinute = new Long(durationTime / 1000 / 60).intValue();
+        return BigDecimal.valueOf(durationMinute);
+    }
+
+    private Date getDateTime(String dateStr, Date time) {
+        String timeStr = DateUtils.formatDate(time, "HH:mm:ss");
+        String s = dateStr + " " + timeStr;
+        try {
+            return DateUtils.parseDate(s, DateUtils.DATE_WEB_FORMAT);
+        } catch (ParseException e) {
+            throw new BizException("课程时间格式错误!");
         }
     }
 
+    private Integer getUserId() {
+        //修改机构基础信息
+        return Optional.ofNullable(sysUserFeignService.queryUserInfo())
+                .map(SysUser::getId)
+                .orElseThrow(() -> new BizException("用户信息获取失败,请刷新页面或者重新登录!"));
+    }
 
 }
 

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

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.dao.TenantCloudCourseRecordDao;
+import com.ym.mec.biz.dal.entity.TenantCloudCourseRecord;
+import com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo;
+import com.ym.mec.biz.service.TenantCloudCourseRecordService;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 机构云教室课程扣费记录(TenantCloudCourseRecord)表服务实现类
+ *
+ * @author hgw
+ * @since 2021-12-26 21:54:10
+ */
+@Service("tenantCloudCourseRecordService")
+public class TenantCloudCourseRecordServiceImpl extends ServiceImpl<TenantCloudCourseRecordDao, TenantCloudCourseRecord> implements TenantCloudCourseRecordService {
+
+    private final static Logger logger = LoggerFactory.getLogger(TenantCloudCourseRecordServiceImpl.class);
+
+    @Override
+    public PageInfo<TenantCloudCourseRecordVo> queryPage(Map<String, Object> param) {
+        Page<TenantCloudCourseRecordVo> pageInfo = PageUtil.getPageInfo(param);
+        pageInfo.setAsc("a.created_time_");
+        return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, param));
+
+    }
+}
+

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

@@ -285,7 +285,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         String key = "Tenant_First_Open:" + tenantId;
         RBucket<Object> bucket = redissonClient.getBucket(key);
         //原子操作 抢锁成功为true
-        if (!bucket.trySet(tenantId, 1L, TimeUnit.MINUTES)) {
+        if (!bucket.trySet(tenantId, 3L, TimeUnit.SECONDS)) {
             throw new BizException("机构正在开通中请勿频繁操作");
         }
         //获取产品信息得到服务id
@@ -317,8 +317,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         assetsInfo.setFrozenAmount(BigDecimal.ZERO);
         assetsInfo.setCreatedTime(new Date());
         assetsInfoService.save(assetsInfo);
-        //修改机构userId信息
-        baseMapper.updateById(tenantInfo);
         //释放锁
         bucket.delete();
     }

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

@@ -4,10 +4,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.TenantProductInfoDao;
 import com.ym.mec.biz.dal.dto.TenantProductInfoDto;
 import com.ym.mec.biz.dal.entity.TenantProductInfo;
+import com.ym.mec.biz.service.PlatformServeDetailService;
+import com.ym.mec.biz.service.PlatformServeService;
 import com.ym.mec.biz.service.TenantProductInfoService;
+import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 /**
  * @author hgw
  * Created by 2021-12-02
@@ -15,11 +21,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class TenantProductInfoServiceImpl extends ServiceImpl<TenantProductInfoDao, TenantProductInfo> implements TenantProductInfoService {
 
+    @Autowired
+    private PlatformServeService platformServeService;
+    @Autowired
+    private PlatformServeDetailService platformServeDetailService;
+
     /**
      * 添加机构选购的产品信息
      */
     @Override
     public void addTenantProduct(TenantProductInfoDto dto) {
+        checkServe(dto.getServeId(), dto.getServeDetailId());
         TenantProductInfo info = new TenantProductInfo();
         BeanUtils.copyProperties(dto, info);
         baseMapper.insert(info);
@@ -27,10 +39,21 @@ public class TenantProductInfoServiceImpl extends ServiceImpl<TenantProductInfoD
 
     @Override
     public void updateTenantProduct(TenantProductInfoDto dto) {
+        checkServe(dto.getServeId(), dto.getServeDetailId());
         TenantProductInfo info = new TenantProductInfo();
         BeanUtils.copyProperties(dto, info);
         baseMapper.updateById(info);
     }
 
+    private void checkServe(Integer id, Integer detailId) {
+        Optional.ofNullable(id)
+                .map(platformServeService::getById)
+                .orElseThrow(() -> new BizException("未查询到该服务！"));
+
+        Optional.ofNullable(detailId)
+                .map(platformServeDetailService::getById)
+                .orElseThrow(() -> new BizException("未查询到该服务模式！"));
+    }
+
 
 }

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

@@ -15,7 +15,9 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 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;
@@ -169,7 +171,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 
     @Override
     public List<WaitCourseActivityDto> queryWaitCourseActivity(Integer teacherId,String organId) {
-		return vipGroupActivityDao.queryWaitCourseActivity(teacherId,organId);
+		return vipGroupActivityDao.queryWaitCourseActivity(teacherId,organId, TenantContextHolder.getTenantId());
     }
 
     @Override

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

@@ -6,6 +6,8 @@ import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,26 +29,28 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 
 	@Override
 	public long insert(VipGroupDefaultClassesCycle bean) {
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
-		if(vipGroupDefaultClassesCycleDao.countAll()<=0){
+		if(vipGroupDefaultClassesCycleDao.countAll(tenantId)<=0){
 			bean.setMinClassTimes(0);
 			return super.insert(bean);
 		}else{
-			VipGroupDefaultClassesCycle checkMaxClassTimes = vipGroupDefaultClassesCycleDao.checkMaxClassTimes(bean.getMaxClassTimes());
+			VipGroupDefaultClassesCycle checkMaxClassTimes = vipGroupDefaultClassesCycleDao.checkMaxClassTimes(bean.getMaxClassTimes(),tenantId);
 			if(null!=checkMaxClassTimes){
 				throw new BizException("已存在包含该课次的设置!");
 			}
-			List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle();
+			List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle(tenantId);
 			allRecord.add(bean);
 			allRecord=createMinClassTimess(allRecord);
-			vipGroupDefaultClassesCycleDao.deleteAll();
+			vipGroupDefaultClassesCycleDao.deleteAll(tenantId);
 			return vipGroupDefaultClassesCycleDao.batchInstert(allRecord);
 		}
 	}
 
 	@Override
 	public List<VipGroupDefaultClassesCycle> findAllCycle() {
-		return vipGroupDefaultClassesCycleDao.findAllCycle();
+		return vipGroupDefaultClassesCycleDao.findAllCycle(TenantContextHolder.getTenantId());
 	}
 
 	@Override
@@ -60,12 +64,12 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 	@Override
 	public int delete(Integer id) {
 		super.delete(id);
-		List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle();
+		List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle(TenantContextHolder.getTenantId());
 		allRecord=createMinClassTimess(allRecord);
 		if (allRecord == null || allRecord.size() == 0) {
 			return 1;
 		}
-		vipGroupDefaultClassesCycleDao.deleteAll();
+		vipGroupDefaultClassesCycleDao.deleteAll(TenantContextHolder.getTenantId());
 		return vipGroupDefaultClassesCycleDao.batchInstert(allRecord);
 	}
 

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

@@ -20,11 +20,13 @@ 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.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateConvertor;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.string.MessageFormatter;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -273,7 +275,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -547,7 +549,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -877,7 +879,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -1264,7 +1266,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -1598,7 +1600,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			List<VipGroupCategory> vipGroupCategories = vipGroupCategoryDao.findAllByOrgan(student.getOrganId().toString());
 			VipGroupCategory vipGroupCategory = vipGroupCategories.stream().filter(v -> v.getName().equals(vipGroupCategoryName)).findFirst().get();
 
-			List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.findByName(vipGroupActivityName);
+			List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.findByName(vipGroupActivityName, TenantContextHolder.getTenantId());
 			VipGroupActivity vipGroupActivity = null;
 			if(!CollectionUtils.isEmpty(vipGroupActivities)){
 				vipGroupActivity = vipGroupActivities.get(0);
@@ -1817,7 +1819,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}else {
 				int totalClassTimes = courseScheduleDao.countGroupAllCourses(GroupType.VIP, vipGroupId.toString());
-				VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+				VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 				if (vipGroupDefaultClassesCycle != null) {
 					Date expectEndCourseTime = DateUtil.addMonths(groupCourseStartTime, vipGroupDefaultClassesCycle.getMonth());
@@ -4552,8 +4554,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void stopVipGroupWithNoCreate() {
-		List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup();
+	public void stopVipGroupWithNoCreate(Integer tenantId) {
+		List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup(tenantId);
 		if(CollectionUtils.isEmpty(noCreateSuccessVipGroups)){
 			return;
 		}

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

@@ -17,6 +17,7 @@
 		<result column="type_" property="type" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.ImGroupMemberDto" id="ImGroupMemberDto">
@@ -46,7 +47,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImGroup">
-		SELECT * FROM im_group ORDER BY id_
+		SELECT * FROM im_group where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -56,8 +57,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO im_group (id_,name_,introduce_,member_num_,memo_,tags_,img_,type_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{introduce},#{memberNum},#{memo},#{tags},#{img},#{type},#{createTime},#{updateTime})
+		INSERT INTO im_group (id_,name_,introduce_,member_num_,memo_,tags_,img_,type_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{name},#{introduce},#{memberNum},#{memo},#{tags},#{img},#{type},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -93,7 +94,7 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
-		</set> WHERE id_ = #{id} 
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
     <update id="updateNickname">
 		UPDATE im_group_member SET nickname_ = #{nickName} WHERE user_id_ = #{userId}
@@ -115,12 +116,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ImGroup" parameterType="map">
-		SELECT * FROM im_group ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM im_group where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM im_group
+		SELECT COUNT(*) FROM im_group where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="queryByUserId" resultMap="ImGroup" parameterType="map">

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

@@ -15,6 +15,7 @@
 		<result column="role_type_" property="roleType"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -24,19 +25,19 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImGroupMember">
-		SELECT * FROM im_group_member ORDER BY id_
+		SELECT * FROM im_group_member where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_) 
-		VALUES(#{imGroupId},#{userId},#{nickname},#{isAdmin},#{roleType},NOW(),NOW())
+		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_) 
+		VALUES(#{imGroupId},#{userId},#{nickname},#{isAdmin},#{roleType},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_) VALUES
+		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_) VALUES
 		 <foreach collection="list" item="item" separator=",">
-		(#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},NOW(),NOW())
+		(#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},NOW(),NOW(),#{item.tenantId})
 		</foreach>
 	</insert>
 	
@@ -59,7 +60,7 @@
 		im_group_id_ = #{imGroupId},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id} 
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember">
@@ -83,7 +84,7 @@
 				</if>
 				update_time_ = NOW()
 			</set>
-			WHERE id_ = #{item.id}
+			WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach> 
 	</update>
 	
@@ -94,12 +95,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ImGroupMember" parameterType="map">
-		SELECT * FROM im_group_member ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM im_group_member where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM im_group_member
+		SELECT COUNT(*) FROM im_group_member  where tenant_id_ = #{tenantId}
 	</select>
 	
 	<delete id="deleteByImGroupId" >

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

@@ -17,6 +17,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="operator_id_" property="operatorId" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.ImGroupNoticeDto" id="ImGroupNoticeDto" extends="ImGroupNotice">
@@ -31,7 +32,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImGroupNotice">
-		SELECT * FROM im_group_notice ORDER BY id_
+		SELECT * FROM im_group_notice where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -41,7 +42,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO im_group_notice (id_,im_group_id_,title_,content_,is_top_,is_sent_to_new_member_,create_time_,update_time_,del_flag_,operator_id_) VALUES(#{id},#{imGroupId},#{title},#{content},#{isTop},#{isSentToNewMember},#{createTime},#{updateTime},#{delFlag},#{operatorId})
+		INSERT INTO im_group_notice (id_,im_group_id_,title_,content_,is_top_,is_sent_to_new_member_,create_time_,update_time_,del_flag_,operator_id_,tenant_id_) VALUES(#{id},#{imGroupId},#{title},#{content},#{isTop},#{isSentToNewMember},#{createTime},#{updateTime},#{delFlag},#{operatorId},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -77,7 +78,7 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
-		</set> WHERE id_ = #{id} 
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -89,7 +90,7 @@
 	<select id="queryForPage" resultMap="ImGroupNoticeDto" parameterType="map">
 		SELECT ign.*,u.real_name_,u.avatar_ FROM im_group_notice ign left join sys_user u on ign.operator_id_ = u.id_
 		<where>
-            ign.del_flag_ = 0
+            ign.del_flag_ = 0 and ign.tenant_id_ = #{tenantId}
             <if test="groupId != null">
                 AND ign.im_group_id_ = #{groupId}
             </if>
@@ -102,7 +103,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(ign.id_) FROM im_group_notice ign
 		<where>
-            ign.del_flag_ = 0
+            ign.del_flag_ = 0 and ign.tenant_id_ = #{tenantId}
             <if test="groupId != null">
                 AND ign.im_group_id_ = #{groupId}
             </if>

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

@@ -18,6 +18,7 @@
 		<result column="subject_id_" property="subjectId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.ImUserFriendDto" id="ImUserFriendDto" extends="ImUserFriend">
@@ -34,18 +35,18 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImUserFriend">
-		SELECT * FROM im_user_friend ORDER BY id_
+		SELECT * FROM im_user_friend where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImUserFriend" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_user_friend (id_,user_id_,friend_id_,friend_nickname_,memo_,tags_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{friendId},#{friendNickname},#{memo},#{tags},NOW(),NOW())
+		INSERT INTO im_user_friend (id_,user_id_,friend_id_,friend_nickname_,memo_,tags_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{userId},#{friendId},#{friendNickname},#{memo},#{tags},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="insertByBasicUser">
-		INSERT INTO im_user_friend (user_id_,friend_id_,friend_nickname_,tags_,memo_,create_time_,update_time_)
-		VALUES (#{teacherId},#{basicUserDto.userId},#{basicUserDto.name},#{basicUserDto.subjectName},#{basicUserDto.musicGroupName},NOW(),NOW())
+		INSERT INTO im_user_friend (user_id_,friend_id_,friend_nickname_,tags_,memo_,create_time_,update_time_,tenant_id_)
+		VALUES (#{teacherId},#{basicUserDto.userId},#{basicUserDto.name},#{basicUserDto.subjectName},#{basicUserDto.musicGroupName},NOW(),NOW(),#{basicUserDto.tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -67,7 +68,7 @@
 		tags_ = #{tags},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -80,12 +81,12 @@
 
     <!-- 分页查询 -->
 	<select id="queryPage" resultMap="ImUserFriend" parameterType="map">
-		SELECT * FROM im_user_friend ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM im_user_friend where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM im_user_friend
+		SELECT COUNT(*) FROM im_user_friend where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="query" resultMap="ImUserFriend" parameterType="map">

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

@@ -149,5 +149,17 @@
             a.deleted_ = 0 AND b.deleted_ = 0
           AND a.`id_` = #{serveId}
     </select>
-    
+
+    <select id="queryProductInTenant" parameterType="integer" resultType="integer">
+        SELECT
+            DISTINCT
+            tpi.tenant_id_
+        FROM
+            tenant_product_info as tpi
+                JOIN `platform_serve` AS a on tpi.serve_id_ = a.id_
+                JOIN `platform_product` AS b
+                     ON FIND_IN_SET(b.`id_`, a.`product_id_`)
+        where b.id_ = #{id}
+    </select>
+
 </mapper>

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

@@ -305,7 +305,7 @@
                 AND pg.user_id_=#{teacherId}
             </if>
             <if test="tenantId != null">
-                AND pg.tenanr_id_ = #{tenantId}
+                AND pg.tenant_id_ = #{tenantId}
             </if>
             <if test="studentId != null">
                 AND pg.student_id_ = #{studentId}
@@ -370,7 +370,7 @@
     <sql id="practiceGroupReviewsQueryCondition">
         <where>
             pg.group_status_ != 'LOCK'
-            AND pg.tenanr_id_ = #{tenantId}
+            AND pg.tenant_id_ = #{tenantId}
             <if test="month != null">
                 AND DATE_FORMAT(cse.create_time_, '%Y-%m') = #{month}
             </if>

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

@@ -27,7 +27,7 @@
             channel_,
             type_,
             status_,
-            version
+            version,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SysAccount">
         <!--@mbg.generated-->
@@ -73,6 +73,7 @@
             <if test="version != null">
                 version,
             </if>
+            tenant_id_
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="company != null">
@@ -102,6 +103,7 @@
             <if test="version != null">
                 #{version,jdbcType=INTEGER},
             </if>
+            #{tenantId}
         </trim>
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysAccount">
@@ -136,7 +138,7 @@
                 version = version+1,
             </if>
         </set>
-        where id_ = #{id,jdbcType=INTEGER} AND version =#{version}
+        where id_ = #{id,jdbcType=INTEGER} AND version =#{version} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="getAccount" resultMap="SysAccount">
@@ -167,9 +169,7 @@
 
     <select id="getPerAccount" resultMap="SysAccount">
         SELECT * FROM sys_account WHERE status_=1 AND type_='PER'
-        <if test="channel != null">
             AND channel_ = #{channel}
-        </if>
     </select>
     <select id="getAdaAccount" resultMap="SysAccount">
         SELECT * FROM sys_account WHERE routing_organ_id_ = #{organId} AND channel_=#{channel} AND status_ =1 LIMIT 1

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

@@ -18,6 +18,7 @@
 		<result column="payment_order_id_" property="paymentOrderId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<resultMap id="SysCouponCodeDto" type="com.ym.mec.biz.dal.dto.SysCouponCodeDto">
@@ -48,7 +49,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysCouponCode">
-		SELECT * FROM sys_coupon_code ORDER BY id_
+		SELECT * FROM sys_coupon_code where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -59,18 +60,18 @@
 		</selectKey>
 		-->
 		INSERT INTO sys_coupon_code (coupon_id_,code_,usage_status_,user_id_,used_time_,use_start_date_,use_deadline_date_,
-		                             payment_order_id_,create_time_,update_time_)
+		                             payment_order_id_,create_time_,update_time_,tenant_id_)
 							 VALUES(#{couponId},#{code},#{usageStatus},#{userId},#{usedTime},#{useStartDate},#{useDeadlineDate},
-									#{paymentOrderId},NOW(),NOW())
+									#{paymentOrderId},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysCouponCode" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_coupon_code (coupon_id_,code_,usage_status_,user_id_,used_time_,use_start_date_,use_deadline_date_,
-		payment_order_id_,create_time_,update_time_)
+		payment_order_id_,create_time_,update_time_,tenant_id_)
 		VALUE
 		<foreach collection="couponCodes" item="couponCode" separator=",">
 			(#{couponCode.couponId},#{couponCode.code},#{couponCode.usageStatus},#{couponCode.userId},#{couponCode.usedTime},#{couponCode.useStartDate},#{couponCode.useDeadlineDate},
-			#{couponCode.paymentOrderId},NOW(),NOW())
+			#{couponCode.paymentOrderId},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -104,7 +105,7 @@
 			</if>
 				used_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="quit">
 		UPDATE sys_coupon_code SET usage_status_ = 0,used_time_ = NULL,update_time_ = NOW() WHERE FIND_IN_SET(id_,#{couponCodeId})
@@ -124,12 +125,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysCouponCode" parameterType="map">
-		SELECT * FROM sys_coupon_code ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM sys_coupon_code where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_coupon_code
+		SELECT COUNT(*) FROM sys_coupon_code where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="countWithUserAndCoupon" resultType="int">
@@ -138,6 +139,7 @@
 
 	<sql id="querySysCouponUseListCondition">
 		<where>
+			scc.tenant_id_ = #{tenantId}
 			<if test="userId!=null">
 				AND scc.user_id_=#{userId}
 			</if>
@@ -216,6 +218,7 @@
 		SELECT COUNT(suc.coupon_id_) num_,sc.face_value_,su.username_ FROM sys_coupon_code suc
 		LEFT JOIN sys_user su ON su.id_ = suc.user_id_
 		LEFT JOIN sys_coupon sc ON sc.id_ = suc.coupon_id_
+		where suc.tenant_id_ = #{tenantId}
 		GROUP BY suc.user_id_,suc.payment_order_id_,suc.coupon_id_
 		<include refid="global.limit"/>
 	</select>
@@ -224,6 +227,7 @@
 		SELECT COUNT(suc.coupon_id_) num_,sc.face_value_,su.username_ FROM sys_coupon_code suc
 		LEFT JOIN sys_user su ON su.id_ = suc.user_id_
 		LEFT JOIN sys_coupon sc ON sc.id_ = suc.coupon_id_
+		where suc.tenant_id_ = #{tenantId}
 		GROUP BY suc.user_id_,suc.payment_order_id_,suc.coupon_id_)t
 	</select>
 	<select id="findByIdList" resultMap="SysCouponCodeDto">

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

@@ -27,6 +27,7 @@
 		<result column="warning_status_" property="warningStatus" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -36,18 +37,18 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysCoupon">
-		SELECT * FROM sys_coupon ORDER BY id_
+		SELECT * FROM sys_coupon where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysCoupon" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_coupon (id_,name_,description_,status_,type_,face_value_,full_amount_,limit_exchange_num_,effective_type_,deadline_,
 		                        effective_start_time_, effective_expire_time_,end_date_,start_date_,stock_count_,consume_num_,warning_stock_num_,
-		                        create_time_,update_time_)
+		                        create_time_,update_time_,tenant_id_)
 		                        VALUES(#{id},#{name},#{description},#{status},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{faceValue},#{fullAmount},#{limitExchangeNum},
 		                               #{effectiveType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{deadline},
 		                               #{effectiveStartTime},#{effectiveExpireTime},#{endDate},#{startDate},#{stockCount},#{consumeNum},#{warningStockNum},
-		                               NOW(), NOW())
+		                               NOW(), NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -99,7 +100,7 @@
 			</if>
 				update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -109,6 +110,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="status != null">
 				AND status_ = #{status}
 			</if>
@@ -139,7 +141,4 @@
 		SELECT * FROM sys_coupon WHERE id_ = #{id} FOR UPDATE
 	</select>
 
-	<select id="getWithName" resultMap="SysCoupon">
-		SELECT * FROM sys_coupon WHERE name_ = #{name}
-	</select>
 </mapper>

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

@@ -19,6 +19,7 @@
 		<result column="del_flag_" property="delFlag" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -28,13 +29,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysExamSong">
-		SELECT * FROM sys_exam_song ORDER BY id_
+		SELECT * FROM sys_exam_song where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysExamSong" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_exam_song (name_,type_,subject_ids_,speed_,url_,create_user_id_,update_time_,create_time_)
-		VALUES(#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectIds},#{speed},#{url},#{createUserId},NOW(),NOW())
+		INSERT INTO sys_exam_song (name_,type_,subject_ids_,speed_,url_,create_user_id_,update_time_,create_time_,tenant_id_)
+		VALUES(#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectIds},#{speed},#{url},#{createUserId},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -64,7 +65,7 @@
 		</if>
 		update_time_ = NOW()
 		</set>
-		 WHERE id_ = #{id}
+		 WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -73,7 +74,7 @@
 	</update>
 	<sql id="queryPageSql">
 		<where>
-			ses.del_flag_ = 0
+			ses.del_flag_ = 0 and ses.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>

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

@@ -18,26 +18,27 @@
 		<result column="status_" property="status" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysImComplaint">
-		SELECT * FROM sys_im_complaint
+		SELECT * FROM sys_im_complaint where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysImComplaint" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_im_complaint (type_,url_,memo_,user_id_,target_id_,operator_,operator_time_,status_,create_time_,update_time_)
-		VALUES(#{type},#{url},#{memo},#{userId},#{targetId},#{operator},#{operatorTime},#{status},NOW(),NOW())
+		INSERT INTO sys_im_complaint (type_,url_,memo_,user_id_,target_id_,operator_,operator_time_,status_,create_time_,update_time_,tenant_id_)
+		VALUES(#{type},#{url},#{memo},#{userId},#{targetId},#{operator},#{operatorTime},#{status},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysImComplaint" parameterType="map">
-		SELECT * FROM sys_im_complaint <include refid="global.limit"/>
+		SELECT * FROM sys_im_complaint where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_im_complaint
+		SELECT COUNT(*) FROM sys_im_complaint where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -22,6 +22,7 @@
         <result column="read_status_" property="readStatus"/>
         <result column="group_" property="group"/>
         <result column="jpush_type_" property="jpushType"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.SysMessageDto" id="messageDto" extends="message">
@@ -35,6 +36,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			m.tenant_id_ = #{tenantId}
 			<if test="jpushType != null and jpushType != ''">
 				and (m.jpush_type_ = #{jpushType} OR m.jpush_type_ IS NULL)
 			</if>
@@ -80,9 +82,9 @@
 
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMessage">
 		insert into sys_message (user_id_,title_, content_,type_, receiver_,
-		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,jpush_type_)
+		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,jpush_type_,tenant_id_)
 		values (#{userId}, #{title},#{content},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{jpushType})
+				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{jpushType},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysMessage">
@@ -90,7 +92,7 @@
 		title_, content_,
 		type_, status_, receiver_,
 		send_time_, error_msg_,read_status_,memo_, create_on_,
-		modify_on_,group_,jpush_type_)
+		modify_on_,group_,jpush_type_,tenant_id_)
 		values
 		<foreach collection="list" item="item" index="index"
 			separator=",">
@@ -101,7 +103,7 @@
 			#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{item.receiver,jdbcType=VARCHAR},
 			#{item.sendTime},#{item.errorMsg,jdbcType=VARCHAR},#{item.readStatus},#{item.memo},
 			#{item.createOn},
-			#{item.modifyOn},#{item.group},#{item.jpushType}
+			#{item.modifyOn},#{item.group},#{item.jpushType},#{item.tenantId}
 			)
 		</foreach>
 	</insert>
@@ -149,7 +151,7 @@
 				group_ = #{group},
 			</if>
 		</set>
-		where id_ = #{id,jdbcType=BIGINT}
+		where id_ = #{id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="updateStatus">
 		update sys_message set read_status_=#{status}

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

@@ -29,6 +29,7 @@
 		<result column="feature_" property="feature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="monday_" property="monday"/>
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -38,18 +39,18 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysMusicCompareRecord">
-		SELECT * FROM sys_music_compare_record ORDER BY id_
+		SELECT * FROM sys_music_compare_record where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicCompareRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_compare_record (id_,user_id_,sys_music_score_id_,heard_level_,behavior_id_,score_data_,score_,intonation_,cadence_,integrity_,
 		                                      record_file_path_,video_file_path_,device_type_,client_id_,play_time_,speed_,monday_,
-												source_time_,feature_,create_time_,update_time_)
+												source_time_,feature_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{userId},#{sysMusicScoreId},#{heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{behaviorId},#{scoreData},
 		       #{score},#{intonation},#{cadence},#{integrity},
 		       #{recordFilePath},#{videoFilePath},#{deviceType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{clientId},#{playTime},#{speed},#{monday},
-		       #{sourceTime},#{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, NOW(), NOW())
+		       #{sourceTime},#{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, NOW(), NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -110,7 +111,7 @@
 			heard_level_ = #{heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -120,6 +121,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			smcr.tenant_id_ = #{tenantId}
 			<if test="userId!=null">
 				AND smcr.user_id_=#{userId}
 			</if>
@@ -203,7 +205,7 @@
 
 	<sql id="queryMusicGroupStudentTrainDataConditon">
 		<where>
-			sr.music_group_status_='NORMAL' AND stu.user_id_ IS NOT NULL
+			sr.music_group_status_='NORMAL' AND stu.user_id_ IS NOT NULL and sr.tenant_id_ = #{tenantId}
 			<if test="startTime!=null and endTime!=null">
 				AND DATE_FORMAT( smcr.create_time_, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
 			</if>
@@ -257,16 +259,6 @@
 		<include refid="queryMusicGroupStudentTrainDataConditon"/>
 	</select>
 
-	<select id="queryStudentTrainData" resultType="com.ym.mec.biz.dal.dto.EduOrganStudentListDto">
-		SELECT
-			user_id_ studentId,
-			COUNT(DISTINCT behavior_id_) cloudStudyUseNum,
-			SUM(play_time_) cloudStudyUseTime
-		FROM
-			sys_music_compare_record
-		GROUP BY
-			user_id_
-	</select>
 	<resultMap id="CountStudentTrainDataDto" type="com.ym.mec.biz.dal.dto.CountStudentTrainDataDto">
 		<result property="trainNum" column="train_num_"/>
 		<result property="recordNum" column="record_num_"/>
@@ -360,12 +352,10 @@
 						LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
 				WHERE
 					su.del_flag_ = 0
-					<if test="organIds!=null and organIds.size()>0">
 						AND su.organ_id_ IN
 						<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
 							#{organId}
 						</foreach>
-					</if>
 				GROUP BY
 					user_id_
 				HAVING
@@ -387,12 +377,10 @@
 						LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
 				WHERE
 					su.del_flag_ = 0
-					<if test="organIds!=null and organIds.size()>0">
 						AND su.organ_id_ IN
 						<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
 							#{organId}
 						</foreach>
-					</if>
 				GROUP BY
 					user_id_
 				HAVING

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

@@ -15,12 +15,13 @@
 		<result column="beginner_max_score_" property="beginnerMaxScore" />
 		<result column="advanced_max_score_" property="advancedMaxScore" />
 		<result column="performer_max_score_" property="performerMaxScore" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysMusicCompareWeekData">
-		SELECT * FROM sys_music_compare_week_data
+		SELECT * FROM sys_music_compare_week_data where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,9 +34,9 @@
 		INSERT INTO sys_music_compare_week_data (user_id_,monday_,train_num_,train_days_,train_time_,
 		                                         beginner_max_score_,beginner_max_score_id_,advanced_max_score_,advanced_max_score_id_,
 		                                         performer_max_score_,performer_max_score_id_,
-		                                         create_time_,update_time_)
+		                                         create_time_,update_time_,tenant_id_)
 		VALUES(#{userId},#{monday},#{trainNum},#{trainDays},#{trainTime},#{beginnerMaxScore},#{beginnerMaxScoreId},
-		       #{advancedMaxScore},#{advancedMaxScoreId},#{performerMaxScore},#{performerMaxScoreId},NOW(),NOW())
+		       #{advancedMaxScore},#{advancedMaxScoreId},#{performerMaxScore},#{performerMaxScoreId},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicCompareWeekData">
@@ -70,17 +71,17 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-		WHERE user_id_=#{userId} AND monday_ = #{monday}
+		WHERE user_id_=#{userId} AND monday_ = #{monday} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicCompareWeekData" parameterType="map">
-		SELECT * FROM sys_music_compare_week_data <include refid="global.limit"/>
+		SELECT * FROM sys_music_compare_week_data where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_music_compare_week_data
+		SELECT COUNT(*) FROM sys_music_compare_week_data where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="getWithUserAndMonday" resultMap="SysMusicCompareWeekData">
@@ -129,7 +130,7 @@
 			</if>
 		</if>
 		WHERE smcwd.monday_ = #{monday}
-			AND stu.user_id_=smcwd.user_id_
+			AND stu.user_id_=smcwd.user_id_ and smcwd.tenant_id_ = #{tenantId}
 			<if test="orderType==1">
 				<if test="heardLevel==null">
 					AND smcwd.advanced_max_score_ > 0

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

@@ -22,11 +22,12 @@
         <result column="other_fee_" property="otherFee"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, organ_id_,account_type_,pay_type_,yq_mer_no_,hf_mer_no_,type_,route_scale_,type_route_scale_,create_time_,
-        update_time_
+        update_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SysPaymentConfig">
         <!--@mbg.generated-->
@@ -75,6 +76,7 @@
             <if test="updateTime != null">
                 update_time_,
             </if>
+            tenant_id_
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="organId != null">
@@ -107,6 +109,7 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            #{tenantId}
         </trim>
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysPaymentConfig">
@@ -139,18 +142,19 @@
             </if>
             update_time_ = now()
         </set>
-        where id_ = #{id,jdbcType=INTEGER}
+        where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysPaymentConfig">
         SELECT *
-        FROM sys_payment_config
+        FROM sys_payment_config where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
     <sql id="queryCondition">
         <where>
+        	spc.tenant_id_ = #{tenantId}
             <if test="organId!=null">
                 AND spc.organ_id_=#{organId}
             </if>

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

@@ -24,6 +24,7 @@
         <result column="trans_no_" property="transNo"/>
         <result column="id_card_no_" property="idCardNo"/>
         <result column="real_name_" property="realName"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <delete id="del">
         UPDATE sys_user_bank_card SET status_ = 0 WHERE id_ = #{id} AND user_id_ = #{userId}
@@ -36,7 +37,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserBankCard">
-		SELECT * FROM sys_user_bank_card WHERE status_ != 0 ORDER BY id_
+		SELECT * FROM sys_user_bank_card WHERE status_ != 0 and tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -48,9 +49,9 @@
         </selectKey>
         -->
         INSERT INTO sys_user_bank_card
-        (id_,user_id_,is_default_,bank_name_,bank_code_,card_no_,province_,city_,address,create_on_,modify_on_,is_quick_,mobile_phone_,trans_no_,real_name_,id_card_no_)
+        (id_,user_id_,is_default_,bank_name_,bank_code_,card_no_,province_,city_,address,create_on_,modify_on_,is_quick_,mobile_phone_,trans_no_,real_name_,id_card_no_,tenant_id_)
         VALUES(#{id},#{userId},#{isDefault},#{bankName},#{bankCode},#{cardNo},#{province},
-        #{city},#{address},now(),now(),#{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{mobilePhone},#{transNo},#{realName},#{idCardNo})
+        #{city},#{address},now(),now(),#{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{mobilePhone},#{transNo},#{realName},#{idCardNo},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -103,7 +104,7 @@
                 real_name_ = #{realName},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -127,7 +128,7 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_bank_card where status_ != 0
+		SELECT COUNT(*) FROM sys_user_bank_card where status_ != 0 and tenant_id_ = #{tenantId}
 	</select>
 
     <select id="findByUser" resultMap="SysUserBankCard">

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

@@ -29,6 +29,7 @@
         <result column="organ_name_" property="organName"/>
         <result column="platform_account_no_" property="platformAccountNo"/>
         <result column="group_id_" property="groupId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -39,7 +40,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserCashAccountDetail">
         SELECT *
-        FROM sys_user_cash_account_detail
+        FROM sys_user_cash_account_detail where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -66,6 +67,7 @@
             <if test="attribute!=null">attribute1_,</if>
             <if test="channel!=null">channel_,</if>
             <if test="platformAccountNo!=null">platform_account_no_,</if>
+            tenant_id_
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -87,6 +89,7 @@
             <if test="attribute!=null">#{attribute},</if>
             <if test="channel!=null">#{channel},</if>
             <if test="platformAccountNo!=null">#{platformAccountNo},</if>
+            #{tenantId}
         </trim>
     </insert>
 
@@ -94,7 +97,7 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_detail
         (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,
-        create_time_,update_time_,attribute1_,channel_,platform_account_no_,group_id_)
+        create_time_,update_time_,attribute1_,channel_,platform_account_no_,group_id_,tenant_id_)
         VALUE
         <foreach collection="sysUserCashAccountDetails" item="sysUserCashAccountDetail" separator=",">
             (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},
@@ -103,7 +106,7 @@
             #{sysUserCashAccountDetail.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},
             #{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute},#{sysUserCashAccountDetail.channel},
-            #{sysUserCashAccountDetail.platformAccountNo},#{sysUserCashAccountDetail.groupId})
+            #{sysUserCashAccountDetail.platformAccountNo},#{sysUserCashAccountDetail.groupId},#{sysUserCashAccountDetail.tenantId})
         </foreach>
     </insert>
 
@@ -155,7 +158,7 @@
                 platform_account_no_ = #{platformAccountNo},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -167,8 +170,9 @@
     <select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
         SELECT * FROM sys_user_cash_account_detail
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId != null">
-                user_id_ = #{userId}
+                and user_id_ = #{userId}
             </if>
             <if test="search != null and search != ''">
                 AND create_time_ LIKE CONCAT(#{search},'%')
@@ -185,8 +189,9 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(*) FROM sys_user_cash_account_detail
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId != null">
-                user_id_ = #{userId}
+                and user_id_ = #{userId}
             </if>
             <if test="search != null and search != ''">
                 AND create_time_ LIKE CONCAT(#{search},'%')
@@ -209,9 +214,7 @@
         sys_user_cash_account_detail sucad
         left join sys_user u on sucad.user_id_ = u.id_
         where sucad.status_ = 'SUCCESS' and DATE_FORMAT(sucad.create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) and u.organ_id_ not in (36,38)
-        <if test="organId != null">
             AND FIND_IN_SET(u.organ_id_,#{organId})
-        </if>
     </select>
     <select id="countByTypeAndTime" resultType="java.lang.Integer">
       SELECT COUNT(s.id_) FROM sys_user_cash_account_detail s
@@ -221,8 +224,9 @@
 
     <sql id="queryAccountDetailCondition">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId!=null">
-                user_id_=#{userId}
+                and user_id_=#{userId}
             </if>
         </where>
     </sql>
@@ -252,6 +256,7 @@
         LEFT JOIN student s ON s.user_id_ = su.id_
         LEFT JOIN `subject` sb ON FIND_IN_SET(sb.id_,s.subject_id_list_)
         <where>
+        	cad.tenant_id_ = #{queryInfo.tenantId}
             <if test="queryInfo.userId != null">
                 AND cad.user_id_ = #{queryInfo.userId}
             </if>

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

@@ -21,6 +21,7 @@
         <result column="group_id_" property="groupId"/>
         <result column="group_name_" property="groupName"/>
         <result column="pay_time_" property="payTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -31,7 +32,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserCashAccountLog">
         SELECT *
-        FROM sys_user_cash_account_log
+        FROM sys_user_cash_account_log where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -39,17 +40,17 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountLog" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_log (user_id_,organ_id_,trans_no_,return_fee_type_,group_type_,
-                                               group_id_,amount_,comment_,pay_time_,create_time_,update_time_)
+                                               group_id_,amount_,comment_,pay_time_,create_time_,update_time_,tenant_id_)
         VALUES(#{userId},#{organId},#{transNo},#{returnFeeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{groupId},#{amount},
-               #{comment},#{payTime},NOW(),NOW())
+               #{comment},#{payTime},NOW(),NOW(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountLog">
         UPDATE sys_user_cash_account_log
         SET comment_ = #{comment},trans_no_ = #{transNo},pay_time_ = #{payTime},update_time_ = NOW()
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -75,6 +76,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	cal.tenant_id_ = #{tenantId}
             <if test="createStartTime != null">
                 AND DATE_FORMAT(cal.create_time_,'%Y-%m-%d') >= #{createStartTime}
             </if>

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

@@ -16,6 +16,7 @@
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -29,15 +30,15 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserCashAccount">
-		SELECT * FROM sys_user_cash_account ORDER BY user_id_
+		SELECT * FROM sys_user_cash_account where tenant_id_ = #{tenantId} ORDER BY user_id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccount" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account
-        (user_id_,currency_,create_time_,update_time)
-        VALUES(#{userId},#{currency},now(),now())
+        (user_id_,currency_,create_time_,update_time,tenant_id_)
+        VALUES(#{userId},#{currency},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -69,7 +70,7 @@
                 currency_ = #{currency},
             </if>
         </set>
-        WHERE user_id_ = #{userId}
+        WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -79,13 +80,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysUserCashAccount" parameterType="map">
-        SELECT * FROM sys_user_cash_account ORDER BY user_id_
+        SELECT * FROM sys_user_cash_account where tenant_id_ = #{tenantId} ORDER BY user_id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_cash_account
+		SELECT COUNT(*) FROM sys_user_cash_account where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByUserIds" resultMap="SysUserCashAccount">
         SELECT * FROM sys_user_cash_account WHERE user_id_ IN
@@ -99,6 +100,7 @@
         SELECT SUM(suca.balance_) FROM sys_user_cash_account suca
         LEFT JOIN sys_user su ON su.id_ = suca.user_id_
         <where>
+        suca.tenant_id_ = #{tenantId}
         <if test="organId != null">
             FIND_IN_SET(su.organ_id_,#{organId})
         </if>

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

@@ -13,6 +13,7 @@
 		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 		<result column="version_" property="version" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -23,7 +24,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserContracts">
-		SELECT * FROM sys_user_contracts
+		SELECT * FROM sys_user_contracts where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -33,8 +34,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_user_contracts
-		(id_,user_id_,contract_no_,type_,url_,memo_,create_time_,version_)
-		VALUES(#{id},#{userId},#{contractNo},#{type},#{url},#{memo},#{createTime},#{version})
+		(id_,user_id_,contract_no_,type_,url_,memo_,create_time_,version_,tenant_id_)
+		VALUES(#{id},#{userId},#{contractNo},#{type},#{url},#{memo},#{createTime},#{version},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -63,7 +64,7 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -75,14 +76,14 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUserContracts"
 			parameterType="map">
-		SELECT * FROM sys_user_contracts ORDER BY id_
+		SELECT * FROM sys_user_contracts where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		sys_user_contracts
+		sys_user_contracts where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="getUserContractWithType" resultMap="SysUserContracts">

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

@@ -27,6 +27,7 @@
 		<result column="organ_name_" property="organName" />
 		<result column="platform_account_no_" property="platformAccountNo" />
 		<result column="group_id_" property="groupId" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -36,17 +37,17 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserCoursesAccountDetail">
-		SELECT * FROM sys_user_courses_account_detail ORDER BY id_
+		SELECT * FROM sys_user_courses_account_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCoursesAccountDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_user_courses_account_detail (id_,user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,
-		                                             description_,comment_,attribute1_,channel_,platform_account_no_,create_time_,update_time_,group_id_)
+		                                             description_,comment_,attribute1_,channel_,platform_account_no_,create_time_,update_time_,group_id_,tenant_id_)
 		VALUES(#{id},#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},
-		       #{comment},#{attribute1},#{channel},#{platformAccountNo},NOW(),NOW(),#{groupId})
+		       #{comment},#{attribute1},#{channel},#{platformAccountNo},NOW(),NOW(),#{groupId},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -94,7 +95,7 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -104,6 +105,7 @@
 
 	<sql id="queryPageCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="userId!=null">
 				user_id_=#{userId}
 			</if>
@@ -129,6 +131,7 @@
 		LEFT JOIN student s ON s.user_id_ = su.id_
 		LEFT JOIN `subject` sb ON FIND_IN_SET(sb.id_,s.subject_id_list_)
 		<where>
+			cad.tenant_id_ = #{tenantId}
 			<if test="queryInfo.userId != null">
 				AND cad.user_id_ = #{queryInfo.userId}
 			</if>

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

@@ -13,6 +13,7 @@
 		<result column="name_" property="name" />
 		<result column="card_no_" property="cardNo" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -22,7 +23,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserTsign">
-		SELECT * FROM sys_user_tsign ORDER BY user_id_
+		SELECT * FROM sys_user_tsign where tenant_id_ = #{tenantId} ORDER BY user_id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -32,7 +33,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_tsign (user_id_,account_id_,seal_data_,name_,card_no_,create_time_) VALUES(#{userId},#{accountId},#{sealData},#{name},#{cardNo},now())
+		INSERT INTO sys_user_tsign (user_id_,account_id_,seal_data_,name_,card_no_,create_time_,tenant_id_) VALUES(#{userId},#{accountId},#{sealData},#{name},#{cardNo},now(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -56,7 +57,7 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
-		</set> WHERE user_id_ = #{userId} 
+		</set> WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -66,12 +67,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUserTsign" parameterType="map">
-		SELECT * FROM sys_user_tsign ORDER BY user_id_ <include refid="global.limit"/>
+		SELECT * FROM sys_user_tsign where tenant_id_ = #{tenantId} ORDER BY user_id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_tsign
+		SELECT COUNT(*) FROM sys_user_tsign where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="queryByCardNo" resultMap="SysUserTsign">

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

@@ -37,6 +37,7 @@
         <result column="url_" property="url"/>
         <result column="sign_in_device_no_" property="signInDeviceNo"/>
         <result column="sign_out_device_no_" property="signOutDeviceNo"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
@@ -52,7 +53,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="TeacherAttendance">
-		SELECT * FROM teacher_attendance ORDER BY id_
+		SELECT * FROM teacher_attendance whre tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -61,12 +62,12 @@
         INSERT INTO teacher_attendance
         (group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,remark_,create_time_,sign_out_time_,
         sign_out_status_,current_class_times_,sign_in_longitude_latitude_,sign_out_longitude_latitude_,current_schedule_id_,sign_out_attachments_,
-        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_)
+        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_,tenant_id_)
         VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{teacherId},
         #{musicGroupId},#{classGroupId},#{courseScheduleId},#{signInTime},#{signInStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},
         now(),#{signOutTime},#{signOutStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{currentClassTimes},#{signInLongitudeLatitude},#{signOutLongitudeLatitude},#{currentScheduleId},#{signOutAttachments},#{signOutRemark},
-        #{updateAttendanceEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{signInDeviceNo},#{signOutDeviceNo})
+        #{updateAttendanceEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{signInDeviceNo},#{signOutDeviceNo},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.TeacherAttendance" useGeneratedKeys="true"
@@ -74,7 +75,7 @@
         INSERT INTO teacher_attendance
         (group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,
         remark_,create_time_,sign_out_time_,sign_out_status_,sign_in_longitude_latitude_,sign_out_longitude_latitude_,current_schedule_id_,sign_out_attachments_,
-        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_)
+        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_,tenant_id_)
         VALUE
         <foreach collection="teacherAttendances" item="teacherAttendance" separator=",">
             (#{teacherAttendance.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -86,7 +87,7 @@
             #{teacherAttendance.signInLongitudeLatitude},#{teacherAttendance.signOutLongitudeLatitude},#{teacherAttendance.currentScheduleId},
             #{teacherAttendance.signOutAttachments},#{teacherAttendance.signOutRemark},
             #{teacherAttendance.updateAttendanceEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{teacherAttendance.url},
-            #{teacherAttendance.signInDeviceNo},#{teacherAttendance.signOutDeviceNo})
+            #{teacherAttendance.signInDeviceNo},#{teacherAttendance.signOutDeviceNo},#{teacherAttendance.tenantId})
         </foreach>
     </insert>
 
@@ -182,7 +183,7 @@
                 sign_out_device_no_ = #{signOutDeviceNo},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -207,13 +208,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="TeacherAttendance" parameterType="map">
-        SELECT * FROM teacher_attendance ORDER BY id_
+        SELECT * FROM teacher_attendance where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM teacher_attendance
+		SELECT COUNT(*) FROM teacher_attendance where tenant_id_ = #{tenantId}
 	</select>
 
     <resultMap id="teacherPersonalAttendance" type="com.ym.mec.biz.dal.dto.TeacherPersonalAttendanceDto">
@@ -254,7 +255,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND cs.actual_teacher_id_ = #{teacherId}
             </if>
@@ -286,7 +287,7 @@
     </sql>
     <sql id="queryTeacherAttendancesCondition">
         <where>
-            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
@@ -466,7 +467,7 @@
         SELECT ta.teacher_id_ key_,u.real_name_ value_,cs.id_ course_schedule_id_
         FROM course_schedule cs RIGHT JOIN teacher_attendance ta on ta.course_schedule_id_ = cs.id_
         LEFT JOIN sys_user u on ta.teacher_id_ = u.id_
-        WHERE ta.sign_out_status_ IS NULL
+        WHERE ta.sign_out_status_ IS NULL and cs.tenant_id_ = #{tenantId}
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
         AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) &lt;= DATE_SUB(now(),INTERVAL #{minutes} MINUTE) AND cs.del_flag_ = 0
         AND cs.group_type_ = 'MUSIC'
@@ -572,7 +573,7 @@
     </select>
     <sql id="queryTeacherAttendanceComplaintsSql">
         <where>
-            ta.is_complaints_ = 1
+            ta.is_complaints_ = 1 and ta.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(t.organ_id_, #{organId})
             </if>

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

@@ -19,12 +19,13 @@
         <result column="confirm_status_" property="confirmStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, music_group_id_, group_type_, course_schedule_id_list_, course_group_name_,
         organ_id_, teacher_id_, expect_reward_amount_, actual_reward_amount_, memo_, create_time_,
-        update_time_,settlement_status_,settlement_date_
+        update_time_,settlement_status_,settlement_date_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="teacherCourseReward">
         select *
@@ -41,12 +42,12 @@
         insert into teacher_course_reward (music_group_id_, group_type_, course_schedule_id_list_,
                                            course_group_name_, organ_id_, teacher_id_,
                                            expect_reward_amount_, actual_reward_amount_,
-                                           memo_, create_time_, update_time_)
+                                           memo_, create_time_, update_time_,tenant_id_)
         values (#{musicGroupId,jdbcType=VARCHAR}, #{groupType,jdbcType=VARCHAR},
                 #{courseScheduleIdList,jdbcType=VARCHAR},
                 #{courseGroupName,jdbcType=VARCHAR}, #{organId,jdbcType=INTEGER}, #{teacherId,jdbcType=INTEGER},
                 #{expectRewardAmount,jdbcType=DECIMAL}, #{actualRewardAmount,jdbcType=DECIMAL},
-                #{memo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+                #{memo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.TeacherCourseReward">
         update teacher_course_reward
@@ -94,7 +95,7 @@
                 confirm_status_ = #{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </set>
-        where id_ = #{id,jdbcType=BIGINT}
+        where id_ = #{id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
     </update>
     <update id="batchUpdate">
         <foreach collection="teacherCourseRewards" item="item" index="index" open="" close="" separator=";">
@@ -119,12 +120,12 @@
                     settlement_status_ = #{item.settlementStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
                 </if>
             </set>
-            where id_ = #{item.id,jdbcType=BIGINT}
+            where id_ = #{item.id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
         </foreach>
     </update>
     <update id="updateTeacherRewardConfirmStatusWithMonth">
         UPDATE teacher_course_reward SET confirm_status_ = #{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        WHERE DATE_FORMAT( settlement_date_, '%Y-%m' ) = #{month}
+        WHERE DATE_FORMAT( settlement_date_, '%Y-%m' ) = #{month} and tenant_id_ = #{tenantId}
         <if test="teacherId!=null">
             AND teacher_id_=#{teacherId}
         </if>
@@ -135,6 +136,7 @@
 
     <sql id="queryCondition">
         <where>
+        	tcr.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND tcr.teacher_id_=#{teacherId}
             </if>
@@ -171,9 +173,6 @@
         SELECT count(*) FROM teacher_course_reward tcr
         <include refid="queryCondition"/>
     </select>
-    <select id="findBySettlementStatus" resultMap="teacherCourseReward">
-        SELECT * FROM teacher_course_reward tcr WHERE tcr.settlement_status_ = #{settlementStatus}
-    </select>
 
     <select id="teacherCourseRewardStatWithMonth" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao.CourseTeacherSalaryStatisticsDto">
         SELECT

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

@@ -22,6 +22,7 @@
         <result column="phone_" jdbcType="VARCHAR" property="phone"/>
         <result column="organ_name_" jdbcType="VARCHAR" property="organName"/>
         <result column="month_str_" jdbcType="VARCHAR" property="monthStr"/>
+        <result column="tenant_id_" property="tenantId"/>
         <association property="subjectList"
                      select="com.ym.mec.biz.dal.dao.SubjectDao.findBySubjectByIdList"
                         column="{subjectIdList = tcs.subject_id_list_}"/>
@@ -55,18 +56,18 @@
         subject_id_list_, vip_course_num_, music_course_num_, practice_course_num_,
         expect_music_course_salary_, expect_vip_course_salary_, expect_practice_course_salary_,
         expect_total_salary_, average_class_minutes_,
-        statistics_date_time_,low_salary)
+        statistics_date_time_,low_salary,tenant_id_)
         VALUES (#{id,jdbcType=BIGINT}, #{userId,jdbcType=INTEGER}, #{organId,jdbcType=INTEGER}, #{month,jdbcType=DATE},
         #{subjectIdList,jdbcType=VARCHAR}, #{vipCourseNum,jdbcType=INTEGER}, #{musicCourseNum,jdbcType=INTEGER}, #{practiceCourseNum},
         #{expectMusicCourseSalary,jdbcType=DECIMAL}, #{expectVipCourseSalary,jdbcType=DECIMAL}, #{expectPracticeCourseSalary},
-        #{expectTotalSalary,jdbcType=DECIMAL}, #{averageClassMinutes,jdbcType=INTEGER},NOW(),#{lowSalary})
+        #{expectTotalSalary,jdbcType=DECIMAL}, #{averageClassMinutes,jdbcType=INTEGER},NOW(),#{lowSalary},#{tenantId})
     </insert>
 
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO teacher_course_statistics (id_, user_id_, organ_id_, month_,
         subject_id_list_, vip_course_num_, music_course_num_, practice_course_num_,
         expect_music_course_salary_, expect_vip_course_salary_, expect_practice_course_salary_,
-        expect_total_salary_, average_class_minutes_,statistics_date_time_,low_salary)
+        expect_total_salary_, average_class_minutes_,statistics_date_time_,low_salary,tenant_id_)
         VALUE
         <foreach collection="lists" item="list" separator=",">
         (#{list.id,jdbcType=BIGINT}, #{list.userId,jdbcType=INTEGER}, #{list.organId,jdbcType=INTEGER}, #{list.month,jdbcType=DATE},
@@ -74,7 +75,7 @@
             #{list.practiceCourseNum},
         #{list.expectMusicCourseSalary,jdbcType=DECIMAL}, #{list.expectVipCourseSalary,jdbcType=DECIMAL},
             #{list.expectPracticeCourseSalary},
-        #{list.expectTotalSalary,jdbcType=DECIMAL}, #{list.averageClassMinutes,jdbcType=INTEGER},NOW(),#{list.lowSalary})
+        #{list.expectTotalSalary,jdbcType=DECIMAL}, #{list.averageClassMinutes,jdbcType=INTEGER},NOW(),#{list.lowSalary},#{list.tenantId})
         </foreach>
     </insert>
 
@@ -101,7 +102,7 @@
             GROUP BY
                 csts.user_id_
         ) ctt ON ctt.user_id_=t.id_
-        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
+        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1 and t.tenant_id_ = #{tenantId}
           AND t.demission_date_ IS NULL
           AND t.organ_id_ IS NOT NULL
         ]]>
@@ -138,7 +139,7 @@
 
     <sql id="queryParams">
         <where>
-            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL and tcs.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(tcs.organ_id_,#{organId})
             </if>

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

@@ -14,6 +14,7 @@
 		<result column="salary_rule_json_" property="salaryRuleJson" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherDefaultMusicGroupSalary">
 		SELECT * FROM
-		teacher_default_music_group_salary ORDER BY id_
+		teacher_default_music_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -33,19 +34,19 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO teacher_default_music_group_salary
 		(user_id_,course_schedule_type_,main_teacher_90min_salary_,assistant_teacher_90min_salary_,main_teacher_30min_salary_,
-		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_)
+		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_,tenant_id_)
 		VALUES(#{userId},#{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		#{mainTeacher90MinSalary},#{assistantTeacher90MinSalary},
-		#{mainTeacher30MinSalary},#{assistantTeacher30MinSalary},#{salaryRuleJson},now(),now())
+		#{mainTeacher30MinSalary},#{assistantTeacher30MinSalary},#{salaryRuleJson},now(),now(),#{tenantId})
 	</insert>
 	<insert id="batchAdd" parameterType="list">
 		INSERT INTO teacher_default_music_group_salary
 		(user_id_,course_schedule_type_,main_teacher_90min_salary_,assistant_teacher_90min_salary_,main_teacher_30min_salary_,
-		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_)
+		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="salaries" item="item" separator=",">
 			(#{item.userId},#{item.courseScheduleType.code},#{item.mainTeacher90MinSalary},
-			#{item.assistantTeacher90MinSalary},#{item.mainTeacher30MinSalary},#{item.assistantTeacher30MinSalary},#{item.salaryRuleJson},now(),now())
+			#{item.assistantTeacher90MinSalary},#{item.mainTeacher30MinSalary},#{item.assistantTeacher30MinSalary},#{item.salaryRuleJson},now(),now(),#{item.tenantId})
 		</foreach>
 	</insert>
 
@@ -79,7 +80,7 @@
 				salary_rule_json_ = #{salaryRuleJson},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -99,6 +100,7 @@
 	</select>
 	<sql id="querySalary">
 		<where>
+			tdmgs.tenant_id_ = #{tenantId}
 			<if test="teacherId != null">
 				AND tdmgs.user_id_ = #{teacherId}
 			</if>

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

@@ -12,6 +12,7 @@
 		<result column="assistant_teacher_salary_" property="assistantTeacherSalary" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -22,7 +23,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherDefaultPracticeGroupSalary">
 		SELECT * FROM
-		teacher_default_practice_group_salary ORDER BY id_
+		teacher_default_practice_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -32,15 +33,15 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_default_practice_group_salary
-		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{minutes},#{mainTeacherSalary},#{assistantTeacherSalary},#{createTime},#{updateTime})
+		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{userId},#{minutes},#{mainTeacherSalary},#{assistantTeacherSalary},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 	
     <insert id="batchInsert">
     	INSERT INTO teacher_default_practice_group_salary
-		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
+		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_,tenant_id_)
 		<foreach collection="list" item="item" separator=",">
-			VALUES(#{item.id},#{item.userId},#{item.minutes},#{item.mainTeacherSalary},#{item.assistantTeacherSalary},now(),now())
+			VALUES(#{item.id},#{item.userId},#{item.minutes},#{item.mainTeacherSalary},#{item.assistantTeacherSalary},now(),now(),#{tenantId})
 		</foreach>
     </insert>
 
@@ -71,7 +72,7 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -87,14 +88,14 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TeacherDefaultPracticeGroupSalary"
 		parameterType="map">
-		SELECT * FROM teacher_default_practice_group_salary ORDER BY id_
+		SELECT * FROM teacher_default_practice_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		teacher_default_practice_group_salary
+		teacher_default_practice_group_salary where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="queryByUserId" resultMap="TeacherDefaultPracticeGroupSalary">

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

@@ -15,6 +15,7 @@
         <result column="offline_classes_salary_" property="offlineClassesSalary"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -24,21 +25,21 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="TeacherDefaultVipGroupSalary">
-		SELECT * FROM teacher_default_vip_group_salary ORDER BY id_
+		SELECT * FROM teacher_default_vip_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <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_,offline_classes_salary_,create_time_,update_time_)
-        VALUES(#{userId},#{vipGroupCategoryId},#{offlineClassesSalary},now(),now())
+        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_,tenant_id_)
+        VALUES(#{userId},#{vipGroupCategoryId},#{offlineClassesSalary},now(),now(),#{tenantId})
     </insert>
     <insert id="batchAdd">
         INSERT INTO teacher_default_vip_group_salary
-        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_)VALUES
+        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_,tenant_id_)VALUES
         <foreach collection="vipGroupSalaries" item="item" separator=",">
-            (#{item.userId},#{item.vipGroupCategoryId},#{item.offlineClassesSalary},now(),now())
+            (#{item.userId},#{item.vipGroupCategoryId},#{item.offlineClassesSalary},now(),now(),#{item.tenantId})
         </foreach>
     </insert>
 
@@ -59,7 +60,7 @@
                 vip_group_category_id_ = #{vipGroupCategoryId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -81,8 +82,9 @@
         SELECT tdvgs.*,vgc.name_ vip_group_category_name_,vgc.music_theory_ FROM teacher_default_vip_group_salary tdvgs
         LEFT JOIN  vip_group_category vgc ON tdvgs.vip_group_category_id_ = vgc.id_
         <where>
+        	tdvgs.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
-                tdvgs.user_id_ = #{search}
+                and tdvgs.user_id_ = #{search}
             </if>
         </where>
         ORDER BY tdvgs.id_
@@ -93,8 +95,9 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(tdvgs.id_) FROM teacher_default_vip_group_salary tdvgs
         <where>
+        	tdvgs.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
-                tdvgs.user_id_ = #{search}
+                and tdvgs.user_id_ = #{search}
             </if>
         </where>
 	</select>

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

@@ -18,6 +18,7 @@
 		<result column="total_times_" property="totalTimes" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -28,7 +29,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherFreeTime">
-		SELECT * FROM teacher_free_time
+		SELECT * FROM teacher_free_time where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -38,8 +39,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_free_time
-		(id_,user_id_,monday_,tuesday_,wednesday_,thursday_,friday_,saturday_,sunday_,holiday_,total_times_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{monday},#{tuesday},#{wednesday},#{thursday},#{friday},#{saturday},#{sunday},#{holiday},#{totalTimes},NOW(),NOW())
+		(id_,user_id_,monday_,tuesday_,wednesday_,thursday_,friday_,saturday_,sunday_,holiday_,total_times_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{userId},#{monday},#{tuesday},#{wednesday},#{thursday},#{friday},#{saturday},#{sunday},#{holiday},#{totalTimes},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -48,7 +49,7 @@
 		monday_ = #{monday},thursday_ = #{thursday},holiday_ = #{holiday},update_time_ = #{updateTime},
 		saturday_ = #{saturday},wednesday_ = #{wednesday},friday_ = #{friday},tuesday_ = #{tuesday},
 		sunday_ = #{sunday},total_times_ = #{totalTimes}
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -59,14 +60,14 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TeacherFreeTime"
 		parameterType="map">
-		SELECT * FROM teacher_free_time ORDER BY id_
+		SELECT * FROM teacher_free_time  where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		teacher_free_time
+		teacher_free_time where tenant_id_ = #{tenantId}
 	</select>
 	<select id="findTeacherFreeTime" resultMap="TeacherFreeTime">
 		SELECT * FROM teacher_free_time WHERE user_id_ = #{userId} FOR UPDATE

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

@@ -19,6 +19,7 @@
 		<result column="courses_schedule_json_" property="coursesScheduleJson" />
 		<result column="wf_process_id_" property="wfProcessId" />
 		<result column="wf_order_id_" property="wfOrderId" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -30,7 +31,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherLeaveRecord">
 		SELECT * FROM
-		teacher_leave_record ORDER BY id_
+		teacher_leave_record where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -39,8 +40,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_leave_record
-		(id_,user_id_,days_,leave_category_id_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_)
-		VALUES(#{id},#{userId},#{days},#{leaveCategoryId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},NOW(),#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId})
+		(id_,user_id_,days_,leave_category_id_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_,tenant_id_)
+		VALUES(#{id},#{userId},#{days},#{leaveCategoryId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},NOW(),#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -87,7 +88,7 @@
 				leave_category_id_ = #{leaveCategoryId},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -117,6 +118,7 @@
 
 	<sql id="queryLeavePage">
 		<where>
+			tlr.tenant_id_ = #{tenantId}
 			<if test="startTime != null and startTime != ''">
 				AND tlr.create_time_ &gt;= #{startTime}
 			</if>

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

@@ -129,7 +129,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="Teacher">
         SELECT *
-        FROM teacher
+        FROM teacher where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
     
@@ -141,8 +141,8 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO teacher
-        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_,is_settlement_salary_)
-        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo},#{isSettlementSalary})
+        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_,is_settlement_salary_,tenant_id_)
+        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo},#{isSettlementSalary},#{tenantId})
     </insert>
 
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
@@ -224,7 +224,7 @@
                 is_settlement_salary_ = #{isSettlementSalary},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键查询一条记录 -->
@@ -301,7 +301,7 @@
                 is_settlement_salary_ = #{isSettlementSalary},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -367,7 +367,7 @@
                 im_token_ = #{imToken},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -391,7 +391,7 @@
 
     <sql id="queryPageMap">
         <where>
-            su.del_flag_ = 0
+            su.del_flag_ = 0 and t.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                AND (CONCAT(',',t.organ_id_,',',IFNULL(t.flow_organ_range_,''),',') REGEXP CONCAT(',(',replace(#{organId},',','|'),'),'))
             </if>
@@ -502,6 +502,7 @@
         SELECT su.id_ userId,su.real_name_ userName FROM sys_user su
         LEFT JOIN teacher t ON su.id_=t.id_
         <where>
+        	t.tenant_id_ = #{tenantId}
             <if test="userIds != null">
                 su.id_ IN
                 <foreach collection="userIds" separator="," open="(" close=")" item="item">
@@ -520,12 +521,10 @@
             su.phone_ phone
         FROM sys_user su
         <where>
-            <if test="userIds != null">
                 su.id_ IN
                 <foreach collection="userIds" separator="," open="(" close=")" item="item">
                     #{item}
                 </foreach>
-            </if>
         </where>
     </select>
 
@@ -739,6 +738,7 @@
         <include refid="queryMusicGroupTeachersSql"/>
     </select>
     <sql id="queryMusicGroupTeachersSql">
+    	t.tenant_id_ = #{tenantId}
         <if test="search != null and search != ''">
             AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') OR
             su.id_=#{search})
@@ -759,7 +759,7 @@
 
     <sql id="queryTeacherAttendanceSql">
         <where>
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() AND cgtm.teacher_role_ = 'BISHOP'
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() AND cgtm.teacher_role_ = 'BISHOP' and cs.tenant_id_ = #{tenantId}
             <if test="startTime != null and startTime != ''">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>
@@ -860,14 +860,12 @@
     <select id="findOrganTeacherBySubject" resultMap="Teacher">
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1
-        <if test="subjectId != null">
             AND FIND_IN_SET(#{subjectId},t.subject_id_)
-        </if>
     </select>
 
     <sql id="queryCloses">
         <where>
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() and cs.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND csts.user_id_ = #{teacherId}
             </if>
@@ -902,17 +900,13 @@
         select count(*) total,sum(case when job_nature_ = 'PART_TIME' then 1 else 0 end) part_time_num_,sum(case when
         job_nature_ = 'FULL_TIME' then 1 else 0 end) full_time_num_ from teacher
         where demission_date_ is null and organ_id_ not in (36,38)
-            <if test="organId != null">
                 and FIND_IN_SET(organ_id_,#{organId})
-            </if>
     </select>
     <select id="findByFlowOrganRangeTeachers" resultMap="TeacherBasicDto">
         SELECT su.id_,su.username_,su.real_name_,t.organ_id_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE su.del_flag_ = 0 AND su.lock_flag_=0
-        <if test="organId != null and organId != ''">
             AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
-        </if>
     </select>
 
     <select id="findByTeacherIds" resultMap="Teacher">
@@ -927,9 +921,7 @@
         SELECT su.id_,su.username_,su.real_name_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
-        <if test="organId != null">
             AND (FIND_IN_SET(t.organ_id_,#{organId}) OR INTE_ARRAY(t.flow_organ_range_,#{organId}))
-        </if>
         <if test="subjectIds != null">
             AND INTE_ARRAY(t.subject_id_,#{subjectIds})
         </if>
@@ -944,17 +936,6 @@
             #{item}
         </foreach>
     </select>
-    <select id="searchTeachers" resultMap="TeacherBasicDto">
-        SELECT su.id_,su.username_,su.real_name_ FROM teacher t
-        LEFT JOIN sys_user su ON t.id_ = su.id_
-        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
-        <if test="organId != null">
-            AND FIND_IN_SET(t.organ_id_,#{organId})
-        </if>
-        <if test="teacherName != null">
-            AND su.real_name_ LIKE CONCAT('%',#{teacherName},'%')
-        </if>
-    </select>
     <select id="countTeacherName" resultType="java.lang.Integer">
         SELECT COUNT(su.id_) FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
@@ -962,6 +943,7 @@
         <include refid="queryPageNameSql"/>
     </select>
     <sql id="queryPageNameSql">
+    	t.tenant_id_ = #{tenantId}
         <if test="organId != null and includeFlowOrgan==null">
             AND FIND_IN_SET(t.organ_id_,#{organId})
         </if>
@@ -1365,6 +1347,7 @@
 		LEFT JOIN teacher_default_practice_group_salary pgs ON pgs.user_id_ = t.id_
 		LEFT JOIN teacher_default_music_group_salary mgs ON mgs.user_id_ = t.id_
 		<where>
+			t.tenant_id_ = #{tenantId}
 			<if test="organIdList != null">
                 AND find_in_set(t.organ_id_,#{organIdList})
             </if>
@@ -1383,13 +1366,10 @@
         SELECT GROUP_CONCAT(real_name_) FROM sys_user su
         WHERE FIND_IN_SET(su.id_,#{teachingTeacherIds})
     </select>
-    <select id="queryAllIds" resultType="java.lang.Integer">
-        SELECT id_ FROM sys_user
-    </select>
 
     <sql id="queryTeacherMusicIdsCondition">
         <where>
-            cs.del_flag_=0 AND csts.group_type_='MUSIC' AND mg.del_flag_=0 AND mg.status_='PROGRESS'
+            cs.del_flag_=0 AND csts.group_type_='MUSIC' AND mg.del_flag_=0 AND mg.status_='PROGRESS' and csts.tenant_id_ = #{tenantId}
             <if test="teacherId!=null">
                 AND csts.user_id_=#{teacherId}
             </if>
@@ -1420,7 +1400,7 @@
 
     <sql id="queryMemberStudentDataCondition">
         <where>
-            su.del_flag_=0 AND su.lock_flag_=0
+            su.del_flag_=0 AND su.lock_flag_=0 and tea.tenant_id_ = #{tenantId}
             <if test="organId!=null and organId!=''">
                 AND tea.organ_id_ = #{organId}
             </if>

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

@@ -15,6 +15,7 @@
 		<result column="content_" property="content" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherRemind">
-		SELECT * FROM teacher_remind ORDER BY id_
+		SELECT * FROM teacher_remind where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -34,15 +35,15 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_)
-		VALUES(#{operatorId},#{operatorName},#{teacherId},#{monday},#{content},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW())
+		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_,tenant_id_)
+		VALUES(#{operatorId},#{operatorName},#{teacherId},#{monday},#{content},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.TeacherRemind" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_)
+		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_,tenant_id_)
 		VALUE
 		<foreach collection="reminds" item="remind" separator=",">
-			(#{remind.operatorId},#{remind.operatorName},#{remind.teacherId},#{remind.monday},#{remind.content},#{remind.type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW())
+			(#{remind.operatorId},#{remind.operatorName},#{remind.teacherId},#{remind.monday},#{remind.content},#{remind.type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -70,7 +71,7 @@
 		<if test="type != null">
 			type_ = #{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -80,12 +81,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TeacherRemind" parameterType="map">
-		SELECT * FROM teacher_remind ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM teacher_remind where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM teacher_remind
+		SELECT COUNT(*) FROM teacher_remind where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="findTeachersRemindWithType" resultMap="TeacherRemind">

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

@@ -17,14 +17,15 @@
 		<result column="handing_suggestion_" property="handingSuggestion" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherSalaryComplaints"
 			useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO teacher_salary_complaints
-		(teacher_id_,salary_settlement_month_,reason_,status_,operator_id_,handing_suggestion_,create_time_,update_time_)
+		(teacher_id_,salary_settlement_month_,reason_,status_,operator_id_,handing_suggestion_,create_time_,update_time_,tenant_id_)
 		VALUES(#{teacherId},#{salarySettlementMonth},#{reason},#{statusEnum, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{operatorId},#{handingSuggestion},NOW(),NOW())
+		#{operatorId},#{handingSuggestion},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -53,7 +54,7 @@
 				update_time_ = NOW()
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="repealComplaints">
 		UPDATE teacher_salary_complaints tsc SET tsc.status_ = 'WITHDRAWN'
@@ -64,7 +65,7 @@
     <update id="updateComplaintStatusTuDoneWithMonth">
 		UPDATE teacher_salary_complaints tsc SET tsc.status_ = 'DONE'
 		WHERE tsc.salary_settlement_month_ = #{month}
-		AND tsc.status_ = 'PENDING'
+		AND tsc.status_ = 'PENDING' and tsc.tenant_id_ = #{tenantId}
 	</update>
 
     <!-- 根据主键查询一条记录 -->
@@ -75,7 +76,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherSalaryComplaints">
 		SELECT * FROM
-		teacher_salary_complaints ORDER BY id_
+		teacher_salary_complaints where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 根据主键删除一条记录 -->
@@ -99,8 +100,9 @@
 
 	<sql id="queryPageSql">
 		<where>
+			tsc.tenant_id_ = #{tenantId}
 			<if test="organId != null and organId != ''">
-				FIND_IN_SET(t.organ_id_,#{organId})
+				and FIND_IN_SET(t.organ_id_,#{organId})
 			</if>
 			<if test="salarySettlementMonth != null and salarySettlementMonth != ''">
 				AND tsc.salary_settlement_month_ = #{salarySettlementMonth}

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

@@ -17,6 +17,7 @@
         <result column="memo_" property="memo"/>
         <result column="operator_id_" property="operatorId"/>
         <result column="create_time_" property="createTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -26,13 +27,13 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="TeacherSalaryModifyLog">
-		SELECT * FROM teacher_salary_modify_log ORDER BY id_
+		SELECT * FROM teacher_salary_modify_log where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO teacher_salary_modify_log (teacher_id_,course_schedule_id_,pre_expect_salary_,pre_reduce_salary_,current_expect_salary_,current_reduce_salary_,memo_,operator_id_,create_time_)
-        VALUES(#{teacherId},#{courseScheduleId},#{preExpectSalary},#{preReduceSalary},#{currentExpectSalary},#{currentReduceSalary},#{memo},#{operatorId},NOW())
+        INSERT INTO teacher_salary_modify_log (teacher_id_,course_schedule_id_,pre_expect_salary_,pre_reduce_salary_,current_expect_salary_,current_reduce_salary_,memo_,operator_id_,create_time_,tenant_id_)
+        VALUES(#{teacherId},#{courseScheduleId},#{preExpectSalary},#{preReduceSalary},#{currentExpectSalary},#{currentReduceSalary},#{memo},#{operatorId},NOW(),#{tenantId})
     </insert>
 </mapper>

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

@@ -25,4 +25,11 @@
         </foreach>
     </insert>
 
+    <update id="updateAmount" parameterType="decimal">
+        update tenant_assets_info
+        set balance_       = balance_ - #{frozenAmount},
+            frozen_amount_ = frozen_amount_ + #{frozenAmount}
+        where balance_  <![CDATA[ >= ]]> #{frozenAmount}
+    </update>
+
 </mapper>

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ym.mec.biz.dal.dao.TenantCloudCourseRecordDao">
+
+    <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.TenantCloudCourseRecord">
+        <id column="id_" jdbcType="INTEGER" property="id"/>
+        <result column="tenant_id_" jdbcType="INTEGER" property="tenantId"/>
+        <result column="course_id_" jdbcType="INTEGER" property="courseId"/>
+        <result column="deduct_state_" jdbcType="INTEGER" property="deductState"/>
+        <result column="amount_" jdbcType="VARCHAR" property="amount"/>
+        <result column="created_by_" jdbcType="INTEGER" property="createdBy"/>
+        <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
+        <result column="updated_by_" jdbcType="INTEGER" property="updatedBy"/>
+        <result column="updated_time_" jdbcType="TIMESTAMP" property="updatedTime"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id_
+        , tenant_id_, course_id_, deduct_state_, amount_, created_by_, created_time_, updated_by_, updated_time_
+    </sql>
+
+    <select id="queryPage" parameterType="map" resultType="com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo">
+        select a.id_ as id,
+        b.id_ as courseId,
+        o.name_ as organName,
+        t.name_ as tenantName,
+        b.type_ as type,
+        s.real_name_ as teacherName,
+        b.student_num_ as studentNum,
+        b.class_date_ as classDate,
+        b.start_class_time_ as startClassTime,
+        b.end_class_time_ as endClassTime,
+        b.status_ as `status`,
+        a.deduct_state_ as deductState,
+        a.amount_ as amount
+        from
+        tenant_info as t
+        join tenant_cloud_course_record as a
+        on t.id_ = a.tenant_id_
+        left join course_schedule as b
+        on a.course_id_ = b.id_
+        left join sys_user as s
+        on b.teacher_id_ = s.id_
+        left join organization as o
+        on o.id_ = b.organ_id_
+        <where>
+            <if test="param.search != null ">
+                AND (
+                b.`id_` LIKE CONCAT('%', #{param.search},'%')
+                OR b.`name_` LIKE CONCAT('%', #{param.search},'%')
+                )
+            </if>
+            <if test="param.type != null ">
+                AND b.type_ = #{param.type}
+            </if>
+            <if test="param.teacherName != null ">
+                AND s.real_name_ = #{param.teacherName}
+            </if>
+            <if test="param.teacherId!= null ">
+                AND b.teacher_id_ = #{param.teacherId}
+            </if>
+            <if test="param.status != null ">
+                AND b.status_ = #{param.status}
+            </if>
+            <if test="param.deductState != null ">
+                AND a.deduct_state_ = #{param.deductState}
+            </if>
+            <if test="param.startDate != null">
+                AND b.class_date_ <![CDATA[ >= ]]>  #{param.startDate}
+            </if>
+            <if test="param.endDate != null ">
+                AND b.`class_date_` <![CDATA[ <= ]]>  #{param.endDate}
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -54,6 +54,7 @@
 		<result property="code" column="code_"/>
 		<result property="activityChannel" column="activity_channel_"/>
 		<result property="originalPrice" column="original_price_"/>
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -63,7 +64,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupActivity">
-		SELECT * FROM vip_group_activity WHERE del_flag_=0 ORDER BY id_
+		SELECT * FROM vip_group_activity WHERE del_flag_=0 and tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -75,14 +76,14 @@
 										single_course_time_,discount_,full_minus_course_times_,give_course_type_,give_category_id_,give_course_num_
 										,member_rank_id_,member_time_,give_member_rank_id_,give_member_time_,course_type_,
 		                                activity_type_,give_sign_course_time_,is_pay_to_balance_,teach_mode_,give_teach_mode_,
-		                                period_,give_period_,status_,market_price_,give_allow_online_to_offline_,give_prize_num_,activity_channel_,original_price_)
+		                                period_,give_period_,status_,market_price_,give_allow_online_to_offline_,give_prize_num_,activity_channel_,original_price_,tenant_id_)
 		VALUES(#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},
 		       now(),now(),#{salarySettlementJson},#{delFlag},#{onlineClassJoinGradientRewards},
 		       #{offlineClassJoinGradientRewards},#{minCourseNum},#{maxCourseNum},#{studentMaxUsedTimes},#{applyToStudentType},#{allowOnlineToOffline},
 			   #{singleCourseTime},#{discount},#{fullMinusCourseTimes},#{giveCourseType},#{giveCategoryId},#{giveCourseNum}
 				  ,#{memberRankId},#{memberTime},#{giveMemberRankId},#{giveMemberTime},#{courseType},#{activityType},#{giveSingleCourseTime},
 		       #{isPayToBalance},#{teachMode},#{giveTeachMode},#{periodEnum},#{givePeriodEnum},#{status},
-		       #{marketPrice},#{giveAllowOnlineToOffline},#{givePrizeNum},#{activityChannel},#{originalPrice})
+		       #{marketPrice},#{giveAllowOnlineToOffline},#{givePrizeNum},#{activityChannel},#{originalPrice},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -103,7 +104,7 @@
 		max_course_num_=#{maxCourseNum},student_max_used_times_=#{studentMaxUsedTimes},apply_to_student_type_=#{applyToStudentType},
 		allow_online_to_offline_=#{allowOnlineToOffline},end_time_ = #{endTime},market_price_ = #{marketPrice},update_time_ = NOW(),
 		give_allow_online_to_offline_ = #{giveAllowOnlineToOffline},
-		give_prize_num_ = #{givePrizeNum},activity_channel_ = #{activityChannel},original_price_ = #{originalPrice} WHERE id_ = #{id}
+		give_prize_num_ = #{givePrizeNum},activity_channel_ = #{activityChannel},original_price_ = #{originalPrice} WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -113,7 +114,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			vga.del_flag_ = 0
+			vga.del_flag_ = 0 and vga.tenant_id_ = #{tenantId}
 			<if test="activityChannel != null">
 				AND vga.activity_channel_ = #{activityChannel}
 			</if>
@@ -264,7 +265,7 @@
 		LEFT JOIN `organization` o on find_in_set(o.`id_`,vga.`organ_id_` )
 		LEFT JOIN `vip_group_category` vgc on find_in_set(vgc.`id_`,vga.`vip_group_category_id_list_` )
 		<where>
-			vga.del_flag_=0
+			vga.del_flag_=0 and vga.tenant_id_ = #{tenantId}
 			<if test="organId != null">
 				AND INTE_ARRAY(vga.organ_id_,#{organId})
 			</if>
@@ -282,7 +283,7 @@
 	</select>
 
     <select id="findByName" resultMap="VipGroupActivity">
-		SELECT * FROM vip_group_activity vga WHERE vga.name_ = #{name}
+		SELECT * FROM vip_group_activity vga WHERE vga.name_ = #{name} and vga.tenant_id_ = #{tenantId}
 	</select>
 	<resultMap id="WaitCourseActivityDto" type="com.ym.mec.biz.dal.dto.WaitCourseActivityDto">
 		<result property="activityId" column="activity_id_"/>
@@ -292,7 +293,7 @@
 	<select id="queryWaitCourseActivity" resultMap="WaitCourseActivityDto">
 		SELECT aum.id_,aum.activity_id_,vga.name_ activity_name_,COUNT(DISTINCT aum.user_id_) student_num_ FROM activity_user_mapper aum
 		LEFT JOIN vip_group_activity vga ON aum.activity_id_ = vga.id_
-		WHERE aum.return_fee_ = 0
+		WHERE aum.return_fee_ = 0 and aum.tenant_id_ = #{tenantId}
 		<if test="teacherId != null">
 			AND aum.teacher_id_ = #{teacherId}
 		</if>
@@ -455,7 +456,7 @@
 		<result property="type" column="type_"/>
 	</resultMap>
 	<sql id="queryDoubleEleven2021OrderDetailSql">
-		WHERE spo.status_ = 'SUCCESS' AND spo.type_ = 'DOUBLE_ELEVEN2021'
+		WHERE spo.status_ = 'SUCCESS' AND spo.type_ = 'DOUBLE_ELEVEN2021' and spo.tenant_id_ = #{tenantId}
 		<if test="search != null and search != ''">
 			AND su.id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR spo.order_no_ LIKE CONCAT('%',#{search},'%')
 		</if>

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

@@ -15,6 +15,7 @@
 		<result column="music_theory_" property="musicTheory" />
 		<result column="online_classes_unit_price_" property="onlineClassesUnitPrice" />
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -26,7 +27,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupCategory">
 		SELECT vgc.* FROM vip_group_category vgc
-		WHERE vgc.del_flag_!= 1
+		WHERE vgc.del_flag_!= 1 and tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -55,8 +56,8 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupCategory"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO vip_group_category
-		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_,music_theory_)
-		VALUES(#{id},#{name},#{delFlag},#{createTime},NOW(),#{singleClassMinutes},#{studentNum},#{musicTheory})
+		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_,music_theory_,tenant_id_)
+		VALUES(#{id},#{name},#{delFlag},#{createTime},NOW(),#{singleClassMinutes},#{studentNum},#{musicTheory},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -86,7 +87,7 @@
 			</if>
 				update_time_ = NOW(),
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -98,13 +99,13 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupCategory"
 		parameterType="map">
-		SELECT * FROM vip_group_category where del_flag_ != 1 ORDER BY id_
+		SELECT * FROM vip_group_category where del_flag_ != 1 and tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_category where del_flag_ != 1
+		SELECT COUNT(*) FROM vip_group_category where del_flag_ != 1 and tenant_id_ = #{tenantId}
 	</select>
 	<select id="findConditionCategorys" resultType="com.ym.mec.biz.dal.dto.ConditionDto">
       	select id_ id,name_ `name` from vip_group_category where del_flag_ != 1

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

@@ -14,6 +14,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="organ_id_" property="organId"/>
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -23,7 +24,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupDefaultClassesCycle">
-		SELECT * FROM vip_group_default_classes_cycle ORDER BY id_
+		SELECT * FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,17 +34,17 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_)
+		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_,tenant_id_)
 		VALUE
 		<foreach collection="list" item="vipGroupDefaultClassesCycle" separator=",">
 			(#{vipGroupDefaultClassesCycle.id},#{vipGroupDefaultClassesCycle.minClassTimes},
-			#{vipGroupDefaultClassesCycle.maxClassTimes},#{vipGroupDefaultClassesCycle.month},now(),now(),#{vipGroupDefaultClassesCycle.organId})
+			#{vipGroupDefaultClassesCycle.maxClassTimes},#{vipGroupDefaultClassesCycle.month},now(),now(),#{vipGroupDefaultClassesCycle.organId},#{vipGroupDefaultClassesCycle.tenantId})
 		</foreach>
 	</insert>
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_) VALUES(#{id},#{minClassTimes},#{maxClassTimes},#{month},now(),now(),#{organId})
+		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_,tenant_id_) VALUES(#{id},#{minClassTimes},#{maxClassTimes},#{month},now(),now(),#{organId},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -67,7 +68,7 @@ month_ = #{month},
 <if test="createTime != null">
 create_time_ = #{createTime},
 </if>
-</set> WHERE id_ = #{id} 
+</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -75,54 +76,38 @@ create_time_ = #{createTime},
 		DELETE FROM vip_group_default_classes_cycle WHERE id_ = #{id} 
 	</delete>
 	<delete id="deleteAll" >
-		DELETE FROM vip_group_default_classes_cycle
+		DELETE FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupDefaultClassesCycle" parameterType="map">
-		SELECT * FROM vip_group_default_classes_cycle ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_default_classes_cycle
+		SELECT COUNT(*) FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 	</select>
 	<select id="checkMaxClassTimes" resultMap="VipGroupDefaultClassesCycle">
 		SELECT
 			*
 		FROM
 			vip_group_default_classes_cycle
-			WHERE max_class_times_=#{maxClassTimes}
+			WHERE max_class_times_=#{maxClassTimes} and tenant_id_ = #{tenantId}
 		ORDER BY max_class_times_ LIMIT 1
 	</select>
-	<select id="findByMaxClassTimes" resultMap="VipGroupDefaultClassesCycle">
-		SELECT
-		*
-		FROM
-		vip_group_default_classes_cycle
-		WHERE max_class_times_&lt;#{maxClassTimes}
-		ORDER BY max_class_times_ DESC LIMIT 1
-	</select>
-	<select id="findByMinClassTimes" resultMap="VipGroupDefaultClassesCycle">
-		SELECT
-			*
-		FROM
-			vip_group_default_classes_cycle
-			WHERE min_class_times_&gt;#{minClassTimes}
-		ORDER BY min_class_times_ LIMIT 1
-	</select>
     <select id="countAll" resultType="int">
 		SELECT
 			count(*)
 		FROM
-			vip_group_default_classes_cycle
+			vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 		LIMIT 1
     </select>
 	<select id="findAllCycle" resultMap="VipGroupDefaultClassesCycle">
 		SELECT
 			*
 		FROM
-			vip_group_default_classes_cycle
+			vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 		ORDER BY max_class_times_
 	</select>
     <select id="findByOrganAndClassTimes" resultMap="VipGroupDefaultClassesCycle">
@@ -132,6 +117,6 @@ create_time_ = #{createTime},
 			vip_group_default_classes_cycle
 		WHERE
 			#{classTimes} &gt;= min_class_times_
-			AND #{classTimes} &lt;= max_class_times_
+			AND #{classTimes} &lt;= max_class_times_ and tenant_id_ = #{tenantId}
     </select>
 </mapper>

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

@@ -14,6 +14,7 @@
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -23,18 +24,9 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupDefaultClassesUnitPrice">
-		SELECT * FROM vip_group_default_classes_unit_price_ ORDER BY id_
+		SELECT * FROM vip_group_default_classes_unit_price_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
-	<!-- 全查询 -->
-	<select id="findAllByOrgan" resultMap="VipGroupDefaultClassesUnitPrice">
-		SELECT * FROM vip_group_default_classes_unit_price_
-		<if test="organId!=null">
-			WHERE organ_id_=#{organId}
-		</if>
-		ORDER BY id_
-	</select>
-	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!--
@@ -42,7 +34,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_default_classes_unit_price_ (id_,organ_id_,vip_group_category_id_,online_classes_unit_price_,offline_classes_unit_price_,create_time_,update_time_) VALUES(#{id},#{organId},#{vipGroupCategoryId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{createTime},NOW())
+		INSERT INTO vip_group_default_classes_unit_price_ (id_,organ_id_,vip_group_category_id_,online_classes_unit_price_,offline_classes_unit_price_,create_time_,update_time_,tenant_id_) VALUES(#{id},#{organId},#{vipGroupCategoryId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{createTime},NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -69,7 +61,7 @@ vip_group_category_id_ = #{vipGroupCategoryId},
 <if test="createTime != null">
 create_time_ = #{createTime},
 </if>
-</set> WHERE id_ = #{id} 
+</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键查询一条记录 -->
@@ -106,12 +98,12 @@ create_time_ = #{createTime},
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupDefaultClassesUnitPrice" parameterType="map">
-		SELECT * FROM vip_group_default_classes_unit_price_ ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM vip_group_default_classes_unit_price_ where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_default_classes_unit_price_
+		SELECT COUNT(*) FROM vip_group_default_classes_unit_price_ where tenant_id_ = #{tenantId}
 	</select>
     <select id="getByVipGroup" resultMap="VipGroupDefaultClassesUnitPrice">
 		SELECT

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

@@ -139,7 +139,7 @@
         cs.status_ course_status_,cs.name_ class_group_name_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-        WHERE cssp.group_type_ = 'VIP'
+        WHERE cssp.group_type_ = 'VIP' and cssp.tenant_id_ = #{tenantId}
         <if test="vipGroupId != null">
             AND cssp.music_group_id_ = #{vipGroupId}
         </if>
@@ -157,7 +157,7 @@
         SELECT COUNT(cssp.id_)
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-        WHERE cssp.group_type_ = 'VIP'
+        WHERE cssp.group_type_ = 'VIP' and cssp.tenant_id_ = #{tenantId}
         <if test="vipGroupId != null">
             AND cssp.music_group_id_ = #{vipGroupId}
         </if>
@@ -172,14 +172,14 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="VipGroup">
         SELECT *
-        FROM vip_group
+        FROM vip_group where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
     <sql id="vipGroupQueryCondition">
         <where>
             1=1
-            AND vg.audit_status_='PASS' AND vg.group_status_ != 7
+            AND vg.audit_status_='PASS' AND vg.group_status_ != 7 and vg.tenant_id_ = #{tenantId}
             <if test="search!=null and search!=''">
                 AND (vg.name_ LIKE CONCAT('%',#{search},'%') OR vg.id_= #{search})
             </if>
@@ -322,7 +322,7 @@
                 educational_teacher_id_=#{educationalTeacherId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -334,14 +334,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="VipGroup" parameterType="map">
-        SELECT * FROM vip_group ORDER BY id_
+        SELECT * FROM vip_group where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM vip_group
+        FROM vip_group where tenant_id_ = #{tenantId}
     </select>
 
     <select id="getLockVipGroup" resultMap="VipGroup">
@@ -441,6 +441,7 @@
 
     <sql id="vipGroupAttendanceQueryCondition">
         <where>
+        	vg.tenant_id_ = #{tenantId}
             <if test="vipGroupId!=null">
                 and vg.id_=#{vipGroupId}
             </if>
@@ -574,7 +575,7 @@
         sys_user_cash_account suca
         LEFT JOIN sys_user su ON suca.user_id_=su.id_
         WHERE
-            1=1
+            suca.tenant_id_ = #{tenantId}
         AND su.user_type_ LIKE '%STUDENT%'
 #         suca.course_balance_ >0
         <if test="search!=null and search!=''">
@@ -596,7 +597,7 @@
         sys_user_cash_account suca
         LEFT JOIN sys_user su ON suca.user_id_=su.id_
         WHERE
-            1=1
+            suca.tenant_id_ = #{tenantId}
         AND su.user_type_ LIKE '%STUDENT%'
 #         suca.course_balance_ >0
         <if test="search!=null and search!=''">
@@ -800,7 +801,7 @@
     <select id="queryVipGroupNum" resultType="map">
         select count(*) total,sum(case when group_status_ = 2 then 1 else 0 end) applying_num_,sum(case when
         group_status_ = 4 then 1 else 0 end) finished_num_ from vip_group
-        where organ_id_ not in (36,38)
+        where organ_id_ not in (36,38) and tenant_id_ = #{tenantId}
         <if test="organId != null">
             and FIND_IN_SET(organ_id_,#{organId})
         </if>
@@ -810,7 +811,7 @@
         select count(cs.id_) from course_schedule cs left join vip_group vg on cs.music_group_id_ = vg.id_ where
         cs.type_ in ('VIP')
         and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_
-        is null) and vg.organ_id_ not in (36,38)
+        is null) and vg.organ_id_ not in (36,38) and vg.tenant_id_ = #{tenantId}
         <if test="organId != null">
             AND FIND_IN_SET(vg.organ_id_,#{organId})
         </if>
@@ -821,7 +822,10 @@
         FROM vip_group
         WHERE (payment_expire_date_ &lt; DATE_FORMAT(NOW(), '%Y-%m-%d')
             OR courses_start_date &lt; NOW())
-          AND group_status_ = 1
+          AND group_status_ = 1 
+          <if test="tenantId != null">
+          and tenant_id_ = #{tenantId}
+          </if>
     </select>
 
     <select id="countStudentPaymentNum" resultType="int">
@@ -938,7 +942,7 @@
                     student_id_list_=#{item.studentIdList},
                 </if>
             </set>
-            WHERE id_ = #{item.id}
+            WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
         </foreach>
     </update>
 
@@ -995,17 +999,6 @@
         GROUP BY cgsm.user_id_
     </select>
 
-    <select id="queryVipCourseStudentInfo" resultMap="vipCourseStudentInfoDto">
-        SELECT cssp.music_group_id_,
-               ifnull(sum(cssp.expect_price_), 0)         total_amount_,
-               ifnull(count(DISTINCT (cssp.user_id_)), 0) student_num_,
-               ifnull(count(cssp.id_), 0)                 total_times_
-        FROM course_schedule_student_payment cssp
-                 LEFT JOIN course_schedule cs on cs.id_ = cssp.course_schedule_id_
-        WHERE cs.group_type_ = 'VIP'
-        GROUP BY cssp.music_group_id_
-    </select>
-
     <select id="countUserRepeatVipGroupInCourseStartEndTime" resultType="int">
         SELECT COUNT(id_)
         FROM vip_group
@@ -1019,6 +1012,7 @@
         LEFT JOIN sys_user t on vg.user_id_ = t.id_
         LEFT JOIN sys_user et on vg.educational_teacher_id_ = et.id_
         <where>
+        	vg.tenant_id_ = #{tenantId}
             <if test="groupIds != null">
                 AND vg.id_ IN
                 <foreach collection="groupIds" item="groupId" open="(" close=")" separator=",">

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

@@ -13,6 +13,7 @@
 		<result column="online_classes_unit_price_" property="onlineClassesUnitPrice" />
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
 		<result column="payment_price_" property="paymentPrice" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -22,7 +23,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupStudentCoursePrice">
-		SELECT * FROM vip_group_student_course_price ORDER BY id_
+		SELECT * FROM vip_group_student_course_price where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -32,15 +33,15 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_)
-		VALUES(#{vipGroupId},#{studentId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{paymentPrice})
+		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_,tenant_id_)
+		VALUES(#{vipGroupId},#{studentId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{paymentPrice},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.VipGroupStudentCoursePrice" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_)
+		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_,tenant_id_)
 		VALUE
 		<foreach collection="datas" item="data" separator=",">
-			(#{data.vipGroupId},#{data.studentId},#{data.onlineClassesUnitPrice},#{data.offlineClassesUnitPrice},#{data.paymentPrice})
+			(#{data.vipGroupId},#{data.studentId},#{data.onlineClassesUnitPrice},#{data.offlineClassesUnitPrice},#{data.paymentPrice},#{data.tenantId})
 		</foreach>
 	</insert>
 
@@ -65,7 +66,7 @@
 		<if test="paymentPrice != null">
 			payment_price_ = #{paymentPrice},
 		</if>
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -75,12 +76,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupStudentCoursePrice" parameterType="map">
-		SELECT * FROM vip_group_student_course_price ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM vip_group_student_course_price where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_student_course_price
+		SELECT COUNT(*) FROM vip_group_student_course_price where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="getVipGroupStudentCoursePrice" resultMap="VipGroupStudentCoursePrice">

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

@@ -15,6 +15,7 @@
 		<result column="jpush_type_" property="jpushType" />
 		<result column="agrs_" property="agrs" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -24,13 +25,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="WaitSendMessage">
-		SELECT * FROM wait_send_message ORDER BY id_
+		SELECT * FROM wait_send_message where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.WaitSendMessage" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO wait_send_message (message_sender_,message_type_,receivers_,url_,jpush_type_,agrs_,create_time_)
-		VALUES(#{messageSender},#{messageType},#{receivers},#{url},#{jpushType},#{agrs},NOW())
+		INSERT INTO wait_send_message (message_sender_,message_type_,receivers_,url_,jpush_type_,agrs_,create_time_,tenant_id_)
+		VALUES(#{messageSender},#{messageType},#{receivers},#{url},#{jpushType},#{agrs},NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -54,7 +55,7 @@
 		<if test="agrs != null">
 		agrs_ = #{agrs},
 		</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -64,11 +65,11 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="WaitSendMessage" parameterType="map">
-		SELECT * FROM wait_send_message ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM wait_send_message where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM wait_send_message
+		SELECT COUNT(*) FROM wait_send_message where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

mec-common/common-core/src/main/java/com/ym/mec/common/entity/BaseEntity.java

@@ -1,8 +1,10 @@
 package com.ym.mec.common.entity;
 
+import com.ym.mec.common.tenant.TenantContextHolder;
+
 public class BaseEntity {
 
-	private Integer tenantId;
+	private Integer tenantId = TenantContextHolder.getTenantId();
 
 	public Integer getTenantId() {
 		return tenantId;

mec-thirdparty/pom.xml

@@ -87,6 +87,12 @@
 			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<version>1.2.0</version>
 		</dependency>
+		
+		<dependency>
+		    <groupId>org.apache.commons</groupId>
+		    <artifactId>commons-email</artifactId>
+		    <version>1.5</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

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

@@ -0,0 +1,106 @@
+package com.ym.mec.thirdparty.message.provider;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.mail.DefaultAuthenticator;
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.SimpleEmail;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.thirdparty.message.MessageSenderPlugin;
+
+//@Service
+public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
+	
+	private String hostName;
+
+	private int smtpPort;
+
+	private String userName;
+
+	private String password;
+
+	private String from;
+
+	private String fromName;
+
+	public void setHostName(String hostName) {
+		this.hostName = hostName;
+	}
+
+	public void setSmtpPort(int smtpPort) {
+		this.smtpPort = smtpPort;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public void setFrom(String from) {
+		this.from = from;
+	}
+
+	public void setFromName(String fromName) {
+		this.fromName = fromName;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		if (StringUtils.isBlank(hostName)) {
+			throw new RuntimeException("SMTP服务器没有配置");
+		}
+
+		if (smtpPort == 0) {
+			throw new RuntimeException("SMTP服务器端口没有配置");
+		}
+
+		if (StringUtils.isBlank(userName)) {
+			throw new RuntimeException("SMTP服务器认证用户名没有配置");
+		}
+
+		if (StringUtils.isBlank(password)) {
+			throw new RuntimeException("SMTP服务器认证密码没有配置");
+		}
+
+		if (StringUtils.isBlank(from)) {
+			throw new RuntimeException("发件人邮箱没有配置");
+		}
+
+		if (StringUtils.isBlank(fromName)) {
+			fromName = from;
+		}
+	}
+
+	@Override
+	public boolean send(String subject, String content, String receiver, String url, String jpushType, String sound, String channelId) throws Exception {
+		Email email = new SimpleEmail();
+		email.setHostName(hostName);
+		email.setSslSmtpPort(smtpPort + "");
+		email.setAuthenticator(new DefaultAuthenticator(userName, password));
+		// email.setSSLOnConnect(true);
+		try {
+			email.setFrom(from, fromName);
+			email.setSubject(subject);
+			email.setMsg(content);
+			email.addTo(receiver);
+			email.send();
+			return true;
+		} catch (EmailException e) {
+			throw new RuntimeException("发送邮件出现异常", e);
+		}
+	}
+
+	@Override
+	public boolean batchSend(String subject, String content, String[] receivers, String url, String jpushType, String sound, String channelId) throws Exception {
+		for (String rev : receivers) {
+			send(subject, content, rev, url, jpushType, sound, channelId);
+		}
+		return true;
+	}
+
+}

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

@@ -2672,7 +2672,7 @@ public class ExportController extends BaseController {
         List<PracticeCourseDto> practiceGroupsTeacher = new ArrayList<>();
         List<Student> studentTeachers = new ArrayList<>();
         if (vipGroupIds.size() > 0) {
-            vipGroupTeachers = vipGroupDao.getGroupTeachers(vipGroupIds);
+            vipGroupTeachers = vipGroupDao.getGroupTeachers(vipGroupIds, TenantContextHolder.getTenantId());
         }
 
         if (practiceGroupIds.size() > 0) {

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

@@ -86,6 +86,8 @@ public class IndexController extends BaseController {
 		}else if(StringUtils.isEmpty(organId)){
 			return failed(HttpStatus.INTERNAL_SERVER_ERROR, "分部信息错误");
 		}
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
 		Map<String, Integer> musicDatas = musicGroupDao.queryOrganMusicGroupNum(organId, TenantContextHolder.getTenantId());
 		
@@ -93,13 +95,13 @@ public class IndexController extends BaseController {
 		
 		Map<String, Integer> studentDatas = studentRegistrationDao.queryStudentNum(organId);
 		
-		Map<String, Integer> vipDatas = vipGroupDao.queryVipGroupNum(organId);
+		Map<String, Integer> vipDatas = vipGroupDao.queryVipGroupNum(organId, tenantId);
 
 		Map<String, Integer> demoDatas = demoGroupDao.queryDemoGroupNum(organId);
 		
-		Integer musicGroupNum = musicGroupDao.queryCurrentMonthCoursesNum(organId, TenantContextHolder.getTenantId());
+		Integer musicGroupNum = musicGroupDao.queryCurrentMonthCoursesNum(organId, tenantId);
 		
-		Integer vipGroupNum = vipGroupDao.queryCurrentMonthCoursesNum(organId);
+		Integer vipGroupNum = vipGroupDao.queryCurrentMonthCoursesNum(organId, tenantId);
 		
 		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId);
 		

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

@@ -67,10 +67,6 @@ public class SysCouponController extends BaseController {
 			default:
 				return failed("请指定有效期类型");
 		}
-		SysCoupon sysCouponDaoWithName = sysCouponDao.getWithName(sysCoupon.getName());
-		if(Objects.nonNull(sysCouponDaoWithName)){
-			return failed("优惠券名称重复");
-		}
 		return succeed(sysCouponService.insert(sysCoupon));
 	}
 

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

@@ -233,7 +233,7 @@ public class TaskController extends BaseController {
 	@GetMapping("/stopVipGroupWithNoCreate")
 	// 取消达到报名时间未达到报名人数的vip课
 	public void stopVipGroupWithNoCreate() {
-		vipGroupService.stopVipGroupWithNoCreate();
+		vipGroupService.stopVipGroupWithNoCreate(null);
 	}
 
 	@GetMapping("/pushNoSignOutMessage")

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

@@ -0,0 +1,54 @@
+package com.ym.mec.web.controller;
+
+
+import com.ym.mec.biz.service.TenantCloudCourseRecordService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 机构云教室课程扣费记录(TenantCloudCourseRecord)表控制层
+ *
+ * @author hgw
+ * @since 2021-12-26 21:53:20
+ */
+@RestController
+@RequestMapping("/tenantCloudCourseRecord")
+public class TenantCloudCourseRecordController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private TenantCloudCourseRecordService tenantCloudCourseRecordService;
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "search", dataType = "String", value = "关键字"),
+            @ApiImplicitParam(name = "type", dataType = "String", value = "课程类型"),
+            @ApiImplicitParam(name = "teacherName", dataType = "String", value = "上课教师名称"),
+            @ApiImplicitParam(name = "teacherId", dataType = "Integer", value = "上课教师id"),
+            @ApiImplicitParam(name = "status", dataType = "String", value = "课程状态"),
+            @ApiImplicitParam(name = "deductState", dataType = "Integer", value = "扣费状态 0冻结 1扣费 2取消冻结"),
+            @ApiImplicitParam(name = "startDate", dataType = "String", value = "课程开始日期-年月日"),
+            @ApiImplicitParam(name = "endDate", dataType = "String", value = "课程结束日期-年月日"),
+            @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
+            @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+    })
+    @ApiOperation("分页查询")
+    @PostMapping(value = "/queryPage")
+//    @PreAuthorize("@pcs.hasPermissions('tenantCloudCourseRecord/queryPage')")
+    public Object queryPage(@RequestBody Map<String, Object> param) {
+        return succeed(tenantCloudCourseRecordService.queryPage(param));
+    }
+
+}
+

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

@@ -18,10 +18,13 @@ import com.ym.mec.biz.service.*;
 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.ym.mec.util.date.DateUtil;
 import com.yonge.log.model.AuditLogAnnotation;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -427,7 +430,7 @@ public class VipGroupManageController extends BaseController {
     @ApiOperation(value = "取消达到报名时间未达到报名人数的vip课")
     @PostMapping(value = "/stopVipGroupWithNoCreate")
     public Object stopVipGroupWithNoCreate(){
-        vipGroupService.stopVipGroupWithNoCreate();
+        vipGroupService.stopVipGroupWithNoCreate(TenantContextHolder.getTenantId());
         return succeed();
     }