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

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

@@ -1248,7 +1248,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @author Joburgess
      * @date 2020/2/4
      */
-    List<CourseSchedule> findStudentCoursesWithIncludeDateRange(@Param("userId") Integer userId,
+    List<CourseSchedule> findStudentCoursesWithIncludeDateRange(@Param("userId") Integer userId,@Param("groupType") GroupType groupType,
                                                                 @Param("startTime") Date startTime,
                                                                 @Param("endTime") Date endTime);
 

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

@@ -41,7 +41,7 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId, @Param("jpushType") String jpushType);
+	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId, @Param("jpushType") String jpushType, @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 修改用户所有消息阅读状态

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

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
+
+public class CourseSchedulePlanDto {
+
+	private CourseSchedule courseSchedule;
+	
+	private MusicGroupTrainPlan musicGroupTrainPlan;
+
+	public CourseSchedule getCourseSchedule() {
+		return courseSchedule;
+	}
+
+	public void setCourseSchedule(CourseSchedule courseSchedule) {
+		this.courseSchedule = courseSchedule;
+	}
+
+	public MusicGroupTrainPlan getMusicGroupTrainPlan() {
+		return musicGroupTrainPlan;
+	}
+
+	public void setMusicGroupTrainPlan(MusicGroupTrainPlan musicGroupTrainPlan) {
+		this.musicGroupTrainPlan = musicGroupTrainPlan;
+	}
+}

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

@@ -29,7 +29,7 @@ public enum CouponDetailTypeEnum {
     //网管课
     PRACTICE("PRACTICE", "网管课"),
     //声部课 = 单技课 SINGLE、集训单技课 TRAINING_SINGLE
-    SINGLE("SINGLE,", "声部课"),
+    SINGLE("SINGLE", "声部课"),
     //合奏课 = 合奏课 MIX、集训合奏课 TRAINING_MIX ,
     MIX("MIX", "合奏课"),
     //VIP = vip课 VIP +乐理课 THEORY_COURSE

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

@@ -651,4 +651,6 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	* @date 2022/1/5 15:52
 	*/
 	void checkOnlineCategory(List<CourseSchedule> courseSchedules,TeachModeEnum teachMode);
+	
+	Object queryMusicCoursePlan(Integer userId, Date startDate, Date endDate);
 }

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

