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

.gitignore

@@ -11,4 +11,4 @@ bin
 .idea
 *.iml
 /lib/
-/mec-web/src/main/resources/rebel.xml
+rebel.xml

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/dto/MenuQueryInfo.java

@@ -2,7 +2,9 @@ package com.ym.mec.auth.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class MenuQueryInfo{
+import com.ym.mec.common.page.QueryInfo;
+
+public class MenuQueryInfo extends QueryInfo{
     @ApiModelProperty(value = "父节点编号，默认0",required = false)
     private Integer parentId = 0;
 

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

@@ -91,13 +91,17 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
 
     List<CloudTeacherStudent> queryInactive(Map<String, Object> params);
 
-    int updateOrderStatusOK(@Param("orderId") Integer orderId);
+    int updateOrderStatusOK(@Param("platformOrderId") Integer platformOrderId);
 
     int updateOrderId(@Param("cloudTeacherOrderId")Integer cloudTeacherOrderId,
                       @Param("amount") BigDecimal amount,
-                      @Param("orderId")Integer orderId);
+                      @Param("platformOrderId")Integer platformOrderId);
 
     int findRecordCount(Map<String, Object> params);
 
     List<CloudTeacherStudent> queryRecord(Map<String, Object> params);
+
+    List<CloudTeacherOrder> findByPlatformOrderId(Integer id);
+
+    int checkOrdered(@Param("cloudTeacherStudentIds")String join);
 }

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

@@ -14,7 +14,7 @@ public interface MemberPrivilegesItemDao extends BaseDAO<Integer, MemberPrivileg
      * @param parentId
      * @return
      */
-    List<MemberPrivilegesItem> findList(@Param("parentId") Integer parentId,@Param("tenantId") Integer tenantId);
+    List<MemberPrivilegesItem> findList(@Param("parentId") Integer parentId);
 
     void batchDel(@Param("collect") List<Integer> collect);
     

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

@@ -118,21 +118,12 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     List<MusicGroup> queryListByIds(@Param("musicGroupIds") String musicGroupIds);
 
     /**
-     * @param musicGroupIds: 乐团编号列表
-     * @return java.util.List<java.util.Map < java.lang.String, java.lang.String>>
-     * @describe 根据乐团获取对应的结算方式
-     * @author Joburgess
-     * @date 2019/11/3
-     */
-    List<Map<String, String>> findSettlementTypeByMusicGroups(@Param("musicGroupIds") List<String> musicGroupIds);
-
-    /**
      * 查询首页的乐团数量
      *
      * @param ogranId
      * @return
      */
-    Map<String, Integer> queryOrganMusicGroupNum(@Param("organId") String ogranId);
+    Map<String, Integer> queryOrganMusicGroupNum(@Param("organId") String ogranId, @Param("tenantId") Integer tenantId);
 
     /**
      * 查询本月乐团课程数
@@ -140,7 +131,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param organId
      * @return
      */
-    Integer queryCurrentMonthCoursesNum(@Param("organId") String organId);
+    Integer queryCurrentMonthCoursesNum(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取乐团下的教师map
@@ -250,7 +241,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      */
     List<Map<Integer, String>> queryUserMusicStatus(@Param("userIds") Set<Integer> userIds);
 
-    List<MusicGroupRegisterDto> getMusicGroupRegister(@Param("musicGroupStatusList") List<MusicGroupStatusEnum> musicGroupStatusList, @Param("organIds") String organIds);
+    List<MusicGroupRegisterDto> getMusicGroupRegister(@Param("musicGroupStatusList") List<MusicGroupStatusEnum> musicGroupStatusList, @Param("organIds") String organIds, @Param("tenantId") Integer tenantId);
 
     List<RegisterSubjectDto> getRegisterSubjectNum(@Param("musicGroupIds") List<String> musicGroupIds,
                                                    @Param("studentMusicGroupStatus") StudentMusicGroupStatusEnum studentMusicGroupStatus,
@@ -288,7 +279,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @date 2020/9/7
      * @time 14:31
      */
-    List<MusicCardDto> queryOrganMusicInfos(@Param("organId") Integer organId);
+    List<MusicCardDto> queryOrganMusicInfos(@Param("organId") Integer organId, @Param("tenantId") Integer tenantId);
 
     /**
      * @param userId:
@@ -340,7 +331,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param organIds
      * @return
      */
-    List<String> queryIdsByEduIdAndOrganIds(@Param("educationId") Integer educationId, @Param("organIds") String organIds);
+    List<String> queryIdsByEduIdAndOrganIds(@Param("educationId") Integer educationId, @Param("organIds") String organIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取乐团的教学点
@@ -382,7 +373,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      */
     List<MusicGroup> getMusicGroupByIds(@Param("ids") List<String> ids);
 
-    List<String> getNoClassStudentMusicGroupIds(@Param("organIds") List<Integer> organIds);
+    List<String> getNoClassStudentMusicGroupIds(@Param("organIds") List<Integer> organIds, @Param("tenantId") Integer tenantId);
 
     CooperationOrgan findCooperationOrganEduTeacher(@Param("id") Integer id);
 
@@ -443,7 +434,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @param cooperationOrganIds
      * @return
      */
-    List<MusicGroupRegAndMoneyDto> getMusicGroupByStatus(@Param("organId") String organId, @Param("cooperationOrganIds") List<Integer> cooperationOrganIds, @Param("musicGroupName") String musicGroupName);
+    List<MusicGroupRegAndMoneyDto> getMusicGroupByStatus(@Param("organId") String organId, @Param("cooperationOrganIds") List<Integer> cooperationOrganIds, @Param("musicGroupName") String musicGroupName, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取乐团已经过期或者即将过期的学员列表

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

@@ -7,6 +7,7 @@ import java.util.Set;
 
 import com.ym.mec.biz.dal.dto.MusicArrearageStudentDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
@@ -264,7 +265,7 @@ public interface MusicGroupPaymentCalenderDetailDao extends BaseDAO<Long, MusicG
 	 * @param organIds:
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.MusicGroup>
 	 */
-	List<MusicGroup> getNoPaymentStudentMusicGroups(@Param("organIds") Set<Integer> organIds);
+	List<MusicGroup> getNoPaymentStudentMusicGroups(@Param("organIds") Set<Integer> organIds, @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 获取可以缴费，并且未缴费，不是0元的学员

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

@@ -39,5 +39,5 @@ public interface MusicGroupSchoolTermCourseDetailDao extends BaseDAO<Integer, Mu
      * @param remindCourseTime
      * @return
      */
-    List<String> queryPushCourseTermMusicIds(String remindCourseTime);
+    List<String> queryPushCourseTermMusicIds(@Param("remindCourseTime") String remindCourseTime, @Param("tenantId") Integer tenantId);
 }

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

@@ -57,13 +57,6 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	int updateNextPaymentDate(@Param("musicGroupId") String musicGroupId, @Param("nextPaymentDate") Date nextPaymentDate);
 
 	/**
-	 * 根据可提前缴费的天数查询即将续费的列表
-	 * @param days 可提前缴费天数
-	 * @return
-	 */
-	List<MusicGroupStudentFee> queryWillRenewList(int days);
-
-	/**
 	 * 批量更新对象
 	 * @param updateList
 	 * @return

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

@@ -18,7 +18,7 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 
     List<Organization> findOrgans(@Param("organIds") List<Integer> organIds);
 
-    List<Organization> getOrgans(@Param("organIds") List<Integer> organIds);
+    List<Organization> getOrgans(@Param("organIds") List<Integer> organIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 根据分部id字符串查询
@@ -55,8 +55,6 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
      */
 	String getOrganName(String organId);
 	
-	List<Organization> findAllOrgans();
-
-	List<Organization> getActivityOrgans();
+	List<Organization> findAllOrgans(Integer tenantId);
 
 }

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

@@ -248,7 +248,7 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @param organIds
      * @return
      */
-    List<CourseGroupExportDto> getPracticeGroupExport(@Param("organIds") String organIds);
+    List<CourseGroupExportDto> getPracticeGroupExport(@Param("organIds") String organIds,@Param("tenantId") Integer tenantId);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>

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

@@ -20,5 +20,5 @@ public interface QuestionnaireQuestionDao extends BaseDAO<Long, QuestionnaireQue
      * @param activeType
      * @return
      */
-    List<QuestionnaireQuestion> findByActiveType(String activeType);
+    List<QuestionnaireQuestion> findByActiveType(@Param("activeType") String activeType, @Param("tenantId") Integer tenantId);
 }

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

@@ -12,7 +12,7 @@ public interface ReplacementInstrumentCooperationDao extends com.ym.mec.common.d
      * 统计个合作单位的转化率
      * @return
      */
-    List<ReplacementInstrumentCooperation> countAllReplacementsInfo();
+    List<ReplacementInstrumentCooperation> countAllReplacementsInfo(Integer tenantId);
 
     ReplacementInstrumentCooperation findByCooperationOrganIdAndTopicId(@Param("cooperationOrganId") Integer cooperationOrganId, @Param("topicId") Integer topicId);
 }

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

@@ -8,5 +8,5 @@ import java.util.List;
 public interface ResourceRespositoryDao extends com.ym.mec.common.dal.BaseDAO<Integer, ResourceRespository> {
 
 
-    List<ResourceRespository> findList(@Param("parentId") Integer parentId, @Param("delFlag") String delFlag, @Param("subjectId") Integer subjectId);
+    List<ResourceRespository> findList(@Param("parentId") Integer parentId, @Param("delFlag") String delFlag, @Param("subjectId") Integer subjectId, @Param("tenantId") Integer tenantId);
 }

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

@@ -34,7 +34,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getMusicGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getMusicGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(VIP 网管课订单)
@@ -43,7 +43,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getMusicVipPracticeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getMusicVipPracticeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(外部订单)
@@ -52,7 +52,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getOutOrderMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getOutOrderMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(充值)
@@ -61,7 +61,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getRechargeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRechargeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(零星支付)
@@ -70,7 +70,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getSporadicMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getSporadicMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 维修单
@@ -79,7 +79,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getRepairGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRepairGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 维修单,总收入
@@ -88,7 +88,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getRepairGoodsSellGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRepairGoodsSellGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
 
     /**
@@ -98,7 +98,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
 
     /**
@@ -116,7 +116,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getMusicGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getMusicGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 外部订单总收入
@@ -125,7 +125,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getOutOrderIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getOutOrderIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取订单的销售成本
@@ -142,21 +142,21 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getSubjectChangeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getSubjectChangeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取声部更换的总收入
      *
      * @return
      */
-    List<OperatingReport> getSubjectChangeGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getSubjectChangeGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 统计退货的商品费用
      *
      * @return
      */
-    List<OperatingReport> getRefundIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRefundIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
 
     /**
@@ -174,7 +174,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @author Joburgess
      * @date 2020.10.13
      */
-    List<Integer> getNoneBatchNoSellOrderIds();
+    List<Integer> getNoneBatchNoSellOrderIds(Integer tenantId);
 
 
     /**

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

@@ -31,12 +31,12 @@ public interface SporadicChargeInfoDao extends BaseDAO<Integer, SporadicChargeIn
      * @param type
      * @return
      */
-    List<Organization> getActiveOrgans(@Param("type") Integer type);
+    List<Organization> getActiveOrgans(@Param("type") Integer type,@Param("tenantId") Integer tenantId);
 
     /**
      * 获取活动分部的最大缴费金额
      * @param type
      * @return
      */
-    List<OrganMaxAmountDto> getActiveOrgansMaxAmount(@Param("type") Integer type);
+    List<OrganMaxAmountDto> getActiveOrgansMaxAmount(@Param("type") Integer type,@Param("tenantId") Integer tenantId);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.StudentCompetition;
 import com.ym.mec.common.dal.BaseDAO;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -29,7 +30,7 @@ public interface StudentCompetitionDao extends BaseDAO<Long, StudentCompetition>
      * @date 2020.11.10
      * @return java.util.List<com.ym.mec.biz.dal.dto.StudentCompetitionRankingDto>
      */
-    List<StudentCompetition> getWinnerList();
+    List<StudentCompetition> getWinnerList(Integer tenantId);
 
     /**
      * @describe 获取指定奖项级别的作品编号列表
@@ -38,6 +39,6 @@ public interface StudentCompetitionDao extends BaseDAO<Long, StudentCompetition>
      * @param prizeLevel:
      * @return java.util.Set<java.lang.Long>
      */
-    Set<Long> getCompetitionsWithPrizeLevel(@Param("prizeLevel") Integer prizeLevel);
+    Set<Long> getCompetitionsWithPrizeLevel(@Param("prizeLevel") Integer prizeLevel, @Param("tenantId") Integer tenantId);
 
 }

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

@@ -89,7 +89,7 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @date 2020.04.29
      */
 
-    List<Student> getServiceStudents();
+    List<Student> getServiceStudents(Integer tenantId);
 
     /**
      * @return java.util.List<java.lang.Integer>
@@ -97,9 +97,9 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @author Joburgess
      * @date 2020.06.04
      */
-    List<Integer> getServeStudentIds();
+    List<Integer> getServeStudentIds(Integer tenantId);
 
-    List<StudentServeCourseDto> getServeStudentCourseStartTimes(@Param("monday") String monday);
+    List<StudentServeCourseDto> getServeStudentCourseStartTimes(@Param("monday") String monday, @Param("tenantId") Integer tenantId);
 
     List<StudentServeCourseDto> getStudentFutureCourseInfo(@Param("monday") String monday,
                                                            @Param("nextMonday") String nextMonday,
@@ -107,16 +107,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     List<StudentServeCourseDto> getNoCourseBeServeStudentInfo(@Param("noCourseStudentIds") List<Integer> noCourseStudentIds);
 
-    /**
-     * @param monday:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.StudentServeDto>
-     * @describe 查询被服务学员信息
-     * @author Joburgess
-     * @date 2020.05.27
-     */
-    List<StudentServeDto> getBeServiceStudents(@Param("monday") String monday,
-                                               @Param("courseExpireDate") Date courseExpireDate);
-
 
     List<StudentServeDto> getBeServiceStudentsInfoWithStudents(@Param("monday") String monday,
                                                                @Param("courseExpireDate") Date courseExpireDate,
@@ -234,7 +224,7 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @param pushMemberRenew
      * @return
      */
-    List<Integer> queryPushMemberRenew(String pushMemberRenew);
+    List<Integer> queryPushMemberRenew(@Param("pushMemberRenew") String pushMemberRenew,@Param("tenantId") Integer tenantId);
 
     /**
      * 清空学员会员
@@ -350,7 +340,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      */
     int getOrganEVipStudentNum(@Param("organId") Integer organId);
     int getOrgansTotalEVipStudentNum(@Param("organIds") List<Integer> organIds);
-    List<Map<Integer, Integer>> getOrgansEVipStudentNum(@Param("organIds") List<Integer> organIds);
 
     List<Map<Integer, Integer>> getTeacherExperienceMemberStudentNum(@Param("teacherIds") List<Integer> teacherIds,
                                                                      @Param("organId") Integer organId);
@@ -420,4 +409,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
     List<Student> queryStudent(Map<String, Object> params);
 
     List<Map<Integer, String>> getStudentTeacherMap(List<Integer> studentIds);
+
+    int updateMembershipEndTime(@Param("studentId")Integer studentId, @Param("endTime")Date endTime);
 }

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

@@ -83,7 +83,7 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
      * @param sunday:
      * @return int
      */
-    int findLastWeekTodayUpdateNum(@Param("sunday") String sunday);
+    int findLastWeekTodayUpdateNum(@Param("sunday") String sunday,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 获取学生指定星期的课外训练统计记录
@@ -112,7 +112,7 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
      * @param monday:
      * @return int
      */
-    int countWeekServiceNum(@Param("monday") String monday);
+    int countWeekServiceNum(@Param("monday") String monday, @Param("tenantId") Integer tenantId);
 
     /**
      * @describe 获取指定周指定学员的服务指标

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

@@ -57,7 +57,7 @@ public interface StudentGoodsSellDao extends BaseDAO<Integer, StudentGoodsSell>
      * @param autoAffirmReceiveTime:
      * @return java.util.List<java.lang.String>
      */
-    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime);
+    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime, @Param("tenantid") Integer tenantid);
 
     /**
      * @describe 自动确认收货

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

@@ -68,7 +68,7 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
      * @param organId
      * @return
      */
-    List<StudentInstrumentExportDto> getInstruments(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("organId") String organId);
+    List<StudentInstrumentExportDto> getInstruments(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取学生的乐团信息

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

@@ -120,13 +120,6 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
                                                 @Param("status") DealStatusEnum status);
 
     /**
-     * 查找支付成功和支付中订单
-     *
-     * @return
-     */
-    int findPayOrderNum();
-
-    /**
      * 获取学员报名时所购买的商品
      *
      * @param musicGroupId
@@ -210,8 +203,6 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     List<Map<Long, BigDecimal>> queryExpectAmount(@Param("paymentOrderNo") List<Long> paymentOrderNo);
 
 
-    List<StudentPaymentOrder> findFixOrder();
-
     /**
      * 订单导出
      *
@@ -236,7 +227,7 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      */
     int countSporadicPage(Map<String, Object> params);
 
-    List<OrderStatisDto> getLuckStatis();
+    List<OrderStatisDto> getLuckStatis(Integer tenantId);
 
     /**
      * 统计收入信息

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

@@ -385,7 +385,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      *
      * @return
      */
-    List<OrderStatisDto> getOrganNormalStudent();
+    List<OrderStatisDto> getOrganNormalStudent(Integer tenantId);
 
     /**
      * @param userIds:
@@ -671,7 +671,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param pushMemberRenew
      * @return
      */
-    List<Map<String,String>> queryAutoCreateStudentMap(@Param("pushMemberRenew") String pushMemberRenew);
+    List<Map<String,String>> queryAutoCreateStudentMap(@Param("pushMemberRenew") String pushMemberRenew, @Param("tenantId") Integer tenantId);
 
     /**
      * @describe 查询学员乐团名称字典
@@ -690,19 +690,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * 获取进行中在读的学员列表
      * @return
      */
-    List<Integer> findStudentIds();
-
-    /**
-     * 获取有会员团的学员
-     * @return
-     */
-    List<Integer> queryHasMemberGroupStudent();
-
-    /**
-     * 获取云教练活动分部目标
-     * @return
-     */
-    List<CloudTeacherActiveTargetJsonDto> queryOrganTarget();
+    List<Integer> findStudentIds(Integer tenantId);
 
     /**
     * @description: 获取乐团在读学员乐保信息

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

@@ -15,7 +15,7 @@ public interface SubjectGoodsMapperDao extends BaseDAO<Long, SubjectGoodsMapper>
      * @param goodsCategoryId
      * @param subjectIds
      */
-    void batchAdd(@Param("goodsCategoryId") Integer goodsCategoryId, @Param("subjectIds") List<Integer> subjectIds);
+    void batchAdd(@Param("goodsCategoryId") Integer goodsCategoryId, @Param("subjectIds") List<Integer> subjectIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 删除科目与商品类型关联

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

@@ -81,6 +81,12 @@ public class CloudTeacherOrder extends BaseEntity {
     private Long orderId;
 
     /**
+     * 平台订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long platformOrderId;
+
+    /**
      * 备注
      */
     @ApiModelProperty(value = "备注")
@@ -248,6 +254,7 @@ public class CloudTeacherOrder extends BaseEntity {
         sb.append(", refundAmount=").append(refundAmount);
         sb.append(", status=").append(status);
         sb.append(", orderId=").append(orderId);
+        sb.append(", platformOrderId=").append(platformOrderId);
         sb.append(", remark=").append(remark);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
@@ -278,4 +285,20 @@ public class CloudTeacherOrder extends BaseEntity {
 	public void setStudentPaymentOrder(StudentPaymentOrder studentPaymentOrder) {
 		this.studentPaymentOrder = studentPaymentOrder;
 	}
+
+    public Long getPlatformOrderId() {
+        return platformOrderId;
+    }
+
+    public void setPlatformOrderId(Long platformOrderId) {
+        this.platformOrderId = platformOrderId;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -36,20 +37,52 @@ public class CloudTeacherStudent {
     @ApiModelProperty(value = "所属分部")
     private String organName;
 
-    @ApiModelProperty(value = "乐团编号")
-    private String musicGroupId;
+    @ApiModelProperty(value = "团练宝类型")
+    private PeriodEnum type;
 
-    @ApiModelProperty(value = "乐团名称")
-    private String musicGroupName;
+    @ApiModelProperty(value = "团练宝类型名称")
+    private String typeName;
 
-    @ApiModelProperty(value = "合作单位")
-    private String cooperationOrganName;
+    @ApiModelProperty(value = "流水号")
+    private String transNo;
 
-    @ApiModelProperty(value = "团练宝类型")
-    private Integer type;
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
 
-    @ApiModelProperty(value = "团练宝类型")
-    private String typeName;
+    @ApiModelProperty(value = "订单时间")
+    private String orderTime;
+
+    @ApiModelProperty(value = "金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "数量")
+    private Integer time;
+
+    // ------------------------------------------------------------------------------------------
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(String orderTime) {
+        this.orderTime = orderTime;
+    }
 
     public String getTypeName() {
         return typeName;
@@ -59,11 +92,6 @@ public class CloudTeacherStudent {
         this.typeName = typeName;
     }
 
-    @ApiModelProperty(value = "数量")
-    private Integer time;
-
-    @ApiModelProperty(value = "金额")
-    private BigDecimal amount;
 
     public Integer getTenantId() {
         return tenantId;
@@ -105,19 +133,11 @@ public class CloudTeacherStudent {
         this.phone = phone;
     }
 
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Integer getType() {
+    public PeriodEnum getType() {
         return type;
     }
 
-    public void setType(Integer type) {
+    public void setType(PeriodEnum type) {
         this.type = type;
     }
 
@@ -153,27 +173,11 @@ public class CloudTeacherStudent {
         this.organName = organName;
     }
 
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getCooperationOrganName() {
-        return cooperationOrganName;
+    public BigDecimal getAmount() {
+        return amount;
     }
 
-    public void setCooperationOrganName(String cooperationOrganName) {
-        this.cooperationOrganName = cooperationOrganName;
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
     }
 }

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

@@ -35,6 +35,8 @@ public class MusicGroupTrainPlanSaveDto {
 	private Date courseClassTime;
 
 	private Boolean studentFlag = false;
+	
+	private Integer tenantId;
 
 	public Boolean getStudentFlag() {
 		return studentFlag;
@@ -115,4 +117,12 @@ public class MusicGroupTrainPlanSaveDto {
 	public void setMusicGroupId(String musicGroupId) {
 		this.musicGroupId = musicGroupId;
 	}
+
+	public Integer getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(Integer tenantId) {
+		this.tenantId = tenantId;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CloudTeacherAddQueryInfo.java

@@ -8,7 +8,6 @@ import java.util.List;
 
 public class CloudTeacherAddQueryInfo extends QueryInfo {
 
-
 	@ApiModelProperty(value = "学生编号数组")
 	private List<Integer> studentIds;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CloudTeacherOrderQueryInfo.java

@@ -3,9 +3,15 @@ package com.ym.mec.biz.dal.page;
 import io.swagger.annotations.ApiModelProperty;
 
 import com.ym.mec.common.page.QueryInfo;
+import org.joda.time.DateTime;
+
+import java.util.Date;
 
 public class CloudTeacherOrderQueryInfo extends QueryInfo {
 
+	@ApiModelProperty(value = "乐团Id")
+	private String musicGroupId;
+
 	@ApiModelProperty(value = "交易状态(0-待生效 1-生效中 2-已生效 3-已退)")
 	private Integer status;
 
@@ -15,9 +21,35 @@ public class CloudTeacherOrderQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "学员姓名/编号/电话")
 	private String queryCondition;
 
+
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+
 	@ApiModelProperty(value = "声部Id")
 	private Integer subjectId;
 
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	@ApiModelProperty(value = "结束时间")
+	private Date endTime;
+
 	public Integer getStatus() {
 		return status;
 	}
@@ -49,4 +81,20 @@ public class CloudTeacherOrderQueryInfo extends QueryInfo {
 	public void setSubjectId(Integer subjectId) {
 		this.subjectId = subjectId;
 	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
 }

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

@@ -110,11 +110,11 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
      */
     Map<String, Object> pay(List<CloudTeacherStudent> cloudTeacherStudents) throws Exception;
 
-    Msg payNotify(Msg msg);
+    Msg payNotify(Msg msg) throws Exception;
 
     Boolean payCheck(String orderNo);
 
-    PageInfo<CloudTeacherStudent> queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo);
+    PageInfo<CloudTeacherStudent> queryRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo);
 
     boolean addStudents(CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo);
 }

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

@@ -86,7 +86,7 @@ public interface GoodsService extends BaseService<Integer, Goods> {
      * @date 2020.10.13
      * @return void
      */
-    void sellOrderBatchNoAllot();
+    void sellOrderBatchNoAllot(Integer tenantId);
 
     /**
      * @describe 扣减商品库存

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

@@ -27,7 +27,7 @@ public interface StudentCompetitionService extends BaseService<Long, StudentComp
      * @date 2020.11.10
      * @return void
      */
-    List<StudentCompetitionRankingDto> getWinnerList();
+    List<StudentCompetitionRankingDto> getWinnerList(Integer tenantId);
 
     StudentCompetition checkIsUpload(Integer userId);
 

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

@@ -76,13 +76,6 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     List<StudentPaymentOrder> queryByBatchNo(Integer userId, String batchNo, DealStatusEnum status);
 
     /**
-     * 查找支付成功和支付中订单
-     *
-     * @return
-     */
-    int findPayOrderNum();
-
-    /**
      * 查询支付中订单
      *
      * @param status

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

@@ -21,9 +21,9 @@ public interface StudentServeService {
      * @param :
      * @return void
      */
-    void exercisesSituationStatistics(String monday);
+    void exercisesSituationStatistics(String monday, Integer tenantId);
 
-    void exercisesSituationStatistics2(String monday, List<Integer> studentIds);
+    void exercisesSituationStatistics2(String monday, List<Integer> studentIds, Integer tenantId);
 
     /**
      * @describe

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

@@ -144,11 +144,6 @@ public interface StudentService extends BaseService<Integer, Student> {
     void cleanStudentCloudStudySequenceDays();
 
     /**
-     * 标记进行中乐团在读学员+VIP、网管有课学员总数（除弦乐声部、去重）
-     */
-    void remarkCountFlag();
-
-    /**
      * 云教练活动统计
      * @param organIds
      * @param queryInfo
@@ -162,4 +157,6 @@ public interface StudentService extends BaseService<Integer, Student> {
      * @return
      */
     PageInfo<CloudTeacherActiveTargetDetailDto> countCloudTeacherActiveDetail(CloudTeacherActiveQueryInfo queryInfo);
+
+    int updateMembershipEndTime(Integer studentId, Date endTime);
 }

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

@@ -17,6 +17,8 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     TenantInfoDto queryTenantInfo(Integer tenantId);
 
+    TenantInfoDto queryTenantInfoCheck(Integer tenantId);
+
     void opsTenantState(Integer id, Integer state);
 
     PageInfo<TenantInfoInfoPageVo> queryPage(Map<String, Object> param);

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

@@ -19,6 +19,8 @@ public interface TenantOrderRecordService extends IService<TenantOrderRecord> {
 
     Map<String, Object> checkTenantOrder(String orderNo);
 
+    Map<String, Object> checkTenantOrder(TenantOrderRecord orderRecord);
+
     void checkTenantOrder();
 
 }

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

@@ -22,6 +22,7 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+import jodd.util.StringUtil;
 import org.joda.time.LocalDateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +32,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.ym.mec.biz.dal.enums.PeriodEnum.*;
 
 @Service
 public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTeacherOrder> implements CloudTeacherOrderService {
@@ -64,14 +68,15 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacherOrder.setTime(cloudTeacherAddQueryInfo.getTimes());
             cloudTeacherOrder.setType(cloudTeacherAddQueryInfo.getAddType());
             cloudTeacherOrder.setLevel(1);
+            cloudTeacherOrder.setTenantId(cloudTeacherAddQueryInfo.getTenantId());
             cloudTeacherOrderDao.insert(cloudTeacherOrder);
             this.addStudentCloudTeacher(cloudTeacherOrder);
         }
-        return false;
+        return true;
     }
 
     @Override
-    public PageInfo<CloudTeacherStudent> queryActiveRecord(CloudTeacherOrderQueryInfo queryInfo) {
+    public PageInfo<CloudTeacherStudent> queryRecord(CloudTeacherOrderQueryInfo queryInfo) {
         PageInfo<CloudTeacherStudent> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
@@ -119,19 +124,19 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             JSONObject memberConfig = (JSONObject) cfg.get("member_config");
             Double divide;
             switch (cst.getType()) {
-                case 1:
+                case DAY:
                     divide = memberConfig.getDouble("day_divide");
                     break;
-                case 2:
+                case MONTH:
                     divide = memberConfig.getDouble("month_divide");
                     break;
-                case 3:
+                case QUARTERLY:
                     divide = memberConfig.getDouble("quarter_divide");
                     break;
-                case 4:
+                case YEAR_HALF:
                     divide = memberConfig.getDouble("half_year_divide");
                     break;
-                case 5:
+                case YEAR:
                     divide = memberConfig.getDouble("year_divide");
                     break;
                 default:
@@ -153,6 +158,11 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         if (cloudTeacherStudents.size() == 0) {
             throw new Exception("至少选择一条记录");
         }
+        List<Integer> ids = cloudTeacherStudents.stream().map(CloudTeacherStudent::getCloudTeacherOrderId).collect(
+                Collectors.toList());
+        if (cloudTeacherOrderDao.checkOrdered(StringUtil.join(ids, ",")) >= 0) {
+            throw new Exception("学生已经支付");
+        }
         Integer tenantId = null;
         for (CloudTeacherStudent cts: cloudTeacherStudents) {
             if (cts.getAmount() == null) {
@@ -199,13 +209,16 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         } else { // 消费大于 0 元 已支付 直接激活
             orderState = 1;
         }
-        createOrderRecord(tenantId, payAmount, orderNo, tenantEnum, orderState, cloudTeacherStudents);
+        TenantOrderRecord record = createOrderRecord(tenantId, payAmount, orderNo, tenantEnum, orderState, cloudTeacherStudents);
+        if (orderState == 1) { // 成功手直接成功
+            this.paySuccess(record);
+        }
         log.info("tenant pay >>>>> " + JSON.toJSONString(payMap));
         return payMap;
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Msg payNotify(Msg msg) {
+    public Msg payNotify(Msg msg) throws Exception {
         log.info("tenant orderNotify >>>>> " + msg.toString());
         msg.setMsg("fail");
         Map<String, String> notifyMap = JSON.parseObject(msg.getResponseParameters(), Map.class);
@@ -221,10 +234,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             //tradeState 88就是正确的 其他错误的
             //            DealStatusEnum
             //            notifyMap.put("totalMoney", notifyMap.get("payAmount"));
-            log.info("tenant orderNotify update order status start" + record.getId().toString());
-
-            cloudTeacherOrderDao.updateOrderStatusOK(record.getId());
-            log.info("tenant orderNotify update order status end");
+            this.paySuccess(record);
             record.setOrderState(1);
             msg.setCode("000000");
             msg.setMsg("success");
@@ -239,12 +249,21 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         return msg;
     }
 
-    public Boolean payCheck(String orderNo) {
-        TenantOrderRecord record = tenantOrderRecordService.getOne(new QueryWrapper<TenantOrderRecord>().eq("order_no_", orderNo));
-        return record.getOrderState() == 1;
+    private void paySuccess(TenantOrderRecord record) throws Exception {
+        log.info("tenant orderNotify update order status start" + record.getId().toString());
+
+        if (cloudTeacherOrderDao.updateOrderStatusOK(record.getId()) <= 0) {
+            throw new Exception("更新订单状态失败");
+        }
+        List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderDao.findByPlatformOrderId(record.getId());
+        for (CloudTeacherOrder cto : cloudTeacherOrders) {
+            studentService.updateMembershipEndTime(cto.getStudentId(), cto.getEndTime());
+        }
+
+        log.info("tenant orderNotify update order status end");
     }
 
-    private void createOrderRecord(Integer tenantId, BigDecimal payAmount, String orderNo, TenantOrderRecordEnum tenantEnum, Integer orderState, List<CloudTeacherStudent> cloudTeacherStudents) {
+    private TenantOrderRecord createOrderRecord(Integer tenantId, BigDecimal payAmount, String orderNo, TenantOrderRecordEnum tenantEnum, Integer orderState, List<CloudTeacherStudent> cloudTeacherStudents) throws Exception {
         LocalDateTime now = LocalDateTime.now();
         TenantOrderRecord record = new TenantOrderRecord();
         record.setTenantId(tenantId);
@@ -259,8 +278,16 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         record.setCreatedTime(now.toDate());
         tenantOrderRecordService.save(record);
         for (CloudTeacherStudent cts : cloudTeacherStudents) {
-            cloudTeacherOrderDao.updateOrderId(cts.getCloudTeacherOrderId(), cts.getAmount(), record.getId());
+            if (cloudTeacherOrderDao.updateOrderId(cts.getCloudTeacherOrderId(), cts.getAmount(), record.getId()) <= 0) {
+                throw new Exception("更新订单失败");
+            }
         }
+        return record;
+    }
+
+    public Boolean payCheck(String orderNo) {
+        TenantOrderRecord record = tenantOrderRecordService.getOne(new QueryWrapper<TenantOrderRecord>().eq("order_no_", orderNo));
+        return record.getOrderState() == 1;
     }
 
     @Override
@@ -329,15 +356,15 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     private Date calcCloudTeacherOrderTime(CloudTeacherOrder cloudTeacherOrder, Date startTime, Date endTime) {
-        if (cloudTeacherOrder.getType().equals(1)) { // 日
+        if (cloudTeacherOrder.getType() == DAY) { // 日
             endTime = DateUtil.addDays(startTime, cloudTeacherOrder.getTime());
-        } else if (cloudTeacherOrder.getType().equals(2)) { // 月
+        } else if (cloudTeacherOrder.getType() == MONTH) { // 月
             endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime());
-        } else if (cloudTeacherOrder.getType().equals(3)) { // 季
+        } else if (cloudTeacherOrder.getType() == QUARTERLY) { // 季
             endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 3);
-        } else if (cloudTeacherOrder.getType().equals(4)) { // 半年
+        } else if (cloudTeacherOrder.getType() == YEAR_HALF) { // 半年
             endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 6);
-        } else if (cloudTeacherOrder.getType().equals(5)) { // 年
+        } else if (cloudTeacherOrder.getType() == YEAR) { // 年
             endTime = DateUtil.addYears(startTime, cloudTeacherOrder.getTime());
         }
         return endTime;

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

@@ -249,10 +249,12 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void exercisesSituationStatistics2(String monday) {
+		Integer tenantId = TenantContextHolder.getTenantId();
+		
 		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 
 		if(nowDate.getDayOfWeek()==DayOfWeek.MONDAY){
-			int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-1).toString());
+			int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-1).toString(),tenantId);
 			if(lastWeekTodayUpdateNum<=0){
 				nowDate = nowDate.plusDays(-1);
 			}
@@ -264,7 +266,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 		LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
 
-		List<Student> serviceStudents = studentDao.getServiceStudents();
+		List<Student> serviceStudents = studentDao.getServiceStudents(tenantId);
 		if(CollectionUtils.isEmpty(serviceStudents)){
 			return;
 		}

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

@@ -49,7 +49,7 @@ public class GoodsCategoryServiceImpl extends BaseServiceImpl<Integer, GoodsCate
 			goodsCategoryDao.insert(goodsCategory);
 		}
 		List<Integer> subjectIds = goodsCategory.getSubjectIds();
-		subjectGoodsMapperDao.batchAdd(goodsCategory.getId(),subjectIds);
+		subjectGoodsMapperDao.batchAdd(goodsCategory.getId(),subjectIds, goodsCategory.getTenantId());
 	}
 
 	@Override

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

@@ -22,6 +22,7 @@ import com.ym.mec.biz.dal.page.GoodsQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.slf4j.Logger;
@@ -54,6 +55,7 @@ import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.exception.BizException;
 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.excel.POIUtil;
 import com.ym.mec.util.ini.IniFileUtil;
@@ -136,7 +138,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		goodsProcurement.setGoodsCategoryId(existsGood.getGoodsCategoryId());
 		goodsProcurementDao.insert(goodsProcurement);
 
-		sellOrderBatchNoAllot();
+		sellOrderBatchNoAllot(existsGood.getTenantId());
 	}
 
 	@Override
@@ -427,7 +429,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		}
 		goodsProcurementDao.batchInsert(goodsProcurements);
 
-		sellOrderBatchNoAllot();
+		sellOrderBatchNoAllot(TenantContextHolder.getTenantId());
 
 		return goodsList;
 	}
@@ -468,8 +470,8 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 
 	@Override
 	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-	public void sellOrderBatchNoAllot() {
-		List<Integer> noneBatchNoSellOrderIds = sellOrderDao.getNoneBatchNoSellOrderIds();
+	public void sellOrderBatchNoAllot(Integer tenantId) {
+		List<Integer> noneBatchNoSellOrderIds = sellOrderDao.getNoneBatchNoSellOrderIds(tenantId);
 		if(CollectionUtils.isEmpty(noneBatchNoSellOrderIds)){
 			return;
 		}

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

@@ -327,8 +327,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	@Transactional(rollbackFor = Exception.class)
 	public void indexBaseDataTask(String dayStr, Set<IndexDataType> dataTypes) {
 		LocalDate nowDate = LocalDate.now();
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
-		List<Organization> allOrgans = organizationDao.findAllOrgans();
+		List<Organization> allOrgans = organizationDao.findAllOrgans(tenantId);
 		if(CollectionUtils.isEmpty(this.organIds.get())){
 			this.organIds.get().clear();
 			this.organIds.get().addAll(allOrgans.stream().map(Organization::getId).collect(Collectors.toSet()));
@@ -340,8 +342,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		LocalDate day = LocalDate.parse(dayStr, DateUtil.dateFormatter);
 		LocalDate monday = day.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-		
-		Integer tenantId = TenantContextHolder.getTenantId();
 
 		//学员数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.STUDENT_REGISTRATION_NUM)){
@@ -563,7 +563,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		//云教练新用户人数
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CLOUD_NEW_STUDENT_NUM)) {
-			List<Integer> studentIdList = studentRegistrationDao.findStudentIds();
+			List<Integer> studentIdList = studentRegistrationDao.findStudentIds(tenantId);
 			saveData(studentDao.groupOrganId(null,studentIdList),LocalDate.now().toString(),IndexDataType.CLOUD_NEW_STUDENT_NUM);
 		}
 
@@ -1063,7 +1063,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		String configValue1 = sysTenantConfigService.getTenantConfigValue(SysConfigService.PUSH_CREATE_PAYMENT_CALENDER, tenantId);
 		if(StringUtils.isNotEmpty(configValue1)){
 			//获取关联的乐团列表
-			List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIds);
+			List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIds,tenantId);
 			String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
 			if(musicGroupIds.size() > 0){
 				List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
@@ -1281,7 +1281,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 		if(!flag5){
 			//获取关联的乐团列表
-			List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIdsStr);
+			List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIdsStr,tenantId);
 			if(musicGroupIds.size() > 0){
 				String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
 				date = new Date();
@@ -1308,7 +1308,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	@Override
 	public PageInfo<EduOrganStudentDataDto> organStudentOverView(List<Integer> organIds, OrganCloudStudyStudentDataQueryInfo queryInfo) {
 		PageInfo<EduOrganStudentDataDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-		List<Organization> organs = organizationDao.getOrgans(organIds);
+		List<Organization> organs = organizationDao.getOrgans(organIds, queryInfo.getTenantId());
 		pageInfo.setTotal(organs.size());
 
 		if(CollectionUtils.isEmpty(organs)){

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

@@ -10,7 +10,6 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.PageInfo;
 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,7 +33,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	}
 
 	private MemberPrivilegesItem getTree(MemberPrivilegesItem item){
-		List<MemberPrivilegesItem> privilegesItems = memberPrivilegesItemDao.findList(item.getId(), TenantContextHolder.getTenantId());
+		List<MemberPrivilegesItem> privilegesItems = memberPrivilegesItemDao.findList(item.getId());
 		if(privilegesItems != null && privilegesItems.size() > 0) {
 			item.setMemberPrivilegesItems(privilegesItems);
 			for (MemberPrivilegesItem privilegesItem : privilegesItems) {
@@ -56,7 +55,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 		if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItemId)){
 			throw new BizException("删除失败：该功能已被使用");
 		}
-		List<MemberPrivilegesItem> memberPrivilegesItems = memberPrivilegesItemDao.findList(memberPrivilegesItemId,TenantContextHolder.getTenantId());
+		List<MemberPrivilegesItem> memberPrivilegesItems = memberPrivilegesItemDao.findList(memberPrivilegesItemId);
 		for (MemberPrivilegesItem item : memberPrivilegesItems) {
 			item = getTree(item);
 		}
@@ -84,7 +83,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 
 	@Override
 	public List<MemberPrivilegesItem> findAllItem(MemberPrivilegesItemQueryInfo queryInfo) {
-		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId(),TenantContextHolder.getTenantId());
+		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId());
 		if(rows == null || rows.size() == 0){
 			return rows;
 		}
@@ -97,7 +96,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateItem(MemberPrivilegesItem memberPrivilegesItem) {
-		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId(),TenantContextHolder.getTenantId());
+		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId());
 		if(itemList.size() == 0){
 			if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItem.getParentId())){
 				throw new BizException("修改失败：被关联的子集不能被添加子功能");
@@ -120,7 +119,7 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void add(MemberPrivilegesItem memberPrivilegesItem) {
-		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId(),TenantContextHolder.getTenantId());
+		List<MemberPrivilegesItem> itemList = memberPrivilegesItemDao.findList(memberPrivilegesItem.getParentId());
 		if(itemList.size() == 0){
 			if(memberRankPrivilegesDao.hasPrivileges(memberPrivilegesItem.getParentId())){
 				throw new BizException("修改失败：被关联的子集不能被添加子功能");

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

@@ -1,39 +1,72 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.*;
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.STUDENT;
+import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.AUDITING;
+import static com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus.NON_PAYMENT;
+import static com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED;
+import static com.ym.mec.biz.dal.enums.PaymentStatusEnum.YES;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderCourseSettingsDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderStudentDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentStudentCourseDetailDao;
+import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.FeeStudentDto;
 import com.ym.mec.biz.dal.dto.MusicArrearageStudentDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentStudentCourseDetail;
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.dal.page.ArrearageStudentsQueryInfo;
 import com.ym.mec.biz.dal.page.MusicCalenderDetailQueryInfo;
 import com.ym.mec.biz.event.source.GroupEventSource;
-import com.ym.mec.biz.service.*;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderActivityService;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderDetailService;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
+import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.constant.CommonConstants;
 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.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType.STUDENT;
-import static com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum.AUDITING;
-import static com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus.NON_PAYMENT;
-import static com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED;
-import static com.ym.mec.biz.dal.enums.PaymentStatusEnum.YES;
 
 @Service
 public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<Long, MusicGroupPaymentCalenderDetail>  implements MusicGroupPaymentCalenderDetailService {
@@ -632,7 +665,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		if(StringUtils.isNotBlank(organIdsStr)){
 			organIds = Arrays.stream(organIdsStr.split(",")).map(Integer::new).collect(Collectors.toSet());
 		}
-		return musicGroupPaymentCalenderDetailDao.getNoPaymentStudentMusicGroups(organIds);
+		return musicGroupPaymentCalenderDetailDao.getNoPaymentStudentMusicGroups(organIds, TenantContextHolder.getTenantId());
 	}
 
 	@Override

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

@@ -173,7 +173,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		String remindCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.REMIND_COURSE_TIME,tenantId);
 		if(StringUtils.isNotEmpty(remindCourseTime)){
 			//获取当前学期截止前14天的乐团，并提醒教务老师排课
-			List<String> musicGroupIds = musicGroupSchoolTermCourseDetailDao.queryPushCourseTermMusicIds(remindCourseTime);
+			List<String> musicGroupIds = musicGroupSchoolTermCourseDetailDao.queryPushCourseTermMusicIds(remindCourseTime,tenantId);
 			if(musicGroupIds.size() > 0){
 				List<MusicGroup> musicGroupList = musicGroupDao.getMusicGroupByIds(musicGroupIds);
 				List<Integer> educationIds = musicGroupList.stream().map(e -> e.getEducationalTeacherId()).collect(Collectors.toList());
@@ -210,7 +210,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 			memberName = memberRankSetting.getName();
 		}
 		if(StringUtils.isNotEmpty(pushMemberRenewAgain)){
-			List<Integer> studentIdList = studentDao.queryPushMemberRenew(pushMemberRenewAgain);
+			List<Integer> studentIdList = studentDao.queryPushMemberRenew(pushMemberRenewAgain, tenantId);
 			if(studentIdList.size() > 0){
 				Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(studentIdList,",")));
 				Map<Integer,String> userMap = new HashMap<>(studentIdList.size());
@@ -241,7 +241,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		//会员结束前15天自动创建乐团续费（默认提前15天）
 		String autoCreateMemberRenew = sysTenantConfigService.getTenantConfigValue(SysConfigService.AUTO_CREATE_MEMBER_RENEW,tenantId);
 		if(StringUtils.isNotEmpty(autoCreateMemberRenew)){
-			Map<String,String> studentMusicMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryAutoCreateStudentMap(autoCreateMemberRenew));
+			Map<String,String> studentMusicMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryAutoCreateStudentMap(autoCreateMemberRenew, tenantId));
 			if(studentMusicMap.size() > 0){
 				for (String musicGroupId : studentMusicMap.keySet()) {
 					MusicGroup musicGroup = musicGroupDao.get(musicGroupId);

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

@@ -1514,7 +1514,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public List<MusicCardDto> queryOrganMusicInfos(Integer organId) {
-        return musicGroupDao.queryOrganMusicInfos(organId);
+        return musicGroupDao.queryOrganMusicInfos(organId, TenantContextHolder.getTenantId());
     }
 
     @Override
@@ -3368,7 +3368,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 educationUserId = sysUser.getId();
             }
             //获取关联的乐团列表
-            List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId, queryInfo.getOrganId());
+            List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId, queryInfo.getOrganId(), queryInfo.getTenantId());
             String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
             Date date = new Date();
             String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);

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

@@ -11,8 +11,10 @@ import com.ym.mec.biz.service.MusicGroupTrainPlanService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -179,6 +181,7 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 
 	@Override
 	public List<MusicGroupTrainPlan> queryPlan(MusicGroupTrainPlanSaveDto schoolTerm) {
+		schoolTerm.setTenantId(TenantContextHolder.getTenantId());
 		return musicGroupTrainPlanDao.queryPlan(schoolTerm);
 	}
 }

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

@@ -70,7 +70,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
             organOperating.put(organFullJobResource.getOrganId(), operatingReport);
         }
         //1.2 初始化没有全职资源数的分部
-        List<Organization> organs = organizationDao.findAllOrgans();
+        List<Organization> organs = organizationDao.findAllOrgans(tenantId);
         for (Organization organ : organs) {
             if(organOperating.containsKey(organ.getId())) continue;
             OperatingReport operatingReport = new OperatingReport();
@@ -122,29 +122,29 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         }
 
         //3.1、乐团销售订单的统计
-        List<OperatingReport> reports = sellOrderDao.getMusicGroupMonthReport(startTime, endTime);
+        List<OperatingReport> reports = sellOrderDao.getMusicGroupMonthReport(startTime, endTime, tenantId);
         //乐团订单总收入的统计
-        reports.addAll(sellOrderDao.getMusicGroupIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getMusicGroupIncome(startTime, endTime, tenantId));
         //3.2、VIP、网管课订单的统计（关联学生注册取一条记录）
-        reports.addAll(sellOrderDao.getMusicVipPracticeMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getMusicVipPracticeMonthReport(startTime, endTime, tenantId));
         //3.3、外部添加订单销售
-        reports.addAll(sellOrderDao.getOutOrderMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getOutOrderMonthReport(startTime, endTime, tenantId));
         //外部添加订单销售总收入
-        reports.addAll(sellOrderDao.getOutOrderIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getOutOrderIncome(startTime, endTime, tenantId));
         //3.4、乐器维修
-        reports.addAll(sellOrderDao.getRepairGoodsSellGroupMonthReport(startTime, endTime));
-        reports.addAll(sellOrderDao.getRepairGoodsSellGroupIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getRepairGoodsSellGroupMonthReport(startTime, endTime, tenantId));
+        reports.addAll(sellOrderDao.getRepairGoodsSellGroupIncome(startTime, endTime, tenantId));
         //3.5、商品销售
-        reports.addAll(sellOrderDao.getGoodsSellGroupMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getGoodsSellGroupMonthReport(startTime, endTime, tenantId));
         //3.6、零星支付充值
-        reports.addAll(sellOrderDao.getRechargeMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getRechargeMonthReport(startTime, endTime, tenantId));
         //3.7、零星收费（不是充值部分的）
-        reports.addAll(sellOrderDao.getSporadicMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getSporadicMonthReport(startTime, endTime, tenantId));
         //3.8 声部更换的收入
-        reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime));
-        reports.addAll(sellOrderDao.getSubjectChangeGroupIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime, tenantId));
+        reports.addAll(sellOrderDao.getSubjectChangeGroupIncome(startTime, endTime, tenantId));
         //3.9 退货部分的统计
-        reports.addAll(sellOrderDao.getRefundIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getRefundIncome(startTime, endTime, tenantId));
 
         updateFee(organOperating, cooperationOperating, reports);
 

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

@@ -17,6 +17,8 @@ import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,9 @@ import org.springframework.util.DigestUtils;
 import java.math.BigDecimal;
 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;
@@ -44,6 +49,8 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     private TenantPaymentOrderService tenantPaymentOrderService;
     @Autowired
     private TenantOrderRecordService tenantOrderRecordService;
+    @Autowired
+    private RedissonClient redissonClient;
 
     @Override
     public Map<String, Object> executePayment(BigDecimal amount, String orderNo, String payChannel, String returnUrl, String orderSubject, String orderBody, String sign, String code, String platform) throws Exception {
@@ -66,6 +73,8 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                         tenantOrderRecord::setTransNo,
                         tenantOrderRecordService::updateById
                 );
+                //主动延迟检查订单
+                delayCheckTenant();
             } else if (platform.equals("teacher")) {
                 TenantPaymentOrder tenantPaymentOrder = tenantPaymentOrderService.queryByOrderNo(payParam.getOrderNo());
                 payment = checkOrderAndGetParam(payParam,
@@ -162,7 +171,6 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                 .ifPresent(action);
     }
 
-
     private Map<String, Object> getExpend(PaymentParam payParam) throws Exception {
         Map<String, Object> expendParams = new HashMap<>(5);
         String openId = "";
@@ -203,6 +211,26 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         return paymentParams;
     }
 
+    private void delayCheckTenant() {
+        RBucket<Object> bucket = redissonClient.getBucket("delay_check_tenant");
+        if (!bucket.trySet(1, 35L, TimeUnit.SECONDS)) {
+            return;
+        }
+        //异步
+        CompletableFuture.runAsync(() -> {
+            //检查5次
+            for (int i = 0; i <= 5; i++) {
+                try {
+                    Thread.sleep(3000);//每3秒触发一次
+                    tenantOrderRecordService.checkTenantOrder();
+                } catch (InterruptedException e) {
+                    return;
+                }
+            }
+            bucket.delete();
+        });
+    }
+
     static class PaymentParam {
         private BigDecimal amount;
         private String orderNo;

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

@@ -85,7 +85,7 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
     public PageInfo<ReplacementInstrumentCooperation> getPageList(ReplacementInstrumentCooperationQueryInfo queryInfo) {
         PageInfo<ReplacementInstrumentCooperation> pageInfo = queryPage(queryInfo);
         if (pageInfo.getRows().size() > 0) {
-            List<ReplacementInstrumentCooperation> replacementInstruments = replacementInstrumentCooperationDao.countAllReplacementsInfo();
+            List<ReplacementInstrumentCooperation> replacementInstruments = replacementInstrumentCooperationDao.countAllReplacementsInfo(queryInfo.getTenantId());
             for (ReplacementInstrumentCooperation row : pageInfo.getRows()) {
                 for (ReplacementInstrumentCooperation replacementInstrument : replacementInstruments) {
                     if (!row.getId().equals(replacementInstrument.getId())) continue;

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

@@ -29,25 +29,25 @@ public class ResourceRespositoryServiceImpl extends BaseServiceImpl<Integer, Res
 			menuQueryInfo.setSubjectId(subjectId == 5?6:subjectId == 23?18:subjectId == 3?2:subjectId == 16?15:subjectId == 20?18:subjectId == 50?18:subjectId == 53?18
 					:subjectId == 54?18:subjectId == 55?18:subjectId == 56?18:subjectId == 60?18:subjectId == 8?4:subjectId);
 		}
-		List<ResourceRespository> resourceRespositories = resourceRespositoryDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId());
+		List<ResourceRespository> resourceRespositories = resourceRespositoryDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId(),menuQueryInfo.getTenantId());
 		for (ResourceRespository repository:resourceRespositories) {
-			repository = getTree(repository,menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId());
+			repository = getTree(repository,menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId(), menuQueryInfo.getTenantId());
 		}
 		return resourceRespositories;
 	}
 
-	private ResourceRespository getTree(ResourceRespository repository, String delFlag,Integer subjectId){
+	private ResourceRespository getTree(ResourceRespository repository, String delFlag,Integer subjectId, Integer tenantId){
 		//得到根节点对象
 		//获取子节点list
 		List<ResourceRespository> repositories = null;
-		repositories = resourceRespositoryDao.findList(repository.getId(),delFlag,subjectId);
+		repositories = resourceRespositoryDao.findList(repository.getId(),delFlag,subjectId,tenantId);
 		//如果存在子节点
 		if(repositories != null && repositories.size() > 0) {
 			//将子节点list放入父节点对象
 			repository.setRepositories(repositories);
 			//遍历子节点....
 			for (ResourceRespository sysMenu : repositories) {
-				getTree(sysMenu,delFlag,subjectId);
+				getTree(sysMenu,delFlag,subjectId,tenantId);
 			}
 		}
 		return repository;

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

@@ -7,11 +7,14 @@ 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.util.collection.MapUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import com.ym.mec.biz.dal.entity.StudentCompetition;
 import com.ym.mec.biz.service.StudentCompetitionService;
 import com.ym.mec.biz.dal.dao.StudentCompetitionDao;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,8 +79,8 @@ public class StudentCompetitionServiceImpl extends BaseServiceImpl<Long, Student
 	}
 
 	@Override
-	public List<StudentCompetitionRankingDto> getWinnerList() {
-		List<StudentCompetition> winnerList = studentCompetitionDao.getWinnerList();
+	public List<StudentCompetitionRankingDto> getWinnerList(Integer tenantId) {
+		List<StudentCompetition> winnerList = studentCompetitionDao.getWinnerList(tenantId);
 		List<StudentCompetitionRankingDto> winnerSimpleInfoList = new ArrayList<>();
 		for (StudentCompetition studentCompetition : winnerList) {
 			winnerSimpleInfoList.add(new StudentCompetitionRankingDto(studentCompetition.getId(), studentCompetition.getPrizeLevel(), studentCompetition.getUsername(), studentCompetition.getPictureUrl()));
@@ -88,7 +91,7 @@ public class StudentCompetitionServiceImpl extends BaseServiceImpl<Long, Student
 	@Override
 	public void updateCompetition(StudentCompetition studentCompetition) {
 		if(Objects.nonNull(studentCompetition.getPrizeLevel())&&studentCompetition.getPrizeLevel()>0){
-			Set<Long> competitionsWithPrizeLevel = studentCompetitionDao.getCompetitionsWithPrizeLevel(studentCompetition.getPrizeLevel());
+			Set<Long> competitionsWithPrizeLevel = studentCompetitionDao.getCompetitionsWithPrizeLevel(studentCompetition.getPrizeLevel(),studentCompetition.getTenantId());
 			int maxPrizeLevelUserNum = 0;
 			switch (studentCompetition.getPrizeLevel()){
 				case 1:

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

@@ -93,7 +93,7 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
                 TenantInfo tenantInfo = tenantInfos.get(i);
                 String autoAffirmReceiveTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.AUTO_AFFIRM_RECEIVE_TIME,tenantInfo.getId());
                 //获取到期的订单编号
-                String s = studentGoodsSellDao.queryNoAffirmOrderNo(autoAffirmReceiveTime);
+                String s = studentGoodsSellDao.queryNoAffirmOrderNo(autoAffirmReceiveTime, tenantInfo.getId());
                 if(StringUtils.isNotEmpty(s)){
                     sb.append(s).append(",");
                 }

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

@@ -210,11 +210,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 		return studentPaymentOrderDao.queryByBatchNo(userId, batchNo, status);
 	}
 
-	@Override
-    public int findPayOrderNum() {
-        return studentPaymentOrderDao.findPayOrderNum();
-    }
-
     @Override
     public List<StudentPaymentOrder> findOrdersByStatus(DealStatusEnum status, String paymentChannel) {
         return studentPaymentOrderDao.findOrdersByStatus(status, paymentChannel);

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

@@ -57,10 +57,10 @@ public class StudentServeServiceImpl implements StudentServeService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void exercisesSituationStatistics(String monday) {
+    public void exercisesSituationStatistics(String monday, Integer tenantId) {
         LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 
-        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString());
+        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString(), tenantId);
         if(lastWeekTodayUpdateNum<=0){
             nowDate = nowDate.plusDays(-nowDate.getDayOfWeek().getValue());
         }
@@ -73,9 +73,9 @@ public class StudentServeServiceImpl implements StudentServeService {
         LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
         Date nextMonday = Date.from(sunDayDate.plusDays(1).atStartOfDay(DateUtil.zoneId).toInstant());
 
-        List<Integer> beServeStudentIds=studentDao.getServeStudentIds();
+        List<Integer> beServeStudentIds=studentDao.getServeStudentIds(tenantId);
         List<Integer> serveStudentIds=new ArrayList<>();
-        List<StudentServeCourseDto> serveStudentCourseStartTimes = studentDao.getServeStudentCourseStartTimes(monDayDate.toString());
+        List<StudentServeCourseDto> serveStudentCourseStartTimes = studentDao.getServeStudentCourseStartTimes(monDayDate.toString(),tenantId);
         Map<Integer, List<StudentServeCourseDto>> studentTimesMap = new HashMap<>();
         if(!CollectionUtils.isEmpty(serveStudentCourseStartTimes)){
             studentTimesMap = serveStudentCourseStartTimes.stream().collect(Collectors.groupingBy(StudentServeCourseDto::getStudentId));
@@ -298,11 +298,11 @@ public class StudentServeServiceImpl implements StudentServeService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void exercisesSituationStatistics2(String monday, List<Integer> studentIds) {
+    public void exercisesSituationStatistics2(String monday, List<Integer> studentIds, Integer tenantId) {
         LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 
-        int preWeekServiceNum = studentExtracurricularExercisesSituationDao.countWeekServiceNum(nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7).toString());
-        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString());
+        int preWeekServiceNum = studentExtracurricularExercisesSituationDao.countWeekServiceNum(nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7).toString(), tenantId);
+        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString(), tenantId);
         if(preWeekServiceNum>0 && lastWeekTodayUpdateNum<=0){
             nowDate = nowDate.plusDays(-nowDate.getDayOfWeek().getValue());
         }
@@ -348,7 +348,7 @@ public class StudentServeServiceImpl implements StudentServeService {
         Set<Integer> musicCourseStudentIds = studentFutureCourseInfo.stream().filter(s -> CourseSchedule.CourseScheduleType.SINGLE.equals(s.getType()) || CourseSchedule.CourseScheduleType.MIX.equals(s.getType())).map(StudentServeCourseDto::getStudentId).collect(Collectors.toSet());
 
         Set<Integer> haveCourseBeServeStudentIds = studentCourseMap.keySet();
-        List<Integer> allServeStudentIds = studentDao.getServeStudentIds();
+        List<Integer> allServeStudentIds = studentDao.getServeStudentIds(tenantId);
         Set<Integer> noCourseServeStudentIds = allServeStudentIds.stream().filter(id -> !haveCourseBeServeStudentIds.contains(id)).collect(Collectors.toSet());
 
         Set<Integer> musicStudentIds = new HashSet<>();

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

@@ -726,7 +726,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 
     @Override
     public List<EduOrganStudentDataDto> organStudentOverView(List<Integer> organIds) {
-        List<Organization> organs = organizationDao.getOrgans(organIds);
+        List<Organization> organs = organizationDao.getOrgans(organIds,TenantContextHolder.getTenantId());
 
         if(CollectionUtils.isEmpty(organs)){
             return Collections.emptyList();
@@ -836,7 +836,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         List<CloudTeacherActiveTargetDto> targetDtoList = JSONArray.parseArray(cloudTeacherActiveTarget, CloudTeacherActiveTargetDto.class);
         Map<Integer, List<CloudTeacherActiveTargetDto>> targetMap = targetDtoList.stream().collect(Collectors.groupingBy(e -> e.getOrganId()));
 
-        List<Organization> organs = organizationDao.getOrgans(organIds);
+        List<Organization> organs = organizationDao.getOrgans(organIds, queryInfo.getTenantId());
         pageInfo.setTotal(organs.size());
 
         if(CollectionUtils.isEmpty(organs)){
@@ -1029,24 +1029,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     }
 
     @Override
-    public void remarkCountFlag() {
-        //清除标记
-        studentDao.cleanCountFlag();
-        //打标记
-//        List<Integer> studentIds = new ArrayList<>();
-        //获取在会员团的学员
-//        studentIds.addAll(studentRegistrationDao.queryHasMemberGroupStudent());
-        //获取购买过云教练（非活动）的学员
-//        studentIds.addAll(cloudTeacherOrderDao.getStudentIds());
-        //标记目标学员
-        studentDao.remarkCountFlag();
-        //更新目标学员、目标金额
-        SysConfig config = sysConfigDao.findByParamName("cloud_teacher_active_target");
-        config.setParanValue(JSON.toJSONString(studentRegistrationDao.queryOrganTarget()));
-        sysConfigDao.update(config);
-    }
-
-    @Override
     public Map<String,Object> countCloudTeacherActive(List<Integer> organIdList, CloudTeacherActiveQueryInfo queryInfo) {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
@@ -1195,7 +1177,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Override
     public PageInfo<CloudTeacherActiveTargetDetailDto> countCloudTeacherActiveDetail(CloudTeacherActiveQueryInfo queryInfo) {
         PageInfo<CloudTeacherActiveTargetDetailDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-        Map<String, Object> params = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
 
         List<CloudTeacherActiveTargetDetailDto> dataList = null;
@@ -1211,4 +1193,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public int updateMembershipEndTime(Integer studentId, Date endTime) {
+        return studentDao.updateMembershipEndTime(studentId, endTime);
+    }
 }

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

@@ -34,6 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -97,7 +98,11 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         tenantInfo.setState(2);
         tenantInfo.setCreatedBy(userId);
         tenantInfo.setCreatedTime(new Date());
-        baseMapper.insert(tenantInfo);
+        try {
+            baseMapper.insert(tenantInfo);
+        } catch (DuplicateKeyException e) {
+            throw new BizException("同一个手机号只能创建一个机构!");
+        }
 
         //机构id
         Integer tenantId = tenantInfo.getId();
@@ -152,7 +157,11 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         BeanUtils.copyProperties(dto, tenantInfo);
         tenantInfo.setUpdatedBy(getUserId());
         tenantInfo.setUpdatedTime(now);
-        this.updateById(tenantInfo);
+        try {
+            this.updateById(tenantInfo);
+        } catch (DuplicateKeyException e) {
+            throw new BizException("同一个手机号只能创建一个机构!");
+        }
 
         //修改机构配置
         if (Objects.nonNull(dto.getConfig())) {
@@ -197,6 +206,32 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     }
 
     /**
+     * 订单购买信息查询
+     * 为什么要这个功能？
+     * 防重复支付，若该机构开通时已经支付还会主动查询第三方付款状态
+     *
+     * @param tenantId 机构id
+     */
+    @Override
+    public TenantInfoDto queryTenantInfoCheck(Integer tenantId) {
+        if (Objects.isNull(tenantId)) {
+            throw new BizException("请传入机构id");
+        }
+        //查询最后一条该机构开通记录
+        TenantOrderRecord oneRecord = tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>().queryWrapper()
+                .eq("tenant_id_", tenantId)
+                .isNotNull("trans_no_")
+                .eq("order_type_", "TENANT_OPEN")
+                .eq("payment_channel_", "ADAPAY")
+                .orderByDesc("created_time_"));
+        //存在，就去第三方再次校验
+        if (Objects.nonNull(oneRecord)) {
+            tenantOrderRecordService.checkTenantOrder(oneRecord);
+        }
+        return queryTenantInfo(tenantId);
+    }
+
+    /**
      * 启用/停用
      * 第一个启用默认激活账号等信息
      *
@@ -221,7 +256,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     throw new BizException("机构未缴费无法开通!");
                 }
                 //已支付完成 并且 没有创建用户信息
-                if (tenantInfo.getPayState() == 1 && Objects.nonNull(tenantInfo.getUserId())) {
+                if (tenantInfo.getPayState() == 1 && Objects.isNull(tenantInfo.getUserId())) {
                     //初次开通
                     checkFirstOpen(tenantInfo);
                 }
@@ -282,6 +317,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         assetsInfo.setFrozenAmount(BigDecimal.ZERO);
         assetsInfo.setCreatedTime(new Date());
         assetsInfoService.save(assetsInfo);
+        //修改机构userId信息
+        baseMapper.updateById(tenantInfo);
         //释放锁
         bucket.delete();
     }
@@ -323,6 +360,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         try {
             log.info("createUser >>>> {}", e);
             employeeService.add(e);
+            //将创建的userId反写到机构表
+            tenantInfo.setUserId(e.getId());
         } catch (Exception ex) {
             throw new BizException("开通账号信息异常!");
         }
@@ -411,7 +450,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     }
 
     //生成订单
-    private void createOrderRecord(Integer tenantId, BigDecimal payAmount, String orderNo, TenantOrderRecordEnum tenantEnum, Integer orderState) {
+    private void createOrderRecord(Integer tenantId, BigDecimal payAmount, String orderNo, TenantOrderRecordEnum
+            tenantEnum, Integer orderState) {
         TenantOrderRecord record = new TenantOrderRecord();
         record.setTenantId(tenantId);
         record.setOrderNo(orderNo);

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

@@ -17,12 +17,15 @@ import com.ym.mec.thirdparty.adapay.Payment;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.LocalDateTime;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 机构付款记录表(TenantOrderRecord)表服务实现类
@@ -42,6 +45,8 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
     private PlatformServeDetailService platformServeDetailService;
     @Autowired
     private TenantInfoService tenantInfoService;
+    @Autowired
+    private RedissonClient redissonClient;
 
     //订单不存在
     public static final String PAYMENT_ID_NOT_EXISTS = "payment_id_not_exists";
@@ -64,7 +69,15 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
     public Map<String, Object> checkTenantOrder(String orderNo) {
         TenantOrderRecord orderRecord = this.getOne(new WrapperUtil<TenantOrderRecord>()
                 .hasEq("order_no_", orderNo).queryWrapper());
+        return checkTenantOrder(orderRecord);
+    }
+
+    @Override
+    public Map<String, Object> checkTenantOrder(TenantOrderRecord orderRecord) {
+        return getTenantOrderState(orderRecord);
+    }
 
+    private Map<String, Object> getTenantOrderState(TenantOrderRecord orderRecord) {
         //主动去第三方查询订单状态
         checkTransOrderState(orderRecord);
 
@@ -87,8 +100,13 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         return result;
     }
 
+
     @Override
     public void checkTenantOrder() {
+        RBucket<Object> bucket = redissonClient.getBucket("tenant_check_order");
+        if (!bucket.trySet(1, 3L, TimeUnit.SECONDS)) {
+            return;
+        }
         List<TenantOrderRecord> list = this.list(new WrapperUtil<TenantOrderRecord>().queryWrapper()
                 .isNotNull("trans_no_")
                 .eq("order_state_", 0));
@@ -115,13 +133,16 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
                     LocalDateTime now = LocalDateTime.now();
                     record.setPayDate(now.toLocalDate().toDate());
                     record.setPayTime(now.toDate());
-                    baseMapper.updateById(record);
                 }
+                baseMapper.updateById(record);
             });
         }
-
+        bucket.delete();
     }
 
+    //丢弃5分钟之前的订单 300000 = 5 * 60秒 * 1000
+    long exTime = 300000L;
+
     //主动去第三方查询订单状态
     private void checkTransOrderState(TenantOrderRecord orderRecord) {
         if (StringUtils.equals(orderRecord.getPaymentChannel(), PaymentChannelEnum.ADAPAY.getCode())) {
@@ -129,26 +150,25 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
             try {
                 payment = Payment.queryPayment(orderRecord.getTransNo());
                 log.info("checkTenantOrder  payment >>>>> {}", payment);
-                boolean flag = false;
-                if (Objects.nonNull(payment.get("error_code"))) {
+                String status = (String) payment.get("status");
+                //判断状态是成功还是失败
+                if (status.equals("succeeded")) {
+                    orderRecord.setOrderState(1);
+                } else if (Objects.nonNull(payment.get("error_code"))) {
+                    //若状态是失败则判断code
                     if (!PAYMENT_ID_NOT_EXISTS.equals(payment.get("error_code"))) {
-                        //确保订单已经创建
-                        flag = true;
-                    }
-                } else {
-                    //没有异常
-                    flag = true;
-                }
-                log.info("checkTenantOrder  payment >>>>> {} flag {}", payment, flag);
-                //确保订单已经创建 再 判断状态是成功还是失败
-                if (flag && Objects.nonNull(payment.get("status"))) {
-                    String status = (String) payment.get("status");
-                    if (status.equals("succeeded")) {
-                        orderRecord.setOrderState(1);
-                    } else if (status.equals("failed")) {
+                        //不等于这个异常都是失败
                         orderRecord.setOrderState(2);
+                    } else {
+                        long orderTime = orderRecord.getCreatedTime().getTime();//订单创建时间
+                        long nowTime = new Date().getTime();
+                        //丢弃5分钟之前的订单
+                        if (nowTime - orderTime > exTime) {
+                            orderRecord.setOrderState(2);
+                        }
                     }
                 }
+                log.info("checkTenantOrder  payment >>>>> {}", payment);
                 log.info("checkTenantOrder  orderRecord >>>>> {}", JSON.toJSONString(orderRecord));
             } catch (Exception e) {
                 log.error("checkTenantOrder  payment error>>>>> {}", JSON.toJSONString(orderRecord));

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

@@ -16,6 +16,7 @@
         <result column="start_time_" property="startTime"/>
         <result column="end_time_" property="endTime"/>
         <result column="order_id_" property="orderId"/>
+        <result column="platform_order_id_" property="platformOrderId"/>
         <result column="remark_" property="remark"/>
         <result column="active_remark_" property="activeRemark"/>
         <result column="version_" property="version"/>
@@ -38,6 +39,7 @@
         <result column="start_time_" property="cloudTeacherOrder.startTime"/>
         <result column="end_time_" property="cloudTeacherOrder.endTime"/>
         <result column="order_id_" property="cloudTeacherOrder.orderId"/>
+        <result column="platform_order_id_" property="cloudTeacherOrder.platformOrderId"/>
         <result column="trans_status_" property="studentPaymentOrder.status"/>
         <result column="expect_amount_" property="studentPaymentOrder.expectAmount"/>
         <result column="pay_time_" property="studentPaymentOrder.payTime"/>
@@ -60,9 +62,9 @@
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into cloud_teacher_order (organ_id_,student_id_, type_, level_, time_, amount_, refund_amount_, status_,
-        order_id_,start_time_,end_time_,remark_, create_time_, update_time_,music_group_id_,active_remark_,tenant_id_)
+        order_id_,platform_order_id_,start_time_,end_time_,remark_, create_time_, update_time_,music_group_id_,active_remark_,tenant_id_)
         values (#{organId},#{studentId}, #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{level}, #{time}, #{amount}, #{refundAmount},
-        #{status},#{orderId},#{startTime},#{endTime}, #{remark}, NOW(), NOW(),#{musicGroupId},#{activeRemark},#{tenantId})
+        #{status},#{orderId},#{platformOrderId},#{startTime},#{endTime}, #{remark}, NOW(), NOW(),#{musicGroupId},#{activeRemark},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.CloudTeacherOrder">
         <!--@mbg.generated-->
@@ -107,6 +109,9 @@
             <if test="orderId != null">
                 order_id_ = #{orderId},
             </if>
+            <if test="platformOrderId != null">
+                platform_order_id_ = #{platformOrderId},
+            </if>
             <if test="remark != null">
                 remark_ = #{remark},
             </if>
@@ -116,12 +121,25 @@
         where id_ = #{id} AND version_ = #{version} and tenant_id_ = #{tenantId}
     </update>
 
+    <select id="findByPlatformOrderId"  resultMap="CloudTeacherOrderDto" parameterType="map">
+        select * from cloud_teacher_order where platform_order_id_ = #{platformOrderId}
+    </select>
+
     <update id="updateOrderStatusOK">
-        update cloud_teacher_order set status_ = 2 where order_id_ = (#{orderId})
+        update cloud_teacher_order set status_ = 2,
+       `start_time_` = CURRENT_DATE(),
+       `end_time_` = case
+         when type_ = 1 then date_add(CURRENT_DATE(), interval `time_` day)
+         when type_ = 2 then date_add(CURRENT_DATE(), interval `time_` month)
+         when type_ = 3 then date_add(CURRENT_DATE(), interval `time_` * 3 month)
+         when type_ = 4 then date_add(CURRENT_DATE(), interval `time_` * 6 month)
+         when type_ = 5 then date_add(CURRENT_DATE(), interval `time_` * 12 month)
+        end
+        where platform_order_id_ = #{platformOrderId}
     </update>
     <update id="updateOrderId">
         update cloud_teacher_order
-        set order_id_ = #{orderId} , pay_amount_ = #{amount}
+        set platform_order_id_ = #{platformOrderId} , pay_amount_ = #{amount}
         where id_ = #{cloudTeacherOrderId}
     </update>
 
@@ -292,7 +310,12 @@
         GROUP BY student_id_
     </select>
 
-    <select id="queryInactive" resultType="com.ym.mec.biz.dal.entity.CloudTeacherStudent">
+    <resultMap id="cloudTeacherStudent" type="com.ym.mec.biz.dal.entity.CloudTeacherStudent">
+        <result property="type" column="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+    </resultMap>
+
+    <!-- 查询激活或未激活记录 -->
+    <select id="queryInactive" resultMap="cloudTeacherStudent">
         select
                cto.id_ as cloudTeacherOrderId,
                cto.student_id_ as studentId,
@@ -307,25 +330,18 @@
                end as typeName,
                cto.time_ as time,
                sj.id_ as subject,
-               sj.name_ as subjectLabel,
+               sj.name_ as subjectName,
                u.tenant_id_ as tenantId,
                u.username_ as name,
-               u.phone_ as phone,
-               org.name_ as organName,
-               mg.id_ as musicGroupId,
-               mg.name_ as musicGroupName,
-               coo.name_ as cooperationOrganName
+               u.phone_ as phone
         from cloud_teacher_order cto
         left join student s on cto.student_id_ = s.user_id_
         left join sys_user u on cto.student_id_ = u.id_
         left join subject sj on s.subject_id_list_ = sj.id_
-        left join student_registration sr on cto.student_id_ = sr.user_id_
-        left join music_group mg on sr.music_group_id_ = mg.id_
-        left join cooperation_organ coo on mg.cooperation_organ_id_ = coo.id_
-        left join organization org on mg.organ_id_ = org.id_
+        left join student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
-            cto.status_ = #{status} AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
-            <if test="queryCondition != nul and queryCondition != ''">
+            cto.status_ = #{status} AND sr.music_group_id_ = #{musicGroupId} AND cto.tenant_id_ = #{tenantId}
+            <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>
             <if test="subjectId">
@@ -340,13 +356,10 @@
         left join student s on cto.student_id_ = s.user_id_
         left join sys_user u on cto.student_id_ = u.id_
         left join subject sj on s.subject_id_list_ = sj.id_
-        left join student_registration sr on s.user_id_ = sr.user_id_
-        left join music_group mg on sr.music_group_id_ = mg.id_
-        left join cooperation_organ coo on mg.cooperation_organ_id_ = coo.id_
-        left join organization org on mg.organ_id_ = org.id_
+        left join student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
-            cto.status_ = #{status} AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
-            <if test="queryCondition != nul and queryCondition != ''">
+            cto.status_ = #{status} AND sr.music_group_id_ = #{musicGroupId} AND cto.tenant_id_ = #{tenantId}
+            <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>
             <if test="subjectId">
@@ -354,22 +367,34 @@
             </if>
         </where>
     </select>
+
+    <!-- 查询订单记录 -->
     <select id="findRecordCount" resultType="java.lang.Integer">
         SELECT count(1) FROM cloud_teacher_order cto
-        LEFT JOIN tenant_order_record tor ON tor.id_ = cto.order_id_
+        LEFT JOIN tenant_order_record tor ON tor.id_ = cto.platform_order_id_
         LEFT JOIN student s ON cto.student_id_ = s.user_id_
         LEFT JOIN sys_user u ON cto.student_id_ = u.id_
         LEFT JOIN SUBJECT sj ON s.subject_id_list_ = sj.id_
         LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
-        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         <where>
-            cto.status_ = 2 AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS' and tor.order_no_ is not null
-            AND cto.type_ > 1
+            cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
+            AND sr.music_group_id_ = #{musicGroupId}
+            <if test="queryCondition != null and queryCondition != ''">
+                AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND tor.order_no_ LIKE CONCAT('%', #{orderNo}, '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                <![CDATA[ AND tor.created_time_ >= #{startTime} ]]>
+            </if>
+            <if test="endTime != null and startTime != ''">
+                <![CDATA[ AND tor.created_time_ <= #{endTime} ]]>
+            </if>
         </where>
     </select>
-    <select id="queryRecord" resultType="com.ym.mec.biz.dal.entity.CloudTeacherStudent">
+    <select id="queryRecord"  resultMap="cloudTeacherStudent">
         SELECT
-            tor.order_no_ as orderNo,
             cto.id_ AS cloudTeacherOrderId,
             cto.student_id_ AS studentId,
             cto.type_ AS type,
@@ -380,25 +405,41 @@
                 WHEN 5 THEN '年' ELSE ''
                 END AS typeName,
             cto.time_ AS time,
-            sj.id_ AS SUBJECT,
+            sj.id_ AS subject,
             sj.name_ AS subjectName,
             u.tenant_id_ AS tenantId,
-            u.username_ AS NAME,
-            u.phone_ AS phone
-        FROM
-            cloud_teacher_order cto
-                LEFT JOIN tenant_order_record tor ON tor.id_ = cto.order_id_
-                LEFT JOIN student s ON cto.student_id_ = s.user_id_
-                LEFT JOIN sys_user u ON cto.student_id_ = u.id_
-                LEFT JOIN SUBJECT sj ON s.subject_id_list_ = sj.id_
-                LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
-                LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+            u.username_ AS name,
+            u.phone_ AS phone,
+            tor.order_no_ as orderNo,
+            tor.trans_no_ as transNo,
+            tor.created_time_ as orderTime
+        FROM cloud_teacher_order cto
+        LEFT JOIN tenant_order_record tor ON tor.id_ = cto.platform_order_id_
+        LEFT JOIN student s ON cto.student_id_ = s.user_id_
+        LEFT JOIN sys_user u ON cto.student_id_ = u.id_
+        LEFT JOIN subject sj ON s.subject_id_list_ = sj.id_
+        LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
-            cto.status_ = 2 AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS' and tor.order_no_ is not null
-            AND cto.type_ > 1
+            cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
+            AND sr.music_group_id_ = #{musicGroupId}
+            <if test="queryCondition != null and queryCondition != ''">
+                AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND tor.order_no_ LIKE CONCAT('%', #{orderNo}, '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                <![CDATA[ AND tor.created_time_ >= #{startTime} ]]>
+            </if>
+            <if test="endTime != null and startTime != ''">
+                <![CDATA[ AND tor.created_time_ <= #{endTime} ]]>
+            </if>
         </where>
         <include refid="global.limit"/>
     </select>
+    <select id="checkOrdered" resultType="java.lang.Integer">
+        select count(1) from cloud_teacher_order where id_ in (${cloudTeacherStudentIds}) and status_ = 2 and platform_order_id_ is not null
+    </select>
 
     <sql id="queryCloudTeacherActiveDetailSql">
         <where>

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

@@ -84,7 +84,7 @@
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		<where>
-			tenant_id_ = #{tenantId}
+			mrofm.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>
@@ -101,7 +101,7 @@
 		SELECT COUNT(mrofm.id_) FROM member_rank_organization_fee_mapper mrofm
 		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
 		<where>
-			tenant_id_ = #{tenantId}
+			mrofm.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>

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

@@ -13,6 +13,7 @@
         <result column="operator_" property="operator"/>
         <result column="memo_" property="memo"/>
         <result column="create_time_" property="createTime"/>
+		<result column="tenant_id_" property="tenantId" />
         <result column="real_name_" property="realName"/>
     </resultMap>
 
@@ -23,14 +24,14 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupBuildLog">
-		SELECT * FROM music_group_build_log ORDER BY id_
+		SELECT * FROM music_group_build_log where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupBuildLog" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_build_log (music_group_id_,event_,operator_,memo_,create_time_)
-		VALUES(#{musicGroupId},#{event},#{operator},#{memo},now())
+		INSERT INTO music_group_build_log (music_group_id_,event_,operator_,memo_,create_time_,tenant_id_)
+		VALUES(#{musicGroupId},#{event},#{operator},#{memo},now(),#{tenantId})
 	</insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,7 +51,7 @@
                 music_group_id_ = #{musicGroupId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -60,13 +61,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupBuildLog" parameterType="map">
-        SELECT * FROM music_group_build_log ORDER BY id_
+        SELECT * FROM music_group_build_log where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_build_log
+		SELECT COUNT(*) FROM music_group_build_log where tenant_id_ = #{tenantId}
 	</select>
     <select id="findById" resultMap="MusicGroupBuildLog">
 		SELECT mgbl.*,su.real_name_ FROM music_group_build_log mgbl LEFT JOIN sys_user su ON mgbl.operator_ = su.id_

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

@@ -92,7 +92,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroup">
         SELECT *
-        FROM music_group
+        FROM music_group where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -258,10 +258,7 @@
 
     <sql id="musicGroupQueryPageSql">
         <where>
-            mg.del_flag_ = 0
-            <if test="tenantId != null">
-                AND mg.tenant_id_ = #{tenantId}
-            </if>
+            mg.del_flag_ = 0 AND mg.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(mg.organ_id_,#{organId})
             </if>
@@ -455,24 +452,12 @@
         FROM music_group
         WHERE FIND_IN_SET(id_, #{musicGroupIds})
     </select>
-    <select id="findSettlementTypeByMusicGroups" resultType="map">
-        SELECT
-        id_ AS 'key',
-        settlement_type_ AS 'value'
-        FROM
-        music_group
-        WHERE
-        id_ IN
-        <foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
-            #{musicGroupId}
-        </foreach>
-    </select>
 
     <select id="queryOrganMusicGroupNum" resultType="map">
         select count(*) total,sum(case when status_ = 'PREPARE' then 1 else 0 end) prepare_num_,sum(case when status_ =
         'PROGRESS' then 1 else 0 end) progress_num_,sum(case when status_ = 'PAUSE' then 1 else 0 end) pause_num_ from
         music_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>
@@ -482,7 +467,7 @@
         SELECT count(cs.id_) from course_schedule cs
         left join class_group cg on cs.class_group_id_ = cg.id_
         left join music_group mg on cg.music_group_id_ = mg.id_
-        where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC'
+        where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC' and cs.tenant_id_ = #{tenantId}
         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 mg.organ_id_ not in (36,38) AND cs.pre_course_flag_ = 0
         <if test="organId != null">
@@ -597,6 +582,7 @@
 
     <sql id="findMusicGroupsCondition">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="repairUserId != null">
                 AND repair_user_id_ = #{repairUserId}
             </if>
@@ -629,8 +615,9 @@
         LEFT JOIN student_registration sr ON mg.id_ = sr.music_group_id_
         LEFT JOIN organization o on o.id_ = mg.organ_id_
         <where>
+        	mg.tenant_id_ = #{tenantId}
             <if test="musicGroupStatusList != null">
-                mg.status_ IN
+                and mg.status_ IN
                 <foreach collection="musicGroupStatusList" item="musicGroupStatus" open="(" close=")"
                          separator=",">
                     #{musicGroupStatus}
@@ -711,7 +698,7 @@
         mg.name_ music_group_name_,
         mg.id_ music_group_id_
         FROM music_group mg
-        WHERE mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS')
+        WHERE mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS') and mg.tenant_id_ = #{tenantId}
         <if test="organId != null">
             AND mg.organ_id_ = #{organId}
         </if>
@@ -756,7 +743,7 @@
     <select id="queryIdsByEduIdAndOrganIds" resultType="java.lang.String">
         SELECT DISTINCT id_ FROM music_group
         <where>
-            status_ = 'PROGRESS'
+            status_ = 'PROGRESS' and tenant_id_ = #{tenantId}
             <if test="educationId != null">
                 AND educational_teacher_id_ = #{educationId}
             </if>
@@ -819,7 +806,7 @@
         LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND
         cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_
         WHERE
-        sr.music_group_status_ = 'NORMAL'
+        sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
         AND mg.status_ = 'PROGRESS'
         AND cgsm.id_ IS NULL
         <if test="organIds!=null and organIds.size()>0">
@@ -885,7 +872,7 @@
         SELECT mg.id_ musicGroupId,o.name_ organName,mg.name_ musicGroupName,mg.status_ musicGroupStatus,mg.course_view_type_ courseViewType FROM
         music_group mg
         LEFT JOIN organization o ON mg.organ_id_ = o.id_
-        WHERE status_ IN ('PRE_APPLY','PRE_BUILD_FEE','FEE_AUDIT','APPLY','PAY')
+        WHERE status_ IN ('PRE_APPLY','PRE_BUILD_FEE','FEE_AUDIT','APPLY','PAY') and tenant_id_ = #{tenantId}
         <if test="organId != null">
             AND FIND_IN_SET(mg.organ_id_,#{organId})
         </if>
@@ -942,7 +929,7 @@
     </select>
     <sql id="queryMusicMemberListSql">
         <where>
-            sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ = 2
+            sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ = 2 and sr.tenant_id_ = #{tenantId}
             AND mg.status_ = 'PROGRESS'
             <if test="search != null and search != ''">
                 AND (mg.name_ LIKE CONCAT('%',#{search},'%') OR mg.id_ LIKE CONCAT('%',#{search},'%')

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

@@ -18,6 +18,7 @@
 		<result column="real_name_" property="operatorName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,13 +28,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupNews">
-		SELECT * FROM music_group_news ORDER BY id_
+		SELECT * FROM music_group_news where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupNews" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_news (title_,status_,link_url_,order_,music_group_id_,author_,operator_id_,create_time_,update_time_)
-		VALUES(#{title},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{linkUrl},#{order},#{musicGroupId},#{author},#{operatorId},NOW(),NOW())
+		INSERT INTO music_group_news (title_,status_,link_url_,order_,music_group_id_,author_,operator_id_,create_time_,update_time_,tenant_id_)
+		VALUES(#{title},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{linkUrl},#{order},#{musicGroupId},#{author},#{operatorId},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -61,7 +62,7 @@
 		music_group_id_ = #{musicGroupId},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -74,6 +75,7 @@
 		SELECT mgn.*,su.real_name_ FROM music_group_news mgn
 		LEFT JOIN sys_user su ON  su.id_ = mgn.operator_id_
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				mgn.music_group_id_ = #{search}
 			</if>
@@ -89,6 +91,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(mgn.id_) FROM music_group_news mgn
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				mgn.music_group_id_ = #{search}
 			</if>

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

@@ -16,12 +16,13 @@
         <result column="is_student_optional_" property="isStudentOptional"/>
         <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_, music_group_organization_course_settings_id_, course_type_, course_total_minuties_,
         unit_price_, course_original_price_, course_current_price_, is_student_optional_,
-        create_time_, update_time_
+        create_time_, update_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="MusicGroupOrganizationCourseSettingsDetail">
         <!--@mbg.generated-->
@@ -42,10 +43,10 @@
         insert into music_group_organization_course_settings_detail (music_group_organization_course_settings_id_,
         course_type_, course_total_minuties_,
         unit_price_, course_original_price_, course_current_price_, is_student_optional_,
-        create_time_, update_time_)
+        create_time_, update_time_,tenant_id_)
         values (#{musicGroupOrganizationCourseSettingsId}, #{courseType}, #{courseTotalMinuties},
         #{unitPrice}, #{courseOriginalPrice}, #{courseCurrentPrice}, #{isStudentOptional},
-        NOW(),NOW())
+        NOW(),NOW(),#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettingsDetail">
         <!--@mbg.generated-->
@@ -79,34 +80,34 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         insert into music_group_organization_course_settings_detail (music_group_organization_course_settings_id_,
         course_type_, course_total_minuties_,
         unit_price_, course_original_price_, course_current_price_, is_student_optional_,
-        create_time_, update_time_)
+        create_time_, update_time_,tenant_id_)
         VALUE
         <foreach collection="settingDetails" separator="," item="settingDetail">
             (#{settingDetail.musicGroupOrganizationCourseSettingsId}, #{settingDetail.courseType},
             #{settingDetail.courseTotalMinuties},
             #{settingDetail.unitPrice}, #{settingDetail.courseOriginalPrice}, #{settingDetail.courseCurrentPrice},
             #{settingDetail.isStudentOptional},
-            NOW(),NOW())
+            NOW(),NOW(),#{tenantId})
         </foreach>
     </insert>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupOrganizationCourseSettingsDetail" parameterType="map">
-        SELECT * FROM music_group_organization_course_settings_detail ORDER BY id_
+        SELECT * FROM music_group_organization_course_settings_detail where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM music_group_organization_course_settings_detail
+        FROM music_group_organization_course_settings_detail where tenant_id_ = #{tenantId}
     </select>
 
     <delete id="deleteBySettingId" parameterType="java.lang.Integer">

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

@@ -13,11 +13,12 @@
         <result column="total_original_price_" property="totalOriginalPrice"/>
         <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_, name_, organ_id_, charge_type_id_, total_current_price_, total_original_price_,
-        create_time_, update_time_
+        create_time_, update_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="MusicGroupOrganizationCourseSettings">
         <!--@mbg.generated-->
@@ -36,9 +37,9 @@
         <!--@mbg.generated-->
         insert into music_group_organization_course_settings (name_, organ_id_, charge_type_id_, total_current_price_,
         total_original_price_,
-        create_time_, update_time_)
+        create_time_, update_time_,tenant_id_)
         values (#{name}, #{organId}, #{chargeTypeId}, #{totalCurrentPrice}, #{totalOriginalPrice},
-        NOW(),NOW())
+        NOW(),NOW(),#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettings">
         <!--@mbg.generated-->
@@ -66,7 +67,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -84,6 +85,7 @@
 
     <sql id="queryCondition">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND mgocs.organ_id_=#{organId}
             </if>

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

@@ -13,10 +13,10 @@
     <result column="original_amount_" property="originalAmount" />
     <result column="create_time_" property="createTime" />
     <result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
   </resultMap>
   <sql id="Base_Column_List">
-    id_,activity_id_,activity_name_,num_,category_name_,calender_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_
-  </sql>
+    id_, activity_id_, calender_id_, optional_flag_,actual_amount_ ,original_amount_, create_time_, update_time_,tenant_id_  </sql>
 
   <!-- 根据主键查询一条记录 -->
   <select id="get" resultMap="MusicGroupPaymentCalenderActivity" >
@@ -31,9 +31,9 @@
   <!-- 向数据库增加一条记录 -->
   <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
     INSERT INTO music_group_payment_calender_activity (activity_id_,activity_name_,num_,
-    category_name_,calender_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_)
+    category_name_,calender_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_)
     VALUES(#{activityId},#{activityName},#{num},#{categoryName},#{calenderId},#{optionalFlag},
-          #{actualAmount},#{originalAmount},NOW(),NOW())
+          #{actualAmount},#{originalAmount},NOW(),NOW(),#{tenantId})
   </insert>
 
   <!-- 根据主键查询一条记录 -->
@@ -87,13 +87,10 @@
 
   <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
           parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
-    insert into music_group_payment_calender_activity(activity_id_,activity_name_,num_,category_name_,calender_id_,
-                                                      optional_flag_,actual_amount_,original_amount_,create_time_,update_time_)
-    values
+    insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_amount_ ,original_amount_, create_time_, update_time_, tenant_id_)    values
     <foreach collection="calenderActivityList" item="entity" separator=",">
-      (#{entity.activityId},#{entity.activityName},#{entity.num},#{entity.categoryName},#{entity.calenderId},#{entity.optionalFlag},
-      #{entity.actualAmount},#{entity.originalAmount},NOW(),NOW())
-    </foreach>
+#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualAmount},
+      #{entity.originalAmount}, NOW(), NOW(),#{entity.tenantId})    </foreach>
   </insert>
   <delete id="delByCalenderId">
     DELETE FROM music_group_payment_calender_activity WHERE calender_id_ = #{calenderId}

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

@@ -18,6 +18,7 @@
 		<result column="name_" property="name" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -27,7 +28,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPaymentCalenderCourseSettings">
-		SELECT * FROM music_group_payment_calender_course_settings ORDER BY id_
+		SELECT * FROM music_group_payment_calender_course_settings where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -36,21 +37,21 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_course_settings
 		(music_group_payment_calender_id_,course_type_,course_total_minuties_,unit_price_,course_original_price_,
-		course_current_price_,is_student_optional_,create_time_,update_time_,name_)
+		course_current_price_,is_student_optional_,create_time_,update_time_,name_,tenant_id_)
 		VALUES(#{musicGroupPaymentCalenderId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseTotalMinuties},
-		#{unitPrice},#{courseOriginalPrice},#{courseCurrentPrice},#{isStudentOptional},#{createTime},#{updateTime},#{name})
+		#{unitPrice},#{courseOriginalPrice},#{courseCurrentPrice},#{isStudentOptional},#{createTime},#{updateTime},#{name},#{tenantId})
 	</insert>
 	
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
 		INSERT INTO music_group_payment_calender_course_settings
 		(music_group_payment_calender_id_,course_type_,course_total_minuties_,unit_price_,course_original_price_,
-		course_current_price_,is_student_optional_,create_time_,update_time_,name_)
+		course_current_price_,is_student_optional_,create_time_,update_time_,name_,tenant_id_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
 		(#{item.musicGroupPaymentCalenderId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		#{item.courseTotalMinuties},#{item.unitPrice},#{item.courseOriginalPrice},#{item.courseCurrentPrice},
-		#{item.isStudentOptional},NOW(),NOW(),#{item.name})
+		#{item.isStudentOptional},NOW(),NOW(),#{item.name},#{item.tenantId})
 		</foreach>
 	</insert>
 
@@ -85,7 +86,7 @@
 			</if>
 				update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -96,13 +97,13 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderCourseSettings"
 		parameterType="map">
-		SELECT * FROM music_group_payment_calender_course_settings ORDER BY id_
+		SELECT * FROM music_group_payment_calender_course_settings where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender_course_settings
+		SELECT COUNT(*) FROM music_group_payment_calender_course_settings where tenant_id_ = #{tenantId} 
 	</select>
 
     <select id="getWithPaymentCalender" resultMap="MusicGroupPaymentCalenderCourseSettings">

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

@@ -6,6 +6,7 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail"
 		id="MusicGroupPaymentCalenderDetail">
 		<result column="id_" property="id" />
+        <result column="tenant_id_" property="tenantId"/>
 		<result column="music_group_payment_calender_id_" property="musicGroupPaymentCalenderId" />
 		<result column="user_id_" property="userId" />
 		<result column="expect_amount_" property="expectAmount" />
@@ -46,7 +47,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPaymentCalenderDetail">
-		SELECT * FROM music_group_payment_calender_detail ORDER BY id_
+		SELECT * FROM music_group_payment_calender_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -56,11 +57,11 @@
 		INSERT INTO music_group_payment_calender_detail
 		(music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,
 		user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_,
-		payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_)
+		payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_,tenant_id_)
 		VALUES(#{musicGroupPaymentCalenderId},#{userId},#{expectAmount},#{actualAmount},
 		       #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		#{userStatus},#{payTime},NOW(),NOW(),#{startPaymentDate},#{deadlinePaymentDate},
-		       #{paymentOrderId},#{useInCourse},#{responsibleUserId},#{responsibleRecord},#{expectMemberAmount})
+		       #{paymentOrderId},#{useInCourse},#{responsibleUserId},#{responsibleRecord},#{expectMemberAmount},#{tenantId})
 	</insert>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
@@ -68,13 +69,13 @@
         INSERT INTO music_group_payment_calender_detail
 		(music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,
 		payment_status_,user_status_,pay_time_,update_time_,create_time_,start_payment_date_,
-		 deadline_payment_date_,payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_)
+		 deadline_payment_date_,payment_order_id_,use_in_course_,responsible_user_id_,responsible_record_,expect_member_amount_,tenant_id_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
             (#{item.musicGroupPaymentCalenderId},#{item.userId},#{item.expectAmount},
             #{item.actualAmount},#{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.userStatus},#{item.payTime},
             #{item.updateTime},#{item.createTime},#{item.startPaymentDate},#{item.deadlinePaymentDate},
-             #{item.paymentOrderId},#{item.useInCourse},#{item.responsibleUserId},#{item.responsibleRecord},#{item.expectMemberAmount})
+             #{item.paymentOrderId},#{item.useInCourse},#{item.responsibleUserId},#{item.responsibleRecord},#{item.expectMemberAmount},#{item.tenantid})
         </foreach>
     </insert>
 
@@ -132,7 +133,7 @@
 				responsible_record_ = #{responsibleRecord},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="batchUpdate">
 		<foreach collection="calenderDetails" item="item" index="index" open="" close="" separator=";">
@@ -187,7 +188,7 @@
 					responsible_record_ = #{item.responsibleRecord},
 				</if>
 			</set>
-			WHERE id_ = #{item.id}
+			WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>
 	</update>
 	<update id="refreshUserMusicGroupPaymentStatusTask">
@@ -231,7 +232,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
-			mgpc.music_group_id_ = sr.music_group_id_
+			mgpc.music_group_id_ = sr.music_group_id_ and mgpcd.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (mgpcd.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
 			</if>
@@ -436,7 +437,7 @@
 
 	<sql id="queryArrearageStudentsCondition">
 		<where>
-			mg.status_ = 'PROGRESS'
+			mg.status_ = 'PROGRESS' and mg.tenant_id_ = #{tenantId}
 			AND ((mgpc.member_rank_setting_id_ IS NOT NULL AND (sr.membership_end_time_ &lt; NOW() OR sr.membership_end_time_ IS NULL)) OR mgpc.member_rank_setting_id_ IS NULL)
 			<if test="noPaymentType==null or noPaymentType==0">
 				AND DATE_FORMAT(NOW(),'%Y-%m-%d') > DATE_FORMAT(mgpc.deadline_payment_date_,'%Y-%m-%d')
@@ -522,7 +523,7 @@
 		music_group_payment_calender_detail mgpcd
 		LEFT JOIN music_group_payment_calender mgpc ON mgpcd.music_group_payment_calender_id_ = mgpc.id_
 		LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
-		WHERE mg.status_ = 'PROGRESS'
+		WHERE mg.status_ = 'PROGRESS' and mg.tenant_id_ = #{tenantId}
 			AND DATE_FORMAT( NOW(), '%Y-%m-%d' ) >= DATE_FORMAT( mgpc.payment_valid_start_date_, '%Y-%m-%d' )
 			AND mgpcd.payment_status_ = 'NON_PAYMENT'
 			AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0 AND mgpc.pay_user_type_ = 'STUDENT'

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

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" id="MusicGroupPaymentCalender">
         <result column="id_" property="id"/>
         <result column="music_group_id_" property="musicGroupId"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="music_group_organization_course_settings_id_" property="musicGroupOrganizationCourseSettingId"/>
         <result column="pay_user_type_" property="payUserType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="start_payment_date_" property="startPaymentDate"/>
@@ -51,7 +52,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupPaymentCalender">
-		SELECT * FROM music_group_payment_calender ORDER BY id_
+		SELECT * FROM music_group_payment_calender where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -63,14 +64,14 @@
         payment_pattern_,payment_type_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,
          attribute2_,student_ids_,member_payment_amount_,member_rank_setting_id_,member_valid_date_
          ,original_member_payment_amount_,member_period_,member_optional_flag_,
-         music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_)
+         music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_)
         VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
         #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds},
                #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},#{memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-               #{memberOptionalFlag},#{musicRepairNum},#{musicRepairActualPrice},#{musicRepairOptionalFlag},#{currentTotalAmount},#{originalTotalAmount})
+               #{memberOptionalFlag},#{musicRepairNum},#{musicRepairActualPrice},#{musicRepairOptionalFlag},#{currentTotalAmount},#{originalTotalAmount},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
@@ -80,7 +81,7 @@
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_amount_,
         payment_type_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_,student_ids_,
          member_payment_amount_,member_rank_setting_id_,member_valid_date_,original_member_payment_amount_,member_period_
-        ,member_optional_flag_,music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_)
+        ,member_optional_flag_,music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.musicGroupId},#{item.musicGroupOrganizationCourseSettingId},#{item.payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.rejectReason},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -88,7 +89,7 @@
         #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentAmount},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.batchNo},#{item.auditMemo},#{item.operator},#{item.attribute1},#{item.attribute2},
          #{item.studentIds},#{item.memberPaymentAmount},#{item.memberRankSettingId},#{item.memberValidDate},#{item.originalMemberPaymentAmount},#{item.memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{item.memberOptionalFlag},#{item.musicRepairNum},#{item.musicRepairActualPrice},#{item.musicRepairOptionalFlag},#{item.currentTotalAmount},#{item.originalTotalAmount})
+            #{item.memberOptionalFlag},#{item.musicRepairNum},#{item.musicRepairActualPrice},#{item.musicRepairOptionalFlag},#{item.currentTotalAmount},#{item.originalTotalAmount},#{tenantId})
         </foreach>
     </insert>
 
@@ -194,7 +195,7 @@
                 attribute2_ = #{attribute2},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     
     <update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender">
@@ -277,7 +278,7 @@
 	                attribute2_ = #{item.attribute2},
 	            </if>
 	        </set>
-	        WHERE id_ = #{item.id}
+	        WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>
     </update>
     <update id="cutCalenderExpectNum">
@@ -320,6 +321,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	mgpc.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 AND mgpc.music_group_id_ = #{musicGroupId}
             </if>
@@ -522,7 +524,7 @@
     </resultMap>
     <sql id="MusicGroupPaymentCalenderAuditDtoSql">
         <where>
-                mgpc.batch_no_ IS NOT NULL
+                mgpc.batch_no_ IS NOT NULL and mgpc.tenant_id_ = #{tenantId}
             <if test="paymentType != null">
                 AND mgpc.payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

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

@@ -18,6 +18,7 @@
 		<result column="original_amount_" property="originalAmount" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,15 +28,15 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPaymentCalenderMember">
-		SELECT * FROM music_group_payment_calender_member ORDER BY id_
+		SELECT * FROM music_group_payment_calender_member where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_member (calender_id_,name_,num_,period_,
-		member_rank_setting_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_)
+		member_rank_setting_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_)
 		VALUES(#{calenderId},#{name},#{num},#{period,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memberRankSettingId},#{optionalFlag},#{actualAmount},
-		       #{originalAmount},NOW(),NOW())
+		       #{originalAmount},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -66,7 +67,7 @@
 		name_ = #{name},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -79,12 +80,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderMember" parameterType="map">
-		SELECT * FROM music_group_payment_calender_member ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_calender_member where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender_member
+		SELECT COUNT(*) FROM music_group_payment_calender_member  where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByCalenderId" resultMap="MusicGroupPaymentCalenderMember">
 		SELECT * FROM music_group_payment_calender_member WHERE calender_id_ = #{calenderId}

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

@@ -15,6 +15,7 @@
 		<result column="original_amount_" property="originalAmount" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -24,13 +25,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPaymentCalenderRepair">
-		SELECT * FROM music_group_payment_calender_repair ORDER BY id_
+		SELECT * FROM music_group_payment_calender_repair where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderRepair" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_payment_calender_repair (calender_id_,num_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_)
-		VALUES(#{calenderId},#{num},#{optionalFlag},#{actualAmount},#{originalAmount},NOW(),NOW())
+		INSERT INTO music_group_payment_calender_repair (calender_id_,num_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_)
+		VALUES(#{calenderId},#{num},#{optionalFlag},#{actualAmount},#{originalAmount},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -52,7 +53,7 @@
 		original_amount_ = #{originalAmount},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -65,12 +66,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderRepair" parameterType="map">
-		SELECT * FROM music_group_payment_calender_repair ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_calender_repair where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender_repair
+		SELECT COUNT(*) FROM music_group_payment_calender_repair where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByCalenderId" resultMap="MusicGroupPaymentCalenderRepair">
 		SELECT * FROM music_group_payment_calender_repair WHERE calender_id_ = #{calenderId}

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

@@ -20,6 +20,7 @@
 		<result column="batch_no_" property="batchNo" />
 		<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="MusicGroupPaymentCalenderStudentDetail">
-		SELECT * FROM music_group_payment_calender_student_detail ORDER BY id_
+		SELECT * FROM music_group_payment_calender_student_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_student_detail (id_,user_id_,phone_,username_,course_original_price_,
-																 course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_)
+																 course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_,tenant_id_)
 		VALUES(#{id},#{userId},#{phone},#{username},#{courseOriginalPrice},#{courseCurrentPrice},
-			   #{courseType},#{courseTime},#{classGroupId},#{batchNo},NOW(),NOW(),#{masterSubCoursePrice})
+			   #{courseType},#{courseTime},#{classGroupId},#{batchNo},NOW(),NOW(),#{masterSubCoursePrice},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -74,7 +75,7 @@
 		username_ = #{username},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -84,20 +85,20 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderStudentDetail" parameterType="map">
-		SELECT * FROM music_group_payment_calender_student_detail ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_calender_student_detail where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender_student_detail
+		SELECT COUNT(*) FROM music_group_payment_calender_student_detail where tenant_id_ = #{tenantId}
 	</select>
 	<insert id="batchInsert">
 		INSERT INTO music_group_payment_calender_student_detail (user_id_,phone_,username_,course_original_price_,
-		course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_)
+		course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_,tenant_id_)
 		VALUES
 		<foreach collection="musicGroupPaymentCalenderStudentDetails" item="item" index="index" separator=",">
 			(#{item.userId},#{item.phone},#{item.username},#{item.courseOriginalPrice},#{item.courseCurrentPrice},
-			#{item.courseType},#{item.courseTime},#{item.classGroupId},#{batchNo},NOW(),NOW(),#{item.masterSubCoursePrice})
+			#{item.courseType},#{item.courseTime},#{item.classGroupId},#{batchNo},NOW(),NOW(),#{item.masterSubCoursePrice},#{item.tenantId})
 		</foreach>
 	</insert>
 
@@ -113,7 +114,7 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-			WHERE id_ = #{item.id}
+			WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>
 	</update>
 	<update id="updateByCourseType">

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

@@ -15,6 +15,7 @@
 		<result column="memo_" property="memo" />
 		<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="MusicGroupPaymentEntities">
-		SELECT * FROM music_group_payment_entities ORDER BY id_
+		SELECT * FROM music_group_payment_entities where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentEntities" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_)
-		VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},now(),now())
+		INSERT INTO music_group_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},now(),now(),#{tenantId})
 	</insert>
     <insert id="batchAdd">
-		INSERT INTO music_group_payment_entities (music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_)
+		INSERT INTO music_group_payment_entities (music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="entities" item="item" separator=",">
-			(#{musicGroupId},#{item.name},#{item.paymentMethod.code},#{item.amount},#{item.memo},now(),now())
+			(#{musicGroupId},#{item.name},#{item.paymentMethod.code},#{item.amount},#{item.memo},now(),now(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -63,7 +64,7 @@
 				name_ = #{name},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -76,12 +77,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentEntities" parameterType="map">
-		SELECT * FROM music_group_payment_entities ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_entities where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_entities
+		SELECT COUNT(*) FROM music_group_payment_entities  where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByMusicGroupId" resultMap="MusicGroupPaymentEntities">
 		SELECT * FROM music_group_payment_entities WHERE music_group_id_ = #{musicGroupId}

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

@@ -18,6 +18,7 @@
         <result column="used_course_minutes_" property="usedCourseMinutes"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -30,7 +31,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupPaymentStudentCourseDetail">
         SELECT *
-        FROM music_group_payment_student_course_detail
+        FROM music_group_payment_student_course_detail where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -40,22 +41,22 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_payment_student_course_detail
         (music_group_payment_calender_id_,music_group_payment_calender_detail_id_,user_id_,course_type_,
-         total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_)
+         total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_,tenant_id_)
         VALUES(#{musicGroupPaymentCalenderId},#{musicGroupPaymentCalenderDetailId},#{userId},
                #{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{totalCourseMinutes},#{usedCourseMinutes},
-               NOW(),NOW(),#{courseOriginalPrice},#{courseCurrentPrice})
+               NOW(),NOW(),#{courseOriginalPrice},#{courseCurrentPrice},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO music_group_payment_student_course_detail
         (music_group_payment_calender_id_,music_group_payment_calender_detail_id_,user_id_,
-         course_type_,total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_)
+         course_type_,total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_,tenant_id_)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.musicGroupPaymentCalenderId},#{item.musicGroupPaymentCalenderDetailId},
              #{item.userId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-             #{item.totalCourseMinutes},#{item.usedCourseMinutes},NOW(),NOW(),#{item.courseOriginalPrice},#{item.courseCurrentPrice})
+             #{item.totalCourseMinutes},#{item.usedCourseMinutes},NOW(),NOW(),#{item.courseOriginalPrice},#{item.courseCurrentPrice},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -90,7 +91,7 @@
             </if>
                 update_time_ = NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="batchUpdate"
@@ -124,7 +125,7 @@
                 </if>
                 update_time_ = NOW()
             </set>
-            WHERE id_ = #{paymentCourseDetail.id}
+            WHERE id_ = #{paymentCourseDetail.id} and tenant_id_ = #{paymentCourseDetail.tenantId}
         </foreach>
     </update>
     <update id="updateByCourseType">
@@ -171,14 +172,14 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupPaymentStudentCourseDetail"
             parameterType="map">
-        SELECT * FROM music_group_payment_student_course_detail ORDER BY id_
+        SELECT * FROM music_group_payment_student_course_detail where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM music_group_payment_student_course_detail
+        FROM music_group_payment_student_course_detail where tenant_id_ = #{tenantId}
     </select>
 
     <select id="getUnUseWithStudentAndCourseTypeAndCourseMinutes" resultMap="MusicGroupPaymentStudentCourseDetail">

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

@@ -20,6 +20,7 @@
 		<result column="organ_name_" property="organName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -29,13 +30,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPerformance">
-		SELECT * FROM music_group_performance ORDER BY id_
+		SELECT * FROM music_group_performance where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPerformance" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_performance (music_group_id_,name_,music_score_name_,operator_,order_,start_time_,create_time_,update_time_)
-		VALUES(#{musicGroupId},#{name},#{musicScoreName},#{operator},#{order},#{startTime},NOW(),NOW())
+		INSERT INTO music_group_performance (music_group_id_,name_,music_score_name_,operator_,order_,start_time_,create_time_,update_time_,tenant_id_)
+		VALUES(#{musicGroupId},#{name},#{musicScoreName},#{operator},#{order},#{startTime},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -60,7 +61,7 @@
 		start_time_ = #{startTime},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -73,6 +74,7 @@
 		SELECT mgp.*,su.real_name_ operator_name_ FROM music_group_performance mgp
 		LEFT JOIN sys_user su ON  su.id_ = mgp.operator_
 		<where>
+			mgp.tenant_id_ = #{tenantId}
 			<if test="musicGroupId != null and musicGroupId != ''">
 				AND mgp.music_group_id_ = #{musicGroupId}
 			</if>
@@ -85,6 +87,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(mgp.id_) FROM music_group_performance mgp
 		<where>
+			mgp.tenant_id_ = #{tenantId}
 			<if test="musicGroupId != null and musicGroupId != ''">
 				AND mgp.music_group_id_ = #{musicGroupId}
 			</if>
@@ -94,9 +97,7 @@
 		SELECT mgp.* FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
 		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
-		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
-		</if>
 		<if test="organIds != null and organIds != ''">
 			AND FIND_IN_SET(mg.organ_id_,#{organIds})
 		</if>
@@ -106,7 +107,7 @@
 		FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
 		LEFT JOIN organization o ON o.id_ = mg.organ_id_
-		WHERE DATEDIFF(DATE_FORMAT(mgp.start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
+		WHERE DATEDIFF(DATE_FORMAT(mgp.start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0 and mgp.tenant_id_ = #{tenantId}
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>
@@ -121,7 +122,7 @@
 	<select id="countNoStart" resultType="java.lang.Integer">
 		SELECT COUNT(mgp.id_) FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
-		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
+		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0 and mgp.tenant_id_ = #{tenantId}
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>

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

@@ -13,6 +13,7 @@
         <result column="purchase_num_" property="purchaseNum"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -25,7 +26,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupPurchaseList">
         SELECT *
-        FROM music_group_purchase_list
+        FROM music_group_purchase_list where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -37,8 +38,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{goodsId},#{purchaseNum},now(),now())
+        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_,tenant_id_)
+        VALUES(#{id},#{musicGroupId},#{goodsId},#{purchaseNum},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -58,7 +59,7 @@
                 goods_id_ = #{goodsId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -72,8 +73,9 @@
     <select id="queryPage" resultMap="MusicGroupPurchaseList" parameterType="map">
         SELECT * FROM music_group_purchase_list
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId}
+                and music_group_id_ = #{musicGroupId}
             </if>
         </where>
         ORDER BY id_
@@ -84,18 +86,19 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(*) FROM music_group_purchase_list
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId}
+                and music_group_id_ = #{musicGroupId}
             </if>
         </where>
     </select>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPurchaseList" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_)
+        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_,tenant_id_)
         VALUES
         <foreach collection="musicGroupPurchaseLists" item="item" index="index" separator=",">
-            (#{item.id},#{item.musicGroupId},#{item.goodsId},#{item.purchaseNum},now(),now())
+            (#{item.id},#{item.musicGroupId},#{item.goodsId},#{item.purchaseNum},now(),now(),#{item.tenantId})
         </foreach>
     </insert>
 

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

@@ -16,6 +16,7 @@
 		<result column="question_time_" property="questionTime" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,13 +28,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupQuestionnaire">
-		SELECT * FROM music_group_questionnaire ORDER BY id_
+		SELECT * FROM music_group_questionnaire where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_questionnaire (questionnaire_topic_id_,music_group_id_,target_,operator_id_,question_time_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{musicGroupId},#{target},#{operatorId},#{questionTime},NOW(),NOW())
+		INSERT INTO music_group_questionnaire (questionnaire_topic_id_,music_group_id_,target_,operator_id_,question_time_,create_time_,update_time_,tenant_id_)
+		VALUES(#{questionnaireTopicId},#{musicGroupId},#{target},#{operatorId},#{questionTime},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -73,6 +74,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
+			mgq.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mgq.music_group_id_ = #{search}
 			</if>

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

@@ -6,6 +6,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupQuit"
                id="MusicGroupQuit">
         <result column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="user_id_" property="userId"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="join_date_" property="joinDate"/>
@@ -40,7 +41,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupQuit">
         SELECT *
-        FROM music_group_quit
+        FROM music_group_quit where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -48,9 +49,9 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuit"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_quit
-        (id_,user_id_,music_group_id_,join_date_,quit_date_,create_time_,reason_,user_comment_,status_,apply_user_id_,is_visit_,visit_time_,fee_json_,current_approve_role_,return_total_fee_)
+        (id_,user_id_,music_group_id_,join_date_,quit_date_,create_time_,reason_,user_comment_,status_,apply_user_id_,is_visit_,visit_time_,fee_json_,current_approve_role_,return_total_fee_,tenant_id_)
         VALUES(#{id},#{userId},#{musicGroupId},#{joinDate},#{quitDate},#{createTime},#{reason},#{userComment},
-        #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{applyUserId},#{isVisit},#{visitTime},#{feeJson},#{currentApproveRole},#{returnTotalFee})
+        #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{applyUserId},#{isVisit},#{visitTime},#{feeJson},#{currentApproveRole},#{returnTotalFee},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -97,7 +98,7 @@
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -121,6 +122,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="ids != null and ids != ''">
                 AND FIND_IN_SET(mgq.id_,#{ids})
             </if>

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

@@ -16,6 +16,7 @@
 		<result column="total_course_time_" property="totalCourseTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -25,14 +26,14 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupSchoolTermCourseDetail">
-		SELECT * FROM music_group_school_term_course_detail ORDER BY id_
+		SELECT * FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupSchoolTermCourseDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_school_term_course_detail (music_group_id_,start_course_date_,start_school_term_,
-	   end_school_term_,course_flag_,total_course_time_,update_time_,create_time_)
-	   VALUES(#{musicGroupId},#{startCourseDate},#{startSchoolTerm},#{endSchoolTerm},#{courseFlag},#{totalCourseTime},NOW(),NOW())
+	   end_school_term_,course_flag_,total_course_time_,update_time_,create_time_,tenant_id_)
+	   VALUES(#{musicGroupId},#{startCourseDate},#{startSchoolTerm},#{endSchoolTerm},#{courseFlag},#{totalCourseTime},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -57,7 +58,7 @@
 			music_group_id_ = #{musicGroupId},
 		</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -67,12 +68,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupSchoolTermCourseDetail" parameterType="map">
-		SELECT * FROM music_group_school_term_course_detail ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_school_term_course_detail
+		SELECT COUNT(*) FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId}
 	</select>
 	<select id="findByMusicGroupId" resultMap="MusicGroupSchoolTermCourseDetail">
 		SELECT * FROM music_group_school_term_course_detail
@@ -93,7 +94,7 @@
 		WHERE course_flag_ = 0
 	</select>
     <select id="queryPushCourseTermMusicIds" resultType="java.lang.String">
-		SELECT music_group_id_ FROM music_group_school_term_course_detail
+		SELECT music_group_id_ FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId}
 		GROUP BY music_group_id_ HAVING DATEDIFF(MAX(end_school_term_),NOW()) = #{remindCourseTime}
 	</select>
 </mapper>

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

@@ -16,6 +16,7 @@
 		<result column="single_course_minutes_" property="singleCourseMinutes" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -25,22 +26,22 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupSchoolTermStudentCourseDetail">
-		SELECT * FROM music_group_school_term_student_course_detail ORDER BY id_
+		SELECT * FROM music_group_school_term_student_course_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupSchoolTermStudentCourseDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_school_term_student_course_detail
 		    (music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,
-		   pre_member_course_minutes_,mix_course_minutes_,single_course_minutes_,create_time_,update_time_)
-		   VALUES(#{musicGroupSchoolTermCourseDetailId},#{userId},#{memberCourseMinutes},#{preMemberCourseMinutes},#{mixCourseMinutes},#{singleCourseMinutes},NOW(),NOW())
+		   pre_member_course_minutes_,mix_course_minutes_,single_course_minutes_,create_time_,update_time_,tenant_id_)
+		   VALUES(#{musicGroupSchoolTermCourseDetailId},#{userId},#{memberCourseMinutes},#{preMemberCourseMinutes},#{mixCourseMinutes},#{singleCourseMinutes},NOW(),NOW(),#{tenantId})
 	</insert>
 	<insert id="init">
 		INSERT INTO music_group_school_term_student_course_detail
-		(music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,create_time_,update_time_)
+		(music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="studentIds" item="userId" separator=",">
-			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW())
+			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -66,7 +67,7 @@
 			pre_member_course_minutes_ = #{preMemberCourseMinutes},
 		</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
     <update id="updateMinutes">
 		UPDATE music_group_school_term_student_course_detail SET pre_member_course_minutes_ = #{preMemberCourseMinutes} + pre_member_course_minutes_,
@@ -105,12 +106,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupSchoolTermStudentCourseDetail" parameterType="map">
-		SELECT * FROM music_group_school_term_student_course_detail ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_school_term_student_course_detail where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_school_term_student_course_detail
+		SELECT COUNT(*) FROM music_group_school_term_student_course_detail where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="getMixCourseMinutes" resultType="java.lang.Integer">

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

@@ -25,6 +25,7 @@
 		<result column="master_class_group_id_" property="masterClassGroupId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -34,17 +35,17 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupStudentClassAdjust">
-		SELECT * FROM music_group_student_class_adjust ORDER BY id_
+		SELECT * FROM music_group_student_class_adjust where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentClassAdjust" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_student_class_adjust (music_group_id_,batch_no_,new_class_group_json_,
 		class_group_ids_,student_ids_,class_course_minute_,all_lock_course_ids_,sub_lock_course_ids_,
-		operator_id_,student_payment_ids_,class_group_students_,default_course_type_minute_,master_class_group_id_,master_class_course_times_,master_total_price_,create_time_,update_time_)
+		operator_id_,student_payment_ids_,class_group_students_,default_course_type_minute_,master_class_group_id_,master_class_course_times_,master_total_price_,create_time_,update_time_,tenant_id_)
 		VALUES(#{musicGroupId},#{batchNo},#{newClassGroupJson},#{classGroupIds},#{studentIds},
 		#{classCourseMinute},#{allLockCourseIds},#{subLockCourseIds},#{operatorId},#{studentPaymentIds},#{classGroupStudents},
-			   #{defaultCourseTypeMinute},#{masterClassGroupId},#{masterClassCourseTimes},#{masterTotalPrice},NOW(),NOW())
+			   #{defaultCourseTypeMinute},#{masterClassGroupId},#{masterClassCourseTimes},#{masterTotalPrice},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -93,7 +94,7 @@
 		music_group_id_ = #{musicGroupId},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -103,12 +104,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupStudentClassAdjust" parameterType="map">
-		SELECT * FROM music_group_student_class_adjust ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_student_class_adjust where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_student_class_adjust
+		SELECT COUNT(*) FROM music_group_student_class_adjust where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByBatchNo" resultMap="MusicGroupStudentClassAdjust">
 		SELECT * FROM music_group_student_class_adjust WHERE FIND_IN_SET(#{batchNo},batch_no_)

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

@@ -8,6 +8,7 @@
 
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupStudentFee" id="MusicGroupStudentFee">
         <result column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="user_id_" property="userId"/>
         <result column="subject_id_" property="subjectId"/>
@@ -36,7 +37,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupStudentFee">
-		SELECT * FROM music_group_student_fee_ ORDER BY id_
+		SELECT * FROM music_group_student_fee_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -44,19 +45,19 @@
             keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,
 		update_time_,next_payment_date_,latest_paid_time_,continuous_absenteeism_times_,subject_id_,
-		payment_status_,temporary_course_fee_,payment_period_list_,remain_network_class_times_)
+		payment_status_,temporary_course_fee_,payment_period_list_,remain_network_class_times_,tenant_id_)
 		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime},
 		#{continuousAbsenteeismTimes},#{subjectId},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{temporaryCourseFee},#{paymentPeriodList},#{remainNetworkClassTimes})
+		#{temporaryCourseFee},#{paymentPeriodList},#{remainNetworkClassTimes},#{tenantId})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee">
         INSERT INTO music_group_student_fee_ (music_group_id_,user_id_,create_time_,update_time_,next_payment_date_,
-        subject_id_,payment_status_,course_fee_,payment_period_list_,remain_network_class_times_)
+        subject_id_,payment_status_,course_fee_,payment_period_list_,remain_network_class_times_,tenant_id_)
 		VALUES
 		<foreach collection="musicGroupStudentFees" item="item" separator=",">
             (#{item.musicGroupId},#{item.userId},NOW(),NOW(),#{nextPaymentDate},#{item.subjectId},
-            #{paymentStatus},#{item.courseFee},#{item.paymentPeriodList},#{item.remainNetworkClassTimes})
+            #{paymentStatus},#{item.courseFee},#{item.paymentPeriodList},#{item.remainNetworkClassTimes},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -104,7 +105,7 @@
                 payment_period_list_ = #{paymentPeriodList},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     
     <update id="updateStudentAbsenteeismTimes">
@@ -180,12 +181,6 @@
         update music_group_student_fee_ set next_payment_date_ = #{nextPaymentDate},update_time_ = now() WHERE music_group_id_ = #{musicGroupId}
     </update>
 
-    <select id="queryWillRenewList" resultMap="MusicGroupStudentFee">
-        SELECT * FROM music_group_student_fee_
-        WHERE next_payment_date_ IS NOT NULL AND payment_status_ = 'PAID_COMPLETED'
-        and date_add(now(), interval #{days} day) >= next_payment_date_
-    </select>
-
     <select id="countContinuosAbsenteeismStudentNum" resultType="java.util.Map">
         SELECT
             music_group_id_ AS 'key',

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

@@ -20,6 +20,7 @@
         <result column="group_remission_course_fee_" property="groupRemissionCourseFee"/>
         <result column="kit_group_purchase_type_json_" property="kitGroupPurchaseTypeJson"/>
         <result column="course_purchase_type_json_" property="coursePurchaseTypeJson"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -31,7 +32,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupSubjectGoodsGroup">
         SELECT *
-        FROM music_group_subject_goods_group
+        FROM music_group_subject_goods_group where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -40,16 +41,16 @@
             parameterType="com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_subject_goods_group
-        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_)
-        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price},#{depositFee},#{remissionCourseFee},#{kitGroupPurchaseTypeJson},#{coursePurchaseTypeJson})
+        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_,tenant_id_)
+        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price},#{depositFee},#{remissionCourseFee},#{kitGroupPurchaseTypeJson},#{coursePurchaseTypeJson},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="java.util.List">
         INSERT INTO music_group_subject_goods_group
-        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,group_remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_) VALUES
+        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,group_remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_,tenant_id_) VALUES
         <foreach collection="lists" item="item" index="index" separator=",">
             (#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.groupRemissionCourseFee},#{item.kitGroupPurchaseTypeJson},#{item.coursePurchaseTypeJson})
+            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.groupRemissionCourseFee},#{item.kitGroupPurchaseTypeJson},#{item.coursePurchaseTypeJson},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -89,7 +90,7 @@
                 name_ = #{name},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -103,14 +104,14 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupSubjectGoodsGroup"
             parameterType="map">
-        SELECT * FROM music_group_subject_goods_group ORDER BY id_
+        SELECT * FROM music_group_subject_goods_group where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM music_group_subject_goods_group
+        FROM music_group_subject_goods_group where tenant_id_ = #{tenantId}
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup" extends="MusicGroupSubjectGoodsGroup" id="findGoodsGroupMap">

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

@@ -22,6 +22,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="version" property="version"/>
         <result column="sub_name_" property="subName"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -32,7 +33,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupSubjectPlan">
         SELECT *
-        FROM music_group_subject_plan
+        FROM music_group_subject_plan where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -40,16 +41,16 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO music_group_subject_plan
-        (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},now(),now())
+        (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_,tenant_id_)
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},now(),now(),#{tenantId})
     </insert>
     <insert id="batchAdd">
         INSERT INTO music_group_subject_plan
-        (music_group_id_,subject_id_,expected_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
+        (music_group_id_,subject_id_,expected_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_,tenant_id_)
         VALUES
         <foreach collection="subjectPlans" item="item" separator=",">
             (#{musicGroupId},#{item.subjectId},#{item.expectedStudentNum},#{item.fee},#{item.kitGroupPurchaseType},
-            #{item.depositFee},now(),now())
+            #{item.depositFee},now(),now(),#{tenantId})
         </foreach>
     </insert>
 
@@ -92,7 +93,7 @@
                 version = version+1,
             </if>
         </set>
-        WHERE id_ = #{id} AND version =#{version}
+        WHERE id_ = #{id} AND version =#{version} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="updateExpectedStudentNum">
@@ -122,14 +123,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupSubjectPlan" parameterType="map">
-        SELECT * FROM music_group_subject_plan ORDER BY id_
+        SELECT * FROM music_group_subject_plan where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM music_group_subject_plan
+        FROM music_group_subject_plan where tenant_id_ = #{tenantId}
     </select>
 
     <!-- 查询乐团科目计划表 -->

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

@@ -16,6 +16,7 @@
 		<result column="end_school_term_" property="endSchoolTerm" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,6 +28,7 @@
 	<select id="findAll" resultMap="MusicGroupTrainPlan">
 		SELECT * FROM music_group_train_plan
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="classGroupId != null">
 				AND class_group_id_ = #{classGroupId}
 			</if>
@@ -45,6 +47,7 @@
 	<select id="findAllPlan" resultType="java.lang.String">
 		SELECT plan_ FROM music_group_train_plan
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="classGroupId != null">
 				AND class_group_id_ = #{classGroupId}
 			</if>
@@ -63,14 +66,14 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupTrainPlan" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_)
-		VALUES(#{musicGroupId},#{classGroupId},#{courseType},#{plan},#{startSchoolTerm},#{endSchoolTerm},NOW(),NOW())
+		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_,tenant_id_)
+		VALUES(#{musicGroupId},#{classGroupId},#{courseType},#{plan},#{startSchoolTerm},#{endSchoolTerm},NOW(),NOW(),#{tenantId})
 	</insert>
     <insert id="add">
-		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_)
+		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_,tenant_id_)
 		VALUES
 		<foreach collection="dto.plans" separator="," item="plan">
-			(#{dto.musicGroupId},#{dto.classGroupId},#{dto.courseScheduleType},#{plan},#{dto.startSchoolTerm},#{dto.endSchoolTerm},NOW(),NOW())
+			(#{dto.musicGroupId},#{dto.classGroupId},#{dto.courseScheduleType},#{plan},#{dto.startSchoolTerm},#{dto.endSchoolTerm},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -96,7 +99,7 @@
 		music_group_id_ = #{musicGroupId},
 		</if>
 		update_time_ = NOW(),
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -106,12 +109,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupTrainPlan" parameterType="map">
-		SELECT * FROM music_group_train_plan ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_train_plan where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_train_plan
+		SELECT COUNT(*) FROM music_group_train_plan where tenant_id_ = #{tenantId}
 	</select>
 	<resultMap id="WaitCourseTrainPlanDto" type="com.ym.mec.biz.dal.dto.WaitCourseTrainPlanDto">
 		<result property="classGroupId" column="class_group_id_"/>
@@ -179,6 +182,7 @@
 	<select id="queryPlan" resultMap="MusicGroupTrainPlan">
 		SELECT * FROM music_group_train_plan
 		<where>
+			tenant_id_ = #{schoolTerm.tenantId}
 			<if test="schoolTerm.startSchoolTerm != null">
 				AND start_school_term_ = #{schoolTerm.startSchoolTerm}
 			</if>

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

@@ -22,13 +22,14 @@
         <result column="profit_" property="profit"/>
         <result column="month_" property="month"/>
         <result column="create_time_" property="createTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, organ_id_, cooperation_organ_id_, sell_amount_, service_amount_,other_income_, refund_amount_,
         income_total_,
         sell_cost_, expenses_amount_, variable_cost_, distribution_amount_, cost_amount_,
-        profit_, month_, create_time_
+        profit_, month_, create_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="OperatingReport">
         <!--@mbg.generated-->
@@ -48,10 +49,10 @@
         insert into operating_report (organ_id_, cooperation_organ_id_, sell_amount_, service_amount_,other_income_,
         refund_amount_,
         income_total_, sell_cost_, expenses_amount_, variable_cost_, distribution_amount_,
-        cost_amount_, profit_, month_, create_time_)
+        cost_amount_, profit_, month_, create_time_,tenant_id_)
         values (#{organId}, #{cooperationOrganId}, #{sellAmount}, #{serviceAmount},#{otherIncome}, #{refundAmount},
         #{incomeTotal}, #{sellCost}, #{expensesAmount}, #{variableCost}, #{distributionAmount},
-        #{costAmount}, #{profit}, #{month}, #{createTime})
+        #{costAmount}, #{profit}, #{month}, #{createTime},#{tenantId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.OperatingReport">
@@ -104,7 +105,7 @@
                 create_time_ = #{createTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
 
@@ -126,6 +127,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	opr.tenant_id_ = #{tenantId}
             <if test="organIdList != null and organIdList != ''">
                 AND FIND_IN_SET(opr.organ_id_,#{organIdList})
             </if>
@@ -149,9 +151,7 @@
     <select id="getReport" resultMap="OperatingReport" parameterType="map">
         SELECT * FROM operating_report
         <where>
-            <if test="organId != null">
-                AND organ_id_ = #{organId}
-            </if>
+        	organ_id_ = #{organId}
             <if test="cooperationOrganId != null">
                 AND cooperation_organ_id_ = #{cooperationOrganId}
             </if>

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

@@ -10,6 +10,7 @@
         <result column="plus_price_" property="plusPrice"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="organName" property="organName"/>
     </resultMap>
 
@@ -23,7 +24,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="OrganizationCloudTeacherFee">
         SELECT *
-        FROM organization_cloud_teacher_fee
+        FROM organization_cloud_teacher_fee where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -31,8 +32,8 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.OrganizationCloudTeacherFee"
             useGeneratedKeys="true" keyColumn="id_" keyProperty="id">
         INSERT INTO organization_cloud_teacher_fee
-            (organ_id_, price_,plus_price_, create_time_, update_time_)
-        VALUES (#{organId}, #{price},#{plusPrice}, NOW(), NOW())
+            (organ_id_, price_,plus_price_, create_time_, update_time_,tenant_id_)
+        VALUES (#{organId}, #{price},#{plusPrice}, NOW(), NOW(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -47,7 +48,7 @@
             </if>
             update_time_=NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -74,6 +75,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	octf.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(octf.organ_id_,#{organId})
             </if>

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

@@ -11,6 +11,7 @@
         <result column="duration_" property="duration"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="organ_name_" property="organ.name"/>
     </resultMap>
 
@@ -24,7 +25,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="OrganizationCourseDurationSettings">
         SELECT *
-        FROM organization_course_duration_settings
+        FROM organization_course_duration_settings where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -34,8 +35,8 @@
         <!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
             AS ID FROM DUAL </selectKey> -->
         INSERT INTO organization_course_duration_settings
-        (id_,organ_id_,course_type_,duration_,create_time_,update_time_)
-        VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{duration},now(),now())
+        (id_,organ_id_,course_type_,duration_,create_time_,update_time_,tenant_id_)
+        VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{duration},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -61,7 +62,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -76,6 +77,7 @@
         SELECT ocds.*,o.name_ organ_name_ FROM organization_course_duration_settings ocds
         LEFT JOIN organization o on ocds.organ_id_ = o.id_
         <where>
+        	ocds.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 and ocds.organ_id_ = #{organId}
             </if>
@@ -91,6 +93,7 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(ups.id_) FROM organization_course_duration_settings ups
         <where>
+        	ups.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 and ups.organ_id_ = #{organId}
             </if>

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

@@ -11,6 +11,7 @@
 		<result column="unit_price_" property="unitPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 		<result column="organ_name_" property="organ.name" />
 		<result column="charge_type_name_" property="chargeType.name" />
 	</resultMap>
@@ -22,7 +23,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="OrganizationCourseUnitPriceSettings">
-		SELECT * FROM organization_course_unit_price_settings ORDER BY id_
+		SELECT * FROM organization_course_unit_price_settings where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -30,16 +31,16 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO organization_course_unit_price_settings
-		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_)
-		VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{chargeTypeId},#{unitPrice},now(),now())
+		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{chargeTypeId},#{unitPrice},now(),now(),#{tenantId})
 	</insert>
 	
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO organization_course_unit_price_settings
-		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_)
+		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
-		(#{item.id},#{item.organId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.chargeTypeId},#{item.unitPrice},now(),now())
+		(#{item.id},#{item.organId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.chargeTypeId},#{item.unitPrice},now(),now(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -69,7 +70,7 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -82,6 +83,7 @@
 		SELECT ups.*,o.name_ organ_name_ ,ct.name_ charge_type_name_ FROM organization_course_unit_price_settings ups left join organization o on ups.organ_id_ = o.id_
 		left join charge_type ct on ct.id_ = ups.charge_type_id_
 		<where>
+			ups.tenant_id_ = #{tenantId}
 			<if test="organId != null">
 				and ups.organ_id_ = #{organId}
 			</if>
@@ -100,6 +102,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(ups.id_) FROM organization_course_unit_price_settings ups
 		<where>
+			ups.tenant_id_ = #{tenantId}
 			<if test="organId != null">
 				and ups.organ_id_ = #{organId}
 			</if>

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

@@ -14,6 +14,7 @@
         <result column="theory_" property="theory"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <select id="get" parameterType="java.lang.Integer" resultMap="OrganizationDegreeCourseFee">
         <!--@mbg.generated-->
@@ -30,9 +31,9 @@
             parameterType="com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into organization_degree_course_fee (organ_id_,original_vip_1v1_,original_vip_1v2_, vip_1v1_,
-        vip_1v2_,theory_, create_time_, update_time_)
+        vip_1v2_,theory_, create_time_, update_time_, tenant_id_)
         values (#{organId},#{originalVip1v1},#{originalVip1v2}, #{vip1v1},#{vip1v2}, #{theory}, #{createTime},
-        #{updateTime})
+        #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee">
         <!--@mbg.generated-->
@@ -63,7 +64,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="getByOrganId" resultMap="OrganizationDegreeCourseFee">

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

@@ -37,7 +37,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="Organization">
-		SELECT * FROM organization ORDER BY id_
+		SELECT * FROM organization where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -92,7 +92,7 @@
                 grade_type_ = #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -102,6 +102,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	o.tenant_id_ = #{tenantId}
             <if test="delFlag != null">
                 and o.del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
@@ -138,9 +139,7 @@
         SELECT * FROM organization o
         <where>
             o.del_flag_ = 0
-            <if test="userId != null">
                 AND FIND_IN_SET(o.id_,(SELECT GROUP_CONCAT(organ_id_list_) FROM employee e WHERE e.user_id_ = #{userId}))
-            </if>
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(o.id_,#{organId})
             </if>
@@ -163,7 +162,7 @@
     </select>
     
     <select id="findAllOrgans" resultMap="Organization">
-        SELECT * from organization where del_flag_=0 ORDER BY id_ ASC;
+        SELECT * from organization where del_flag_=0 and tenant_id_ = #{tenantId} ORDER BY id_ ASC;
     </select>
 
     <select id="findOrgans" resultMap="Organization">
@@ -175,7 +174,7 @@
 
     <select id="getOrgans" resultMap="Organization">
         SELECT * FROM organization
-        WHERE 1=1
+        WHERE tenant_id_ = #{tenantId}
          <if test="organIds!=null and organIds.size()>0">
              AND id_ IN
              <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -184,8 +183,4 @@
          </if>
     </select>
 
-    <select id="getActivityOrgans" resultMap="Organization">
-        SELECT o.* FROM practice_group_sell_price pgsp
-        LEFT JOIN organization o ON pgsp.organ_id_=o.id_
-    </select>
 </mapper>

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

@@ -15,6 +15,7 @@
         <result property="eventName" column="event_name_"/>
         <result property="pageName" column="page_name_"/>
         <result property="pageUrl" column="page_url_"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="PageMonitor">
-		SELECT * FROM page_monitor ORDER BY id_
+		SELECT * FROM page_monitor where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
     <select id="findByUserIdAndEvent" resultMap="PageMonitor">
         SELECT * FROM page_monitor WHERE user_id_ = #{userId} AND event_ = #{event} LIMIT 1 FOR UPDATE
@@ -33,8 +34,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.PageMonitor" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO page_monitor (page_name_,page_url_,event_,event_name_,user_id_,times_,update_time_)
-        VALUES(#{pageName},#{pageUrl},#{event},#{eventName},#{userId},#{times},NOW())
+        INSERT INTO page_monitor (page_name_,page_url_,event_,event_name_,user_id_,times_,update_time_,tenant_id_)
+        VALUES(#{pageName},#{pageUrl},#{event},#{eventName},#{userId},#{times},NOW(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -63,6 +64,6 @@
                 update_time_ = #{updateTime}
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 </mapper>

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

@@ -18,6 +18,7 @@
 		<result column="time_line_" property="timeLine" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,14 +28,14 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="PhotoAlbum">
-		SELECT * FROM photo_album_ ORDER BY id_
+		SELECT * FROM photo_album_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.PhotoAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO photo_album_ (music_group_id_,name_,client_show_,type_,cover_url_,cover_thumbnail_url_,create_time_,update_time_,order_,time_line_)
+		INSERT INTO photo_album_ (music_group_id_,name_,client_show_,type_,cover_url_,cover_thumbnail_url_,create_time_,update_time_,order_,time_line_,tenant_id_)
 		VALUES(#{musicGroupId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{type},#{coverUrl},#{coverThumbnailUrl},NOW(),NOW(),#{order},#{timeLine})
+		       #{type},#{coverUrl},#{coverThumbnailUrl},NOW(),NOW(),#{order},#{timeLine},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -65,7 +66,7 @@
 			name_ = #{name},
 		</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="batchUpdate">
 		<foreach collection="photoAlbumList" item="album" separator=";">
@@ -95,7 +96,7 @@
 				name_ = #{album.name},
 			</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{album.id}
+		</set> WHERE id_ = #{album.id} and tenant_id_ = #{album.tenantId}
 		</foreach>
 	</update>
 
@@ -116,6 +117,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="timeLine != null and timeLine != ''">
 				AND DATE_FORMAT(time_line_,"%Y%m") = #{timeLine}
 			</if>

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

@@ -16,6 +16,7 @@
 		<result column="order_" property="order" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -25,20 +26,20 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="Photo">
-		SELECT * FROM photo_ ORDER BY id_
+		SELECT * FROM photo_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Photo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_)
-		VALUES(#{photoAlbumId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{thumbnailUrl},NOW(),NOW(),#{order})
+		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_,tenant_id_)
+		VALUES(#{photoAlbumId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{thumbnailUrl},NOW(),NOW(),#{order},#{tenantId})
 	</insert>
 	<insert id="batchInsert">
-		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_)
+		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_,tenant_id_)
 		VALUES
 		<foreach collection="photoList" item="photo" separator=",">
 			(#{photo.photoAlbumId},#{photo.name},#{photo.clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			 #{photo.url},#{photo.thumbnailUrl},NOW(),NOW(),#{photo.order})
+			 #{photo.url},#{photo.thumbnailUrl},NOW(),NOW(),#{photo.order},#{photo.tenantId})
 		</foreach>
 	</insert>
 
@@ -64,7 +65,7 @@
 		name_ = #{name},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
     <update id="batchUpdate">
 		<foreach collection="photoList" item="item" separator=";">
@@ -88,7 +89,7 @@
 				name_ = #{item.name},
 			</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{item.id}
+		</set> WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>
 	</update>
 
@@ -112,6 +113,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="photoAlbumId != null">
 				AND photo_album_id_ = #{photoAlbumId}
 			</if>

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

@@ -20,6 +20,7 @@
         <result column="courses_expire_date_" property="coursesExpireDate"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="memo_" property="memo"/>
         <result column="buy_months_" property="buyMonths"/>
         <result column="drill_times_on_week_" property="drillTimesOnWeek"/>
@@ -127,7 +128,7 @@
             </if>
             update_time_ = NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="batchUpdate">
@@ -162,7 +163,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="PracticeGroup">
         SELECT *
-        FROM practice_group
+        FROM practice_group where tenant_id_ = #{tenantId}
     </select>
 
     <!-- 向数据库增加一条记录 -->
@@ -191,14 +192,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="PracticeGroup" parameterType="map">
-        SELECT * FROM practice_group
+        SELECT * FROM practice_group where tenant_id_ = #{tenantId}
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM practice_group
+        FROM practice_group where tenant_id_ = #{tenantId}
     </select>
     <select id="getUserPracticeCoursesWithDateRange" resultMap="PracticeGroup">
         SELECT *
@@ -227,9 +228,6 @@
         GROUP BY pg.id_ ORDER BY pg.id_ DESC
         <include refid="global.limit"/>
     </select>
-    <select id="countPracticeGroupOverCourse" resultType="java.util.Map">
-
-    </select>
 
     <select id="findUserLatestPracticeGroup" resultMap="PracticeGroup">
         SELECT *
@@ -293,6 +291,7 @@
 
     <sql id="practiceGroupQueryCondition">
         <where>
+        	pg.tenant_id_ = #{tenantId}
             <if test="hasEducationalTeacherId != null and hasEducationalTeacherId == true">
                 AND pg.educational_teacher_id_ IS NOT NULL
             </if>
@@ -371,9 +370,7 @@
     <sql id="practiceGroupReviewsQueryCondition">
         <where>
             pg.group_status_ != 'LOCK'
-            <if test="tenantId != null">
-                AND pg.tenanr_id_ = #{tenantId}
-            </if>
+            AND pg.tenanr_id_ = #{tenantId}
             <if test="month != null">
                 AND DATE_FORMAT(cse.create_time_, '%Y-%m') = #{month}
             </if>
@@ -534,6 +531,7 @@
     </select>
     <sql id="queryStudentBuysSql">
         <where>
+        	u.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
                 (u.id_ = #{search} OR u.`username_` LIKE CONCAT('%',#{search},'%'))
             </if>
@@ -577,7 +575,7 @@
         LEFT JOIN organization o on o.id_ = pg.organ_id_
         LEFT JOIN sys_user su ON su.id_ = pg.student_id_
         left join sys_user edut ON edut.id_ = pg.educational_teacher_id_
-        WHERE pg.group_status_ IN ('NORMAL','FINISH')
+        WHERE pg.group_status_ IN ('NORMAL','FINISH') and pg.tenant_id_ = #{tenantId}
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(pg.organ_id_, #{organIds})
         </if>
@@ -590,7 +588,7 @@
         FROM
             sys_user su
         WHERE
-            1=1
+            su.tenant_id_ = #{tenantId}
             AND su.del_flag_=0 AND su.lock_flag_=0
 			AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIdList!=null">
@@ -611,7 +609,7 @@
         FROM
             sys_user su
         WHERE
-            1=1
+            su.tenant_id_ = #{tenantId}
             AND su.del_flag_=0 AND su.lock_flag_=0
 			AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIdList!=null">

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

@@ -24,6 +24,7 @@
 		<result column="single_class_minutes_price_" property="singleClassMinutesPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -34,7 +35,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="PracticeGroupSellPrice">
-		SELECT * FROM practice_group_sell_price
+		SELECT * FROM practice_group_sell_price where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -43,9 +44,9 @@
 		useGeneratedKeys="true" keyColumn="organ_id_" keyProperty="organId">
 		INSERT INTO practice_group_sell_price
 		(`organ_id_`, `once_original_price`, `once_activity_price`, `twice_original_price`,
-		 `twice_activity_price`, `create_time_`, `update_time_`,single_class_minutes_price_)
+		 `twice_activity_price`, `create_time_`, `update_time_`,single_class_minutes_price_,tenant_id_)
 		VALUES(#{organId},#{onceOriginalPrice},#{onceActivityPrice},#{twiceOriginalPrice},
-		       #{twiceActivityPrice},NOW(),NOW(),#{singleClassMinutesPrice})
+		       #{twiceActivityPrice},NOW(),NOW(),#{singleClassMinutesPrice},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -69,7 +70,7 @@
 			</if>
 			update_time_=NOW
 		</set>
-		WHERE organ_id_ = #{organId}
+		WHERE organ_id_ = #{organId} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -79,12 +80,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="PracticeGroupSellPrice" parameterType="map">
-		SELECT * FROM practice_group_sell_price ORDER BY id_
+		SELECT * FROM practice_group_sell_price where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM practice_group_sell_price
+		SELECT COUNT(*) FROM practice_group_sell_price where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -11,12 +11,13 @@
 		<result column="user_id_" property="userId" />
 		<result column="create_time_" property="createTime" />
 		<result column="memo_" property="memo" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="PracticeLessonApply">
-		SELECT * FROM practice_lesson_apply
+		SELECT * FROM practice_lesson_apply where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -26,19 +27,19 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO practice_lesson_apply (id_,user_id_,create_time_,memo_) VALUES(#{id},#{userId},#{createTime},#{memo})
+		INSERT INTO practice_lesson_apply (id_,user_id_,create_time_,memo_,tenant_id_) VALUES(#{id},#{userId},#{createTime},#{memo},#{tenantId})
 	</insert>
 	
 	
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="PracticeLessonApply" parameterType="map">
-		SELECT * FROM practice_lesson_apply <include refid="global.limit"/>
+		SELECT * FROM practice_lesson_apply where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM practice_lesson_apply
+		SELECT COUNT(*) FROM practice_lesson_apply where tenant_id_ = #{tenantId} 
 	</select>
     <select id="findByUserId" resultMap="PracticeLessonApply">
 		SELECT * FROM practice_lesson_apply WHERE user_id_ = #{userId} LIMIT 1 FOR UPDATE

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

@@ -15,6 +15,7 @@
 		<result column="is_over_" property="isOver"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -26,6 +27,7 @@
 	<select id="findAll" resultMap="QuestionnaireQuestionItem">
 		SELECT * FROM questionnaire_question_item 
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="questionIdList != null and questionIdList.size > 0">
 				AND questionnaire_question_id_ IN
 				<foreach collection="questionIdList" open="(" close=")" separator="," item="item">
@@ -38,15 +40,15 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver},NOW(),NOW())
+		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_,tenant_id_)
+		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver},NOW(),NOW(),#{tenantId})
 	</insert>
 
     <insert id="batchInsert" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
+		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="questionItemList" item="item" separator=",">
-			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver},NOW(),NOW())
+			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -65,7 +67,7 @@
 		<if test="answerValue != null">
 			answer_value_ = #{answerValue},
 		</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -105,12 +107,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="QuestionnaireQuestionItem" parameterType="map">
-		SELECT * FROM questionnaire_question_item ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM questionnaire_question_item where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM questionnaire_question_item
+		SELECT COUNT(*) FROM questionnaire_question_item where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByQuestionId" resultMap="QuestionnaireQuestionItem">
 		SELECT * FROM questionnaire_question_item WHERE questionnaire_question_id_ = #{questionId} LIMIT 1

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

@@ -16,6 +16,7 @@
 		<result column="desc_" property="desc" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 		<collection property="questionnaireQuestionItemList" ofType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem">
 			<result column="item_id_" property="id" />
 			<result column="item_questionnaire_topic_id_" property="questionnaireTopicId" />
@@ -41,6 +42,7 @@
 		FROM questionnaire_question qq
 		LEFT JOIN questionnaire_question_item qqi ON qq.id_ = qqi.questionnaire_question_id_
 		<where>
+			qq.tenant_id_ = #{tenantId}
 			<if test="topicId != null">
 				AND qq.questionnaire_topic_id_ = #{topicId}
 			</if>
@@ -50,8 +52,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestion" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question (questionnaire_topic_id_,content_,type_,sort_,is_require_,desc_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},NOW(),NOW())
+		INSERT INTO questionnaire_question (questionnaire_topic_id_,content_,type_,sort_,is_require_,desc_,create_time_,update_time_,tenant_id_)
+		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -75,7 +77,7 @@
 		<if test="desc != null">
 			desc_ = #{desc},
 		</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -92,6 +94,7 @@
 
 	<sql id="queryPageSql">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="topicId != null">
 				AND questionnaire_topic_id_ = #{topicId}
 			</if>
@@ -124,7 +127,7 @@
 			qq.*
 		FROM
 			questionnaire_question qq
-		WHERE
+		WHERE qq.tennat_id_ = #{tenantId} and 
 				qq.questionnaire_topic_id_ = ( SELECT questionnaire_topic_id_ FROM questionnaire_user_result WHERE active_type_ = 'CLOUD_TEACHER_FEEDBACK' LIMIT 1 )
 		ORDER BY
 			sort_

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

@@ -15,6 +15,7 @@
 		<result column="tenant_id_" property="tenantId" />
 		<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="QuestionnaireTopic">
-		SELECT * FROM questionnaire_topic ORDER BY id_
+		SELECT * FROM questionnaire_topic where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -61,15 +62,13 @@
 
 	<sql id="queryPageSql">
 		<where>
+			 tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (id_ = #{search} OR title_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="status != null">
 				AND status_ = #{status}
 			</if>
-			<if test="tenantId != null">
-				AND tenant_id_ = #{tenantId}
-			</if>
 		</where>
 	</sql>
 	<!-- 分页查询 -->

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

@@ -19,6 +19,7 @@
 		<result column="additional_value_" property="additionalValue" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -31,6 +32,7 @@
 		SELECT qur.* FROM questionnaire_user_result qur
 		LEFT JOIN sys_user su ON su.id_ = qur.user_id_
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="userId != null">
 				AND qur.user_id_ = #{userId}
 			</if>
@@ -47,18 +49,18 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireUserResult" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_user_result (user_id_,questionnaire_topic_id_,questionnaire_question_id_,
-		                                       questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_)
+		                                       questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_,tenant_id_)
 		VALUES(#{userId},#{questionnaireTopicId},#{questionnaireQuestionId},#{questionnaireQuestionItemIdList},#{additionalValue}
-			  ,#{activeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{activeId},NOW(),NOW())
+			  ,#{activeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{activeId},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert1">
 		INSERT INTO questionnaire_user_result (user_id_,questionnaire_topic_id_,questionnaire_question_id_,
-		questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_)
+		questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="questionnaireUserResultList" item="item" separator=",">
 			(#{item.userId},#{item.questionnaireTopicId},#{item.questionnaireQuestionId},#{item.questionnaireQuestionItemIdList},#{item.additionalValue}
-			,#{item.activeType},#{item.activeId},NOW(),NOW())
+			,#{item.activeType},#{item.activeId},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -87,7 +89,7 @@
 			additional_value_ = #{additionalValue},
 		</if>
 			update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -128,12 +130,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="QuestionnaireUserResult" parameterType="map">
-		SELECT * FROM questionnaire_user_result ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM questionnaire_user_result where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM questionnaire_user_result
+		SELECT COUNT(*) FROM questionnaire_user_result where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="countByTopicId" resultType="java.lang.Integer">
@@ -164,6 +166,7 @@
 	</resultMap>
 	<sql id="queryDetailPageSql">
 		<where>
+			 qu.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				qu.user_id_ = #{search} OR ria.username_ LIKE CONCAT('%',#{search},'%') OR ria.mobile_no_ LIKE CONCAT('%',#{search},'%')
 			</if>
@@ -181,6 +184,7 @@
 
 	<sql id="queryDetailPageSql1">
 		<where>
+			 qu1.tenant_id_ = #{tenantId}
 			<if test="activeId != null">
 				AND qu1.active_id_ = #{activeId}
 			</if>