Merge remote-tracking branch 'origin/master'

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

@@ -228,7 +228,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param teacherIds
      * @return
      */
-    List<Map<Integer, Long>> countTeacherVipNum(String teacherIds);
+    List<Map<Integer, Integer>> countTeacherVipNum(String teacherIds);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>
@@ -343,7 +343,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param musicGroupIds
      * @return
      */
-    List<CourseListDto> queryStudentVipCourses(@Param("musicGroupIds") String musicGroupIds);
+    List<CourseListDto> queryStudentVipCourses(@Param("musicGroupIds") String musicGroupIds,@Param("userId") Integer userId);
 
     /**
      * 获取学生端,学员乐团课列表详情
@@ -351,7 +351,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param musicGroupIds
      * @return
      */
-    List<CourseListDto> queryStudentMusicGroupCourses(@Param("musicGroupIds") String musicGroupIds);
+    List<CourseListDto> queryStudentMusicGroupCourses(@Param("musicGroupIds") String musicGroupIds,@Param("userId") Integer userId);
 
     /**
      * 查询对应类型所有班级列表

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

@@ -109,7 +109,7 @@ public interface DemoGroupDao extends BaseDAO<Long, DemoGroup> {
      * @param teacherIds
      * @return
      */
-    List<Map<Integer, Long>> countTeacherDemoGroupNum(String teacherIds);
+    List<Map<Integer, Integer>> countTeacherDemoGroupNum(String teacherIds);
 
     /**
      * 查询vip课程数

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

@@ -5,6 +5,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 
@@ -28,4 +29,11 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
      * @return
      */
     List<Organization> queryEmployeeOrgan(@Param("userId") Integer userId);
+
+    /**
+     * 根据分部编号获取分部名称map
+     * @param organIds
+     * @return
+     */
+    List<Map<Integer,String>> findOrganNameMap(String organIds);
 }

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

@@ -486,12 +486,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<String> musicGroupIds = courseScheduleDao.queryMusicGroupIds(params);
         courseListDtos = new ArrayList<>();
         //获取学员所购买的vip课列表详情
-        List<CourseListDto> vipCourses = classGroupDao.queryStudentVipCourses(StringUtils.join(musicGroupIds, ","));
+        List<CourseListDto> vipCourses = classGroupDao.queryStudentVipCourses(StringUtils.join(musicGroupIds, ","),userId);
         //获取vip课的学生列表
         Set<String> vipIds = vipCourses.stream().map(CourseListDto::getMusicGroupId).collect(Collectors.toSet());
         Map<String, String> vipStuNames = MapUtil.convertMybatisMap(classGroupDao.findVipStuNames(StringUtils.join(vipIds, ",")));
         //获取学员的乐团列表详情
-        courseListDtos.addAll(classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ",")));
+        courseListDtos.addAll(classGroupDao.queryStudentMusicGroupCourses(StringUtils.join(musicGroupIds, ","),userId));
         courseListDtos.addAll(vipCourses);
         //检测对应乐团是否已申请退费
         List<Map<String, Integer>> isApplyMaps;
@@ -898,16 +898,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIdSet);
 
-        String subjectIds = "";
-        String subjectNames = "";
-        for (Subject subject : subjectList) {
-            subjectIds += subject.getId() + ",";
-            subjectNames += subject.getName() + "/";
-        }
-
-        subjectIds = subjectIds.substring(0, subjectIds.length() - 1);
-        subjectNames = subjectNames.substring(0, subjectNames.length() - 1);
-
+        String subjectIds = subjectList.stream().map(subject -> subject.getId().toString()).collect(Collectors.joining(","));
+        String subjectNames = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));
 
         //1、新建班级
         ClassGroup classGroup = new ClassGroup();
@@ -1111,16 +1103,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIdSet);
 
-        String subjectIds = "";
-        String subjectNames = "";
-        for (Subject subject : subjectList) {
-            subjectIds += subject.getId() + ",";
-            subjectNames += subject.getName() + "/";
-        }
-
-        subjectIds = subjectIds.substring(0, subjectIds.length() - 1);
-        subjectNames = subjectNames.substring(0, subjectNames.length() - 1);
-
+        String subjectIds = subjectList.stream().map(subject -> subject.getId().toString()).collect(Collectors.joining(","));
+        String subjectNames = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));
 
         //1、新建班级
         ClassGroup classGroup = new ClassGroup();
@@ -1319,16 +1303,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIdSet);
 
-        String subjectIds = "";
-        String subjectNames = "";
-        for (Subject subject : subjectList) {
-            subjectIds += subject.getId() + ",";
-            subjectNames += subject.getName() + "/";
-        }
-
-        subjectIds = subjectIds.substring(0, subjectIds.length() - 1);
-        subjectNames = subjectNames.substring(0, subjectNames.length() - 1);
-
+        String subjectIds = subjectList.stream().map(subject -> subject.getId().toString()).collect(Collectors.joining(","));
+        String subjectNames = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));
 
         //1、新建班级
         ClassGroup classGroup = new ClassGroup();