@@ -126,7 +126,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId,String jpushType);
+	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId,String jpushType, Integer tenantId);
 
 	/**
 	 *

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

@@ -27,6 +27,7 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.tenant.TenantContextHolder;
+
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.map.util.BeanUtil;
@@ -5714,4 +5715,29 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			checkMaxStudentNum(courseSchedules);
 		}
 	}
+
+	@Override
+	public Object queryMusicCoursePlan(Integer userId, Date startDate, Date endDate) {
+		
+		List<CourseSchedule> courseScheduleList = courseScheduleDao.findStudentCoursesWithIncludeDateRange(userId, GroupType.MUSIC, startDate, endDate);
+		
+		List<CourseSchedulePlanDto> result = new ArrayList<CourseSchedulePlanDto>();
+		
+		for(CourseSchedule courseSchedule : courseScheduleList){
+			CourseSchedulePlanDto dto = new CourseSchedulePlanDto();
+			dto.setCourseSchedule(courseSchedule);
+			
+			//获取课程规划
+			MusicGroupTrainPlanSaveDto schoolTerm = musicGroupTrainPlanService.getSchoolTerm(courseSchedule);
+			int courseNumNo = courseScheduleDao.getCourseNumNo(schoolTerm);
+			List<MusicGroupTrainPlan> planList = musicGroupTrainPlanService.queryPlan(schoolTerm);
+			if(planList.size() >= courseNumNo){
+				dto.setMusicGroupTrainPlan(planList.get(courseNumNo - 1));
+			}
+			
+			result.add(dto);
+		}
+		
+		return result;
+	}
 }

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

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -749,10 +748,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             analyzeAmount(couponPayTypeInfo, singleTypeList, list);
         });
         List<StudentPaymentOrderDetail> allList = new ArrayList<>();
-        //再处理全类型优惠券数据
-        if (CollectionUtils.isNotEmpty(allTypeList)) {
-            allTypeList.addAll(singleTypeList);
+        allTypeList.addAll(singleTypeList);
+        //有全类型优惠券就再处理全类型优惠券数据
+        if (Objects.nonNull(couponParam.get(CouponDetailTypeEnum.FULLCOUPON.getCode()))) {
             analyzeAmount(couponParam.get(CouponDetailTypeEnum.FULLCOUPON.getCode()), allList, allTypeList);
+        } else {
+            allList.addAll(allTypeList);
         }
     }
 
@@ -806,12 +807,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
         SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
         StudentRegistration phoneAndMusicGroupId = null;
-        if(sysUser != null){
-            if(!musicGroup.getTenantId().equals(sysUser.getTenantId())){
+        if (sysUser != null) {
+            if (!musicGroup.getTenantId().equals(sysUser.getTenantId())) {
                 throw new BizException("该手机号已注册");
             }
             phoneAndMusicGroupId = studentRegistrationDao.getByUserIdAndMusicGroupId(musicGroupId, sysUser.getId());
-        }else {
+        } else {
             phoneAndMusicGroupId = studentRegistrationDao.getByPhoneAndMusicGroupId(musicGroupId, studentRegistration.getParentsPhone());
         }
 

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

@@ -550,8 +550,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId,String jpushType) {
-		List<Mapper> mappers = sysMessageDao.queryCountOfUnread(type, userId,jpushType);
+	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId, String jpushType, Integer tenantId) {
+		List<Mapper> mappers = sysMessageDao.queryCountOfUnread(type, userId, jpushType, tenantId);
 
 		Map<String, Integer> map = new HashMap<String, Integer>();
 

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

@@ -24,7 +24,6 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.IdGeneratorService;
-import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.yqpay.DateUtils;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.util.date.DateUtil;
@@ -238,7 +237,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
 
     /**
      * 启用/停用
-     * 第一个启用默认激活账号等信息
+     * 第一次启用默认开通账号
      *
      * @param id    机构id
      * @param state 机构状态1启动 2停用
@@ -447,7 +446,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg(),
-                    1,//临时写死
+                    1,//todo 机构开通付款临时写死
                     tenantEnum.getCode()
             );
         } else {
@@ -604,8 +603,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     public Map<String, Object> recharge(Integer tenantId, BigDecimal amount) throws Exception {
         log.error("机构 " + tenantId.toString() + "充值");
         TenantInfo tenantInfo = Optional.ofNullable(tenantId)
-                                        .map(baseMapper::selectById)
-                                        .orElseThrow(() -> new BizException("充值时,未查询到机构信息!"));
+                .map(baseMapper::selectById)
+                .orElseThrow(() -> new BizException("充值时,未查询到机构信息!"));
         String key = "Tenant_Pay:" + tenantId;
         RBucket<Object> bucket = redissonClient.getBucket(key);
         //原子操作 抢锁成功为true

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

@@ -2655,6 +2655,9 @@
                  LEFT JOIN class_group cg ON cg.id_ = csts.class_group_id_
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
           AND csts.user_id_ = #{userId}
+          <if test="groupType != null">
+          	and csts.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+          </if>
           AND #{startTime} &lt; CONCAT(cs.class_date_, ' ', cs.end_class_time_)
           AND #{endTime} &gt; CONCAT(cs.class_date_, ' ', cs.start_class_time_)
     </select>
@@ -2684,6 +2687,9 @@
                  LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
           AND cssp.user_id_ = #{userId}
+          <if test="groupType != null">
+          	and csts.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+          </if>
           AND #{startTime} &lt; CONCAT(cs.class_date_, ' ', cs.end_class_time_)
           AND #{endTime} &gt; CONCAT(cs.class_date_, ' ', cs.start_class_time_);
     </select>

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

@@ -192,6 +192,7 @@
 	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
 		SELECT group_ key_,COUNT(*) value_ FROM sys_message
 		WHERE user_id_ = #{userId} AND read_status_ = 0 and status_ = 2
+		AND tenant_id_ = #{tenantId}
 		AND (jpush_type_ = #{jpushType} OR jpush_type_ IS NULL)
 		<if test="type != null">
 		and type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}

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

@@ -208,9 +208,9 @@
 			<if test="parentId != null">
 				AND sesc.parent_id_ = #{parentId}
 			</if>
-			<if test="organId != null and organId != ''">
+			<!-- <if test="organId != null and organId != ''">
 				AND INTE_ARRAY(#{organId},sesc.organ_id_)
-			</if>
+			</if> -->
 			<if test="search != null and search != ''">
 				AND (sesa.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>

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

@@ -148,9 +148,9 @@
     <sql id="queryPageSql">
 		<where>
 			ses.del_flag_ = 0
-			<if test="organId != null and organId != null">
+			<!-- <if test="organId != null and organId != null">
 				AND INTE_ARRAY(smsc.organ_id_,#{organId})
-			</if>
+			</if> -->
 			<if test="categoriesId != null">
 				AND FIND_IN_SET(ses.music_score_categories_id_,#{categoriesId})
 			</if>

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

@@ -21,12 +21,12 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="SysSuggestion">
-		SELECT * FROM sys_suggestion WHERE id_ = #{id} 
+		SELECT * FROM sys_suggestion WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysSuggestion">
-		SELECT * FROM sys_suggestion ORDER BY id_
+		SELECT * FROM sys_suggestion where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -72,6 +72,7 @@
 
     <sql id="queryCondition">
         <where>
+            ss.tenant_id_ = #{tenantId}
             <if test="type!=null">
                 AND ss.type_ = #{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

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

@@ -8,10 +8,13 @@ import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.model.AuditLogAnnotation;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -89,4 +92,23 @@ public class StudentCourseScheduleController extends BaseController {
 		return succeed(scheduleService.queryCourseInfoByGroupId(groupType,groupId));
 	}
 
+	@ApiOperation(value = "获取本周课程规划")
+	@GetMapping("/queryCoursePlan")
+	public Object queryCoursePlan(){
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser == null || sysUser.getId() == null){
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		
+		Date now = new Date();
+		
+		Date startDate = DateUtil.getWeekMondayWithDate(now);
+		startDate = DateUtil.formatHMSToZero(startDate);
+		
+		Date endDate = DateUtil.addDays(startDate, 7);
+		endDate = DateUtil.getLastSecondWithDay(endDate);
+		
+		return succeed(scheduleService.queryMusicCoursePlan(sysUser.getId(), startDate, endDate));
+	}
+
 }

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

@@ -107,7 +107,7 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"STUDENT");
+		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"STUDENT", sysUser.getTenantId());
 
 		if (map == null || map.size() == 0) {
 			return succeed();

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMessageController.java

@@ -94,7 +94,7 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed("请重新登录");
 		}
-		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"TEACHER");
+		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"TEACHER", sysUser.getTenantId());
 
 		if (map == null || map.size() == 0) {
 			return succeed();

mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java

@@ -997,6 +997,16 @@ public class DateUtil {
 		calendar.set(Calendar.SECOND, 59);
 		return calendar.getTime();
 	}
+	
+	public static Date formatHMSToZero(Date date) {    
+        Calendar cal = Calendar.getInstance();  
+        cal.setTime(date);  
+        cal.set(Calendar.HOUR_OF_DAY, 0);  
+        cal.set(Calendar.MINUTE, 0);  
+        cal.set(Calendar.SECOND, 0);  
+        cal.set(Calendar.MILLISECOND, 0);  
+        return cal.getTime(); 
+    }
 
 	/**
 	 * @describe 获取指定时间在当天最后的时间

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

@@ -95,6 +95,6 @@ public class SysMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.SEO, sysUser.getId(),null));
+		return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.SEO, sysUser.getId(),null, sysUser.getTenantId()));
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/SysEduMessageController.java

@@ -105,7 +105,7 @@ public class SysEduMessageController extends BaseController {
 		if (sysUser == null) {
 			return failed("请重新登录");
 		}
-		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"SYSTEM");
+		Map<String, Integer> map = sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"SYSTEM", sysUser.getTenantId());
 
 		if (map == null || map.size() == 0) {
 			return succeed();