@@ -1562,11 +1538,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 List<CourseScheduleTeacherSalary> currentCourseTeachingTeachers = courseScheduleTeachingTeacherMaps.get(e.getCourseScheduleId().longValue());
                 if (CollectionUtils.isEmpty(currentCourseTeachingTeachers)) {
                     currentCourseTeachingTeachers = new ArrayList<>();
-                    currentCourseTeachingTeachers.add(currentBishopTeacher);
+                    if(currentBishopTeacher != null){
+                        currentCourseTeachingTeachers.add(currentBishopTeacher);
+                    }
                     e.setTeacherNum(currentCourseTeachingTeachers.size());
                     e.setTeachingTeachers(currentCourseTeachingTeachers);
                 } else {
-                    currentCourseTeachingTeachers.add(currentBishopTeacher);
+                    if(currentBishopTeacher != null){
+                        currentCourseTeachingTeachers.add(currentBishopTeacher);
+                    }
                     e.setTeachingTeachers(currentCourseTeachingTeachers);
                     e.setTeacherNum(currentCourseTeachingTeachers.size());
                 }
@@ -1590,7 +1570,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
         for (ClassGroup classGroup : classGroupList) {
             List<String> subjects = subjectService.findBySubIds(classGroup.getSubjectIdList());
-            String subjectName = StringUtils.join(subjects, "/");
+            String subjectName = StringUtils.join(subjects, ",");
             classGroup.setSubjectName(subjectName);
         }
         return classGroupList;

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

@@ -859,11 +859,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Map<Integer, String> chargeTypeNameMap = MapUtil.convertMybatisMap(chargeTypeNames);
 
         //获取教学点编号
-        Map<Integer,String> organNames = MapUtil.convertMybatisMap(cooperationOrganDao.queryNameByIds(StringUtils.join(musicGroupList.stream().map(MusicGroup::getCooperationOrganId).collect(Collectors.toSet()),",")));
+        Map<Integer,String> cooperationOrganNames = MapUtil.convertMybatisMap(cooperationOrganDao.queryNameByIds(StringUtils.join(musicGroupList.stream().map(MusicGroup::getCooperationOrganId).collect(Collectors.toSet()),",")));
 
+//        Set<Integer> organIds = musicGroupList.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
+//        Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds,",")));
+
+        //获取分部名称map
         musicGroupList.forEach(e -> {
 //            e.setSchoolName(schoolNameMap.get(e.getSchoolId()));
-            e.setCooperationOrganName(organNames.get(e.getCooperationOrganId()));
+//            e.setOrganName(organNames.get(e.getOrganId()));
+            e.setCooperationOrganName(cooperationOrganNames.get(e.getCooperationOrganId()));
             e.setEducationalTeacherName(educationalTeacherNameMap.get(e.getEducationalTeacherId()));
             e.setTeamTeacherName(teamTeacherNameMap.get(e.getTeamTeacherId()));
             e.setPayNum(payNumMap.get(e.getId()) == null ? 0 : Integer.parseInt(payNumMap.get(e.getId())));

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

@@ -322,18 +322,22 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			Set<Integer> teachers = rows.stream().map(e -> e.getId()).collect(Collectors.toSet());
 			String teacherIds = StringUtils.join(teachers, ",");
 			//获取小课数量
-			List<Map<Integer,Long>> numList =  classGroupDao.countTeacherVipNum(teacherIds);
-			Map<Integer,Long> vipNumMap = MapUtil.convertIntegerMap(numList);
+//			List<Map<Integer,Long>> numList =  classGroupDao.countTeacherVipNum(teacherIds);
+			Map<Integer,Integer> vipNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherVipNum(teacherIds))),HashMap.class);
 			//获取试听课数量
-			List<Map<Integer,Long>> demoNumList =  demoGroupDao.countTeacherDemoGroupNum(teacherIds);
-			Map<Integer,Long> demoNumMap = MapUtil.convertIntegerMap(demoNumList);
+//			List<Map<Integer,Long>> demoNumList =  demoGroupDao.countTeacherDemoGroupNum(teacherIds);
+			Map<Integer,Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teacherIds))),HashMap.class);
+
+//			Set<Integer> organIds = rows.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
+//			Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds,",")));
 			rows.forEach(e->{
 //				e.setSubjectName(subjectDao.findBySubIds(e.getSubjectId()));
+//				e.setOrganName(organNames.get(e.getOrganId()));
 				e.setSubjectName(Arrays.asList(e.getSplitSubjectName().split(",")));
-				Long num = vipNumMap.get(e.getId());
-				e.setVipNum(num == null?0:num.intValue());
-				Long demoNum = demoNumMap.get(e.getId());
-				e.setDemoNum(demoNum == null?0:demoNum.intValue());
+				Integer num = vipNumMap.get(e.getId());
+				e.setVipNum(num == null?0:num);
+				Integer demoNum = demoNumMap.get(e.getId());
+				e.setDemoNum(demoNum == null?0:demoNum);
 			});
 		}
 		return pageInfo;
@@ -350,6 +354,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){
 				teacher.setFlowOrganRangeId(teacher.getFlowOrganRange());
 				List<String> organNames = organizationDao.findByOrganIds(teacher.getFlowOrganRange());
+				teacher.setOrganName(organizationDao.get(teacher.getOrganId()).getName());
 				teacher.setFlowOrganRange(StringUtils.join(organNames,","));
 			}
 			//专业技能

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -156,7 +156,7 @@
         6、双方因履行本协议而相互发出或者提供的所有通知、文件、资料，均以本协议中所列明的电话、APP推送消息送达，乙方如果变更电话号码的，应当自变更后1日内通知甲方且获得甲方确认，甲方通过电话、APP方式无法联系乙方或者甲方认为必要时，甲方也可以通过特快专递至乙方住址的方式向乙方发出上述任何通知、文件、资料等，并在甲方寄出特快专递后第5日视为送达成功。
         
         <div class="signature">
-            <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司
+            <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png" alt="" />
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             <div class="sign">乙方签字：${studentInfo.realName!}

mec-biz/src/main/resources/config/contracts/goods.ftl

@@ -135,7 +135,7 @@
         3、本协议未尽事宜或对本协议的任何修改、补充，由双方另行协商后以签订补充协议的方式解决，补充协议与本协议具有同等法律效力；双方没有约定也没有协商一致的，遵照相关法律法规规定执行。<br/>
         4、双方因履行本协议而相互发出或者提供的所有通知、文件、资料，均以本协议中所列明的电话、APP推送消息送达，乙方如果变更电话号码的，应当自变更后1日内通知甲方且获得甲方确认，甲方通过电话、APP方式无法联系乙方或者甲方认为必要时，甲方也可以通过特快专递至乙方住址的方式向乙方发出上述任何通知、文件、资料等，并在甲方寄出特快专递后第5日视为送达成功。
         <div class="signature">
-            <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司
+            <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png" alt="" />
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             <div class="sign">乙方签字：${studentInfo.realName!}

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

@@ -492,14 +492,14 @@
         SELECT cg.name_ class_group_name_,cg.type_ class_group_type_,
         cg.current_class_times_,cg.id_ class_group_id_
         FROM class_group cg
-        WHERE cg.music_group_id_ = #{search} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX') AND cg.del_flag_ = 0
+        WHERE cg.music_group_id_ = #{search} AND cg.del_flag_ = 0
         <include refid="global.limit"/>
     </select>
 
     <select id="countMusicGroupClassGroup" resultType="java.lang.Integer">
         SELECT COUNT(cg.id_)
         FROM class_group cg
-        WHERE cg.music_group_id_ = #{search} AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX') AND cg.del_flag_ = 0
+        WHERE cg.music_group_id_ = #{search} AND cg.del_flag_ = 0
     </select>
 
     <select id="countStudentNum" resultType="java.util.Map">
@@ -627,7 +627,7 @@
         FROM music_group mg
         LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
         LEFT JOIN music_group_student_fee_ mgsf ON mgsf.music_group_id_ = mg.id_
-        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.type_ != 'VIP' AND cg.del_flag_ = 0
+        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.type_ != 'VIP' AND cg.del_flag_ = 0 AND mgsf.user_id_ = #{userId}
         GROUP BY mg.id_,mgsf.payment_status_
     </select>
 

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

@@ -113,4 +113,7 @@
             </if>
         </where>
     </select>
+    <select id="findOrganNameMap" resultType="java.util.Map">
+        SELECT o.id_ 'key',o.name_ 'value' FROM organization o WHERE FIND_IN_SET(o.id_,#{organIds})
+    </select>
 </mapper>

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -52,4 +52,8 @@ public interface TaskRemoteService {
 	@GetMapping("task/homeworkNoReplyRemind")
 	// 老师未回复作业提醒
 	public void homeworkNoReplyRemind();
+
+	@GetMapping("task/queryOrderStatus")
+	// 订单状态查询
+	public void queryOrderStatus();
 }

mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -66,4 +66,8 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
 		logger.info("老师未回复作业提醒的服务调用失败");
 	}
 
+	@Override
+	public void queryOrderStatus() {
+		logger.info("查询订单状态的服务调用失败");
+	}
 }

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

@@ -179,7 +179,7 @@ public class StudentOrderController extends BaseController {
     }
 
 
-    //@Scheduled(cron = "0/5 * * * * ?")
+    //@Scheduled(cron = "0 */1 * * * ?")
     public void getOrderStatus() throws Exception {
         List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "YQPAY");
 
@@ -351,7 +351,7 @@ public class StudentOrderController extends BaseController {
 
     }
 
-    @Scheduled(cron = "0/30 * * * * ?")
+    //@Scheduled(cron = "0/30 * * * * ?")
     public void setSuccessStatus() throws Exception {
         List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "YQPAY");
 

mec-task/src/main/java/com/ym/mec/task/jobs/PayStatusTask.java

@@ -0,0 +1,19 @@
+package com.ym.mec.task.jobs;
+
+import com.ym.mec.task.TaskRemoteService;
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PayStatusTask extends BaseTask {
+
+	@Autowired
+	private TaskRemoteService taskRemoteService;
+
+	@Override
+	public void execute() throws TaskException {
+		taskRemoteService.queryOrderStatus();
+	}
+}