Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -33,4 +33,7 @@ public interface SysUserFeignService {
 
 	@GetMapping(value = "role/queryRoleCodeListByUserId")
 	public List<String> queryRoleCodeListByUserId(@RequestParam("userId") Integer userId);
+	
+	@PostMapping(value = "user/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+	public Boolean updateSysUser(SysUser user);
 }

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -40,4 +40,10 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return null;
 	}
 
+	@Override
+	public Boolean updateSysUser(SysUser user) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -42,14 +42,14 @@ public class UserController extends BaseController {
 			@ApiImplicitParam(name = "createStartDate", value = "开始注册时间", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "createEndDate", value = "结束注册时间", required = true, dataType = "String") })
 	@GetMapping(value = "/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('user/queryPage')")
+	@PreAuthorize("@pcs.hasPermissions('user/queryPage')")
 	public Object queryPage(SysUserQueryInfo queryInfo) {
 		return succeed(sysUserService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "查询用户信息接口")
 	@GetMapping("/query")
-    @PreAuthorize("@pcs.hasPermissions('user/query')")
+	@PreAuthorize("@pcs.hasPermissions('user/query')")
 	public Object query() {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
@@ -77,8 +77,15 @@ public class UserController extends BaseController {
 		return sysUserService.get(userId);
 	}
 
+	@PostMapping(value = "/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+	public boolean updateSysUser(@RequestBody SysUser user) {
+		user.setUpdateTime(new Date());
+		sysUserService.update(user);
+		return true;
+	}
+
 	@ApiOperation(value = "新增用户")
-    @PreAuthorize("@pcs.hasPermissions('user/add')")
+	@PreAuthorize("@pcs.hasPermissions('user/add')")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object add(@RequestBody SysUser sysUser) {
 		return succeed(sysUserService.add(sysUser));
@@ -143,7 +150,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "获取用户角色列表")
 	@GetMapping("/getRole")
-    @PreAuthorize("@pcs.hasPermissions('user/getRole')")
+	@PreAuthorize("@pcs.hasPermissions('user/getRole')")
 	public Object getRole() {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
@@ -156,7 +163,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/addRole", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    @PreAuthorize("@pcs.hasPermissions('user/addRole')")
+	@PreAuthorize("@pcs.hasPermissions('user/addRole')")
 	public Object getRole(String userId, String roleIds) {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
@@ -169,7 +176,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
 	@PostMapping(value = "/delRole", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    @PreAuthorize("@pcs.hasPermissions('user/delRole')")
+	@PreAuthorize("@pcs.hasPermissions('user/delRole')")
 	public Object delRole(String userId, String roleIds) {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);

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

@@ -6,6 +6,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ClassGroupRelationDao extends BaseDAO<Integer, ClassGroupRelation> {
 
@@ -39,4 +40,18 @@ public interface ClassGroupRelationDao extends BaseDAO<Integer, ClassGroupRelati
      * @return
      */
     int deleteBySubClassId(@Param("classGroupId") Integer subClassGroupId);
+
+    /**
+     * 获取乐团班级关系列表
+     * @param musicGroupId
+     * @return
+     */
+    List<Map<Integer,Integer>> queryClassRelationIdMap(String musicGroupId);
+
+    /**
+     * 获取乐团班级关系列表
+     * @param musicGroupId
+     * @return
+     */
+    List<Map<Integer,String>> queryClassRelationNameMap(String musicGroupId);
 }

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

@@ -136,6 +136,13 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     List<Map<Integer,String>> queryTeacherMap(String musicGroupId);
 
     /**
+     * 获取乐团下的教师map
+     * @param musicGroupId
+     * @return
+     */
+    List<Map<Integer,String>> queryTeacherIdMap(String musicGroupId);
+
+    /**
      * 根据角色编号获取有权限的用户列表
      * @param roleIds
      * @return

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

@@ -229,7 +229,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param musicGroupId
      * @return
      */
-    List<Map<Integer, String>> findMapByMusicGroupId(String musicGroupId);
+    List<Map<Integer, String>> findMapByMusicGroupId(@Param("musicGroupId") String musicGroupId,@Param("paymentStatus")Integer paymentStatus);
 
     /**
      * 乐团开启缴费

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

@@ -17,6 +17,27 @@ public class ClassGroupTeachersDto extends ClassGroup {
 	/** 班级老师课酬 */
 	private List<ClassGroupTeacherSalary> classGroupTeacherSalaryList;
 
+	//合奏班名称
+	private String mixClassName;
+
+	//合奏班编号
+	private Integer mixClassId;
+
+	public String getMixClassName() {
+		return mixClassName;
+	}
+
+	public void setMixClassName(String mixClassName) {
+		this.mixClassName = mixClassName;
+	}
+
+	public Integer getMixClassId() {
+		return mixClassId;
+	}
+
+	public void setMixClassId(Integer mixClassId) {
+		this.mixClassId = mixClassId;
+	}
 
 	public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
 		return classGroupTeacherMapperList;

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

@@ -1,71 +1,33 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-
-/**
- * @program: mec
- * @description: 提现
- * @author: xw
- * @create: 2019-09-23 17:12
- */
-public class WithdrawDto extends QueryInfo {
-
-    @ApiModelProperty(value = "用户id",required = false)
-    private Integer userId;
-
-    @ApiModelProperty(value = "银行卡号", required = true)
-    private String bankCardNo;
 
-    @ApiModelProperty(value = "提现金额", required = true)
-    private BigDecimal amount;
-
-    @ApiModelProperty(value = "交易类型", required = true)
-    private Integer TransType;
-
-    public WithdrawDto() {
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
+import com.ym.mec.common.page.QueryInfo;
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
+public class WithdrawDto extends QueryInfo {
 
-    public String getBankCardNo() {
-        return bankCardNo;
-    }
+	@ApiModelProperty(value = "用户id", required = false)
+	private Integer userId;
 
-    public void setBankCardNo(String bankCardNo) {
-        this.bankCardNo = bankCardNo;
-    }
+	@ApiModelProperty(value = "银行卡号", required = true)
+	private String bankCardNo;
 
-    public BigDecimal getAmount() {
-        return amount;
-    }
+	public WithdrawDto() {
+	}
 
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
+	public Integer getUserId() {
+		return userId;
+	}
 
-    public Integer getTransType() {
-        return TransType;
-    }
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
 
-    public void setTransType(Integer transType) {
-        TransType = transType;
-    }
+	public String getBankCardNo() {
+		return bankCardNo;
+	}
 
-    @Override
-    public String toString() {
-        return "WithdrawDto{" +
-                "userId=" + userId +
-                ", bankCardNo='" + bankCardNo + '\'' +
-                ", amount=" + amount +
-                ", TransType=" + TransType +
-                '}';
-    }
+	public void setBankCardNo(String bankCardNo) {
+		this.bankCardNo = bankCardNo;
+	}
 }

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

@@ -19,9 +19,10 @@ public interface StudentWithdrawService extends BaseService<Integer, StudentWith
 	 * @param memo 备注
 	 * @param transNo 交易流水号
 	 * @param transType 交易渠道
+	 * @param platformAccountNo 平台账户号
 	 * @return
 	 */
-	boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType);
+	boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType, String platformAccountNo);
 
 	/**
 	 * 根据学员id查询提现记录

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

@@ -25,7 +25,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param messageType
 	 * @return
 	 */
-	boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType, Object... args);
+	boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType,String memo, Object... args);
 
 	/**
 	 * 批量发送消息

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

@@ -1,13 +1,10 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto;
+import java.util.List;
+
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
-import java.util.List;
-
 public interface SysUserBankCardService extends BaseService<Long, SysUserBankCard> {
 
     /**

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

@@ -418,6 +418,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroupTeachersDto> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId, type, classGroupId);
 
         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupAndTeachersList);
+        //获取当前乐团的合奏班id列表map
+        HashMap<Integer,Integer> idMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupRelationDao.queryClassRelationIdMap(musicGroupId))), HashMap.class);
+        HashMap<Integer,String> nameMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupRelationDao.queryClassRelationNameMap(musicGroupId))), HashMap.class);
 
         for (ClassGroupTeachersDto classGroupAndTeachers : classGroupAndTeachersList) {
             List<ClassGroupTeacherMapper> oneClassGroupTeacherMapperList = new ArrayList<>();
@@ -426,6 +429,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     oneClassGroupTeacherMapperList.add(classGroupTeacherMapper);
                 }
             }
+            classGroupAndTeachers.setMixClassName(nameMap.get(classGroupAndTeachers.getId()));
+            classGroupAndTeachers.setMixClassId(idMap.get(classGroupAndTeachers.getId()));
             classGroupAndTeachers.setClassGroupTeacherMapperList(oneClassGroupTeacherMapperList);
         }
         return classGroupAndTeachersList;

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

@@ -849,7 +849,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleComplaints.getCourseScheduleId());
 		Set<Integer> roleIds = new HashSet<>(1);
 		roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
-		sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPEAL,courseSchedule.getName(),user.getUsername());
+		sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPEAL,"",courseSchedule.getName(),user.getUsername());
 	}
 
 	@Override

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

@@ -136,13 +136,15 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 
             List<Integer> collect = new ArrayList<>();
             if(!CollectionUtils.isEmpty(teacherAttendancesTemp)){
-                teacherAttendancesTemp.stream().map(TeacherAttendance::getTeacherId).collect(Collectors.toList());
+                collect = teacherAttendancesTemp.stream().map(TeacherAttendance::getTeacherId).collect(Collectors.toList());
             }
             if(CollectionUtils.isEmpty(collect)||!collect.contains(courseScheduleTeacherSalary.getUserId())){
                 teacherAttendances.add(new TeacherAttendance(courseScheduleTeacherSalary.getUserId(),courseScheduleTeacherSalary.getCourseScheduleId()));
             }
         });
-        teacherAttendanceDao.batchInsert(teacherAttendances);
+        if(!CollectionUtils.isEmpty(teacherAttendances)){
+            teacherAttendanceDao.batchInsert(teacherAttendances);
+        }
     }
 
     @Override

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

@@ -14,6 +14,7 @@ import java.util.stream.Collectors;
 import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.util.http.HttpUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -169,7 +170,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT){
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.SECTION_MANAGER);
-            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY);
+            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY,"");
         }
         // 保存乐团付费主体列表
         //批量新增
@@ -283,18 +284,29 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
         musicGroupDao.update(musicGroup);
-        //给老师发送乐团成立通知
-        //获取所有和乐团相关的老师列表
-        Map<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(musicGroupDao.queryTeacherMap(musicGroupId))),HashMap.class);
-        sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN,
-                map,null,0,musicGroup.getName());
+        //3.0发送该消息
+        if(new Integer(3).equals(musicGroup.getChargeTypeId())){
+            //给老师发送乐团成立通知
+            Map<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(musicGroupDao.queryTeacherMap(musicGroupId))),HashMap.class);
+            sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN,
+                    map,null,0,"1",musicGroup.getName());
+        }
+        Map<Integer,String> studentMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findMapByMusicGroupId(musicGroupId,2))),HashMap.class);
+
+        if(studentMap != null && studentMap.size() > 0){
+            String url = "http://mstudev.dayaedu.com/#/smallRegister?musicGroupId=" + musicGroupId;
+            String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
+            sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE,
+                    studentMap,null,0,"5?" + url,musicGroup.getName(),HttpUtil.getSortUrl(url),serverPhone);
+        }
+
         Set<Integer> roleIds = new HashSet<>(5);
         roleIds.add(SysUserRole.SECTION_MANAGER);
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
         roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
         roleIds.add(SysUserRole.DEAN_OF_STUDIES);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_ACTION_GROUP,musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_ACTION_GROUP,"1",musicGroup.getName());
     }
 
     private MusicGroup saveLog(String musicGroupId,MusicGroupStatusEnum statusEnum) throws Exception {
@@ -324,7 +336,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY);
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY,"");
     }
 
     @Override
@@ -358,7 +370,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
         roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_ACTION_APPLY,musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_ACTION_APPLY,"",musicGroup.getName());
     }
 
     @Override
@@ -434,14 +446,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 map.put(e.getUserId(),e.getParentsPhone());
             });
             sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.STUDENT_PUSH_MUSIC_GROUP_CLOSE,
-                    map,null,0,"",musicGroup.getName(),sysConfigDao.findConfigValue(SysConfigService.REFUND_PERIOD));
+                    map,null,0,"1",musicGroup.getName(),sysConfigDao.findConfigValue(SysConfigService.REFUND_PERIOD));
         }
         //记录建团日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"取消乐团",sysUser.getId(),""));
         Set<Integer> roleIds = new HashSet<>(2);
         roleIds.add(SysUserRole.SECTION_MANAGER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_STOP,musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_STOP,"1",musicGroup.getName());
         return true;
     }
 
@@ -527,7 +539,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
         roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_LENGTHEN_PAYMENT,musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_LENGTHEN_PAYMENT,"",musicGroup.getName());
         return true;
     }
 
@@ -549,7 +561,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupQuitDao.insert(musicGroupQuit);
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_QUIT_GROUP,sysUser.getUsername());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_QUIT_GROUP,"",sysUser.getUsername());
         return true;
     }
 
@@ -763,17 +775,17 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             
             // 发送续费结果通知
 
-            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS, receivers, null, 0, "",
+            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS, receivers, null, 0, "1",
                     studentRegistration.getParentsName(),studentPaymentOrder.getActualAmount());
-            sysMessageService.batchSendMessage(MessageSender.YIMEI, MessageTypeEnum.STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS, receivers, null, 0, "",
+            sysMessageService.batchSendMessage(MessageSender.YIMEI, MessageTypeEnum.STUDENT_SMS_MUSIC_GROUP_RENEW_SUCCESS, receivers, null, 0, "1",
                     studentRegistration.getParentsName(),studentPaymentOrder.getActualAmount());
             return true;
         }
         if(studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAilED){
             String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
-            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_MUSIC_GROUP_RENEW_FAILED, receivers, null, 0, "",
+            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_MUSIC_GROUP_RENEW_FAILED, receivers, null, 0, "1",
                     studentApplyUrl);
-            sysMessageService.batchSendMessage(MessageSender.YIMEI, MessageTypeEnum.STUDENT_PUSH_MUSIC_GROUP_RENEW_FAILED, receivers, null, 0, "",
+            sysMessageService.batchSendMessage(MessageSender.YIMEI, MessageTypeEnum.STUDENT_PUSH_MUSIC_GROUP_RENEW_FAILED, receivers, null, 0, "1",
                     studentApplyUrl);
             return false;
         }
@@ -812,7 +824,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicGroup musicGroup = musicGroupDao.get(classGroupDao.findByCourseSchedule(courseScheduleId.intValue()).getMusicGroupId());
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_TEACHER_AMOUNT_CHANGE,
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_TEACHER_AMOUNT_CHANGE,"",
                 teacher.getRealName(),musicGroup.getName(),scope.equals("all")?"所有":"本次");
         return true;
     }
@@ -978,7 +990,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //所有人开启缴费
         studentRegistrationDao.musicGroupOpenPay(musicGroupId,PaymentStatusEnum.OPEN);
         //获取所有已报名学员列表
-        HashMap<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findMapByMusicGroupId(musicGroupId))), HashMap.class);
+        HashMap<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findMapByMusicGroupId(musicGroupId,0))), HashMap.class);
         if(map != null && map.size() > 0){
             String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
             String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
@@ -989,7 +1001,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         roleIds.add(SysUserRole.SECTION_MANAGER);
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_ACTION_PAYMENT,musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_ACTION_PAYMENT,"",musicGroup.getName());
         return musicGroup;
     }
 
@@ -1060,6 +1072,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		}
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_MARKING,musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_MARKING,"",musicGroup.getName());
     }
 }

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

@@ -339,7 +339,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 				//点名完成推送
 				Map<Integer, String> receivers = new HashMap<Integer, String>(1);
 				receivers.put(userId, userId.toString());
-				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_NAMES_ACHIEVE, receivers, null, 0, "",
+				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_NAMES_ACHIEVE, receivers, null, 0, "2",
 						DateUtil.format(date,DateUtil.DATE_FORMAT_MIN));
 				//修改课程状态(如果是学生签到，并且课程未开始)
 				/*if(StudentAttendanceStatusEnum.NORMAL == statusEnum && courseSchedule.getStatus() == CourseStatusEnum.NOT_START){

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

@@ -116,7 +116,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         Set<Integer> roleIds = new HashSet<>(2);
         roleIds.add(SysUserRole.SECTION_MANAGER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_SUBJECT_CHANGE,musicGroup.getName());
+        sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_STUDENT_SUBJECT_CHANGE,"",musicGroup.getName());
         return studentRegistrationDao.batchUpdateSubject(userId, subId, musicGroupId);
     }
 
@@ -436,7 +436,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_ADD_STUDENT,musicGroup.getName(),studentRegistration.getName());
+            sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_ADD_STUDENT,"",musicGroup.getName(),studentRegistration.getName());
             //增加报名学生数
 //            musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(),1);
             if (studentRegistration.getClassGroupId() != null) {
@@ -539,11 +539,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             Map<Integer,String> map = new HashMap<>(1);
             map.put(studentPaymentOrder.getUserId(),studentRegistration.getParentsPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,
-                    MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS,map,null,0,"",
+                    MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS,map,null,0,"1",
                     studentRegistration.getParentsName(),studentPaymentOrder.getActualAmount());
             //push
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-                    MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS,map,null,0,"",
+                    MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS,map,null,0,"1",
                     studentRegistration.getParentsName(),studentPaymentOrder.getActualAmount());
         }
 
@@ -559,11 +559,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             Map<Integer,String> map = new HashMap<>(1);
             map.put(studentPaymentOrder.getUserId(),studentRegistration.getParentsPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,
-                    MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED,map,null,0,"",
-                    studentApplyUrl);
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-                    MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED,map,null,0,"",
+                    MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED,map,null,0,"1",
                     studentApplyUrl);
+//            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
+//                    MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED,map,null,0,"1",
+//                    studentApplyUrl);
         }
 
         return studentPaymentOrder;

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

@@ -9,6 +9,7 @@ import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.service.SysMessageService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -64,7 +65,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType) {
+	public boolean confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType, String platformAccountNo) {
 
 		StudentWithdraw studentWithdraw = get(id);
 
@@ -81,6 +82,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 		studentWithdraw.setModifyTime(date);
 		studentWithdraw.setStatus(status);
 		studentWithdraw.setTransNo(transNo);
+		studentWithdraw.setPlatformAccountNo(platformAccountNo);
 
 		studentWithdrawDao.update(studentWithdraw);
 
@@ -94,13 +96,13 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 				throw new BizException("账户冻结金额异常");
 			}
 			sysUserCashAccount.setFrozenAmount(sysUserCashAccount.getFrozenAmount().subtract(amount));
-			
-			if(status == DealStatusEnum.FAilED){
+
+			if (status == DealStatusEnum.FAilED) {
 				sysUserCashAccount.setBalance(sysUserCashAccount.getBalance().add(amount));
 			}
 			sysUserCashAccount.setUpdateTime(date);
 			cashAccountService.update(sysUserCashAccount);
-			
+
 			SysUserCashAccountDetail sysUserCashAccountDetail = new SysUserCashAccountDetail();
 			sysUserCashAccountDetail.setUserId(userId);
 			sysUserCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.WITHDRAW);
@@ -111,7 +113,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 			sysUserCashAccountDetail.setTransNo(transNo);
 			sysUserCashAccountDetail.setTransType(transType);
 			sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
-			
+
 			cashAccountDetailService.insert(sysUserCashAccountDetail);
 
 		} catch (Exception e) {
@@ -186,10 +188,11 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 				cashAccountDetail.setBalance(subtract);
 				cashAccountDetail.setCreateTime(date);
 				cashAccountDetail.setStatus(DealStatusEnum.ING);
+				cashAccountDetail.setAttribute(withdraw.getId()+"");
 				cashAccountDetailService.insert(cashAccountDetail);
 				Set<Integer> roleIds = new HashSet<>(1);
 				roleIds.add(SysUserRole.SECTION_MANAGER);
-				sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds), MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_WITHDRAW,sysUser.getUsername());
+				sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds), MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_WITHDRAW,"",sysUser.getUsername());
 			} else {
 				throw new Exception("账户余额不足");
 			}

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

@@ -136,7 +136,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType, Object... args) {
+	public boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType,String memo, Object... args) {
 		if (userIds == null || userIds.size() == 0) {
 			throw new BizException("接收地址不能为空");
 		}
@@ -162,6 +162,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			message.setType(MessageSendMode.SEO);
 			message.setTitle(messageConfig.getDescription());
 			message.setReadStatus(0);
+			message.setMemo(memo);
 			messages.add(message);
 		}
 		sysMessageDao.batchInsert(messages);

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

@@ -1,25 +1,30 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.SysUserBankCardDao;
-import com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto;
-import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
-import com.ym.mec.biz.service.SysUserBankCardService;
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.SysUserBankCardDao;
+import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.service.SysUserBankCardService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 @Service
 public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBankCard> implements SysUserBankCardService {
 	
 	@Autowired
 	private SysUserBankCardDao sysUserBankCardDao;
+	
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+	
 	@Autowired
 	private RedisTemplate<String,String> redisTemplate;
 	private final String loginVerifyCodeKey = "loginVerifyCode:";
@@ -45,6 +50,17 @@ public class SysUserBankCardServiceImpl extends BaseServiceImpl<Long, SysUserBan
             sysUserBankCardDao.setNotDefault(sysUserBankCard.getUserId());
         }
 		sysUserBankCardDao.insert(sysUserBankCard);
+		
+		//更新user表信息
+		Integer userId = sysUserBankCard.getUserId();
+		SysUser user = sysUserFeignService.queryUserById(userId);
+		if(user == null){
+			throw new BizException("用户信息查询失败");
+		}
+		user.setRealName(sysUserBankCard.getRealName());
+		user.setIdCardNo(sysUserBankCard.getIdCardNo());
+		sysUserFeignService.updateSysUser(user);
+		
 		return sysUserBankCard;
 	}
 

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

@@ -237,7 +237,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				Map<Integer,String> userMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(courseScheduleDao.findStudentMap(courseScheduleId))),HashMap.class);
 				if(userMap != null && userMap.size() > 0){
 					sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.STUDENT_PUSH_ONLINE_COURSE_ACTION,userMap,
-							null,0,"",courseSchedule.getName());
+							null,0,"6?sealClassId=" + courseScheduleId,courseSchedule.getName());
 				}
 			}
 		}

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

@@ -87,7 +87,7 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 		Set<Integer> roleIds = new HashSet<>(1);
 		Teacher teacher = teacherDao.get(userId);
 		roleIds.add(SysUserRole.DEAN_OF_STUDIES);
-		sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.EDUCATION_PUSH_TEACHER_LEAVE_APPLY,teacher.getRealName());
+		sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds),MessageTypeEnum.EDUCATION_PUSH_TEACHER_LEAVE_APPLY,"",teacher.getRealName());
 		return true;
 	}
 

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

@@ -864,7 +864,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		sysUserCashAccountDetailService.insert(sysUserExpendCashAccountDetail);
 		Map<Integer,String> map = new HashMap<>(1);
 		map.put(userId,userId.toString());
-		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_VIP_BUY, map, null, 0, "",
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_VIP_BUY, map, null, 0, "2",
 				vipGroup.getName());
 
 		//生成学生单课缴费信息

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

@@ -526,13 +526,10 @@
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
                 cg.del_flag_ = 0
-            <if test="classScheduleType != null and classScheduleType != ''">
+            <if test="classScheduleType != null">
                 AND cs.type_ = #{classScheduleType}
             </if>
-            <if test="classScheduleType == null or classScheduleType == ''">
-                AND (cs.type_ = 'NORMAL' OR cs.type_ = 'MIX' OR cs.type_ = 'HIGH')
-            </if>
-            <if test="classScheduleStatus != null and classScheduleStatus != ''">
+            <if test="classScheduleStatus != null">
                 AND cs.status_ = #{classScheduleStatus}
             </if>
             <if test="startTime != null and startTime != ''">

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

@@ -83,6 +83,17 @@
     <select id="findClassGroupRelation" resultMap="ClassGroupRelation">
         SELECT * FROM class_group_relation WHERE sub_class_group_id_ = #{subClassGroupId}
     </select>
+    <select id="queryClassRelationIdMap" resultType="java.util.Map">
+        SELECT class_group_id_ 'value',sub_class_group_id_ 'key' FROM class_group_relation cgr
+        WHERE cgr.class_group_id_ IN (SELECT cg.id_ FROM class_group cg
+        WHERE cg.music_group_id_ = #{musicGroupId} AND cg.type_ = 'MIX')
+    </select>
+    <select id="queryClassRelationNameMap" resultType="java.util.Map">
+        SELECT sub_class_group_id_ 'key' ,cg.name_ 'value'
+        FROM class_group_relation cgr LEFT JOIN class_group cg ON cgr.class_group_id_ = cg.id_
+        WHERE cgr.class_group_id_ IN (SELECT cg.id_ FROM class_group cg
+        WHERE cg.music_group_id_ = #{musicGroupId} AND cg.type_ = 'MIX')
+    </select>
     <delete id="deleteBySubClassId">
         DELETE FROM class_group_relation WHERE sub_class_group_id_ = #{classGroupId}
     </delete>

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

@@ -341,4 +341,9 @@
 			#{item}
 		</foreach>
 	</select>
+	<select id="queryTeacherIdMap" resultType="java.util.Map">
+		SELECT cgtm.user_id_ 'key',cgtm.user_id_ 'value' FROM class_group_teacher_mapper cgtm
+		WHERE cgtm.music_group_id_ = #{musicGroupId}
+		GROUP BY cgtm.user_id_
+	</select>
 </mapper>

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

@@ -472,7 +472,10 @@
     </select>
     <select id="findMapByMusicGroupId" resultType="java.util.Map">
         SELECT sr.user_id_ 'key',MIN(sr.parents_phone_) 'value' FROM student_registration sr
-        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.payment_status_ != 2
+        WHERE sr.music_group_id_ = #{musicGroupId}
+        <if test="paymentStatus != null">
+            AND sr.payment_status_ = #{paymentStatus}
+        </if>
         GROUP BY sr.user_id_
     </select>
 

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

@@ -25,7 +25,7 @@
         <result column="balance_" property="balance"/>
         <result column="real_name_" property="realName"/>
     </resultMap>
-
+    
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="StudentWithdraw">
 		SELECT * FROM student_withdraw WHERE id_ = #{id}
@@ -96,10 +96,13 @@
         SELECT sw.*,cad.platform_account_no_,cad.channel_,su.real_name_,cad.balance_
         FROM student_withdraw sw
         LEFT JOIN sys_user_cash_account_detail cad ON sw.id_ = cad.attribute1_
-        LEFT JOIN sys_user su ON sw.id_ = cad.attribute1_
+        LEFT JOIN sys_user su ON su.id_ = sw.user_id_
         <where>
             <if test="userId != null">
-                sw.user_id_ = #{userId}
+                and sw.user_id_ = #{userId}
+            </if>
+            <if test="bankCardNo != null">
+                and sw.bank_card_no_ = #{bankCardNo}
             </if>
         </where>
         ORDER BY sw.create_time_ DESC
@@ -111,7 +114,10 @@
 		SELECT COUNT(*) FROM student_withdraw
         <where>
             <if test="userId != null">
-                user_id_ = #{userId}
+                and user_id_ = #{userId}
+            </if>
+            <if test="bankCardNo != null">
+                and bank_card_no_ = #{bankCardNo}
             </if>
         </where>
 	</select>

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

@@ -175,7 +175,7 @@
     </select>
     
     <select id="findByTeacherAttendanceInfo" resultMap="TeacherAttendance">
-        SELECT * FROM teacher_attendance WHERE teacher_id_=#{teacherId} AND course_schedule_id_=#{courseScheduleId}
+        SELECT * FROM teacher_attendance WHERE teacher_id_=#{teacherId} AND course_schedule_id_=#{courseScheduleId} LIMIT 1
     </select>
 
     <resultMap id="TeacherAbnormalAttendanceInfoDto" type="com.ym.mec.biz.dal.dto.TeacherAbnormalAttendanceInfoDto">

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

@@ -6,10 +6,7 @@ import com.huifu.adapay.model.payment.Payment;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.VipGroupService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.thirdparty.adapay.NotifyEvent;
 import com.ym.mec.thirdparty.adapay.Pay;

mec-util/src/main/java/com/ym/mec/util/http/HttpUtil.java

@@ -4,15 +4,18 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -35,6 +38,15 @@ import com.ym.mec.util.compress.ZipUtil;
 
 public class HttpUtil {
 
+	public static String getSortUrl(String url) throws IOException {
+		Map<String,Object> paramMap = new HashMap<>();
+		paramMap.put("format","json");
+		paramMap.put("url",URLDecoder.decode(url,"UTF-8"));
+		paramMap.put("key","5dc941c5d3c3816ac84898d7@3d0e03b46a30f4fea51f038e5cd411c5");
+		String s = get("http://mrw.so/api.htm", paramMap);
+		return JSONObject.parseObject(s).getString("url");
+	}
+
 	/**
 	 * POST请求http url
 	 * 

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

@@ -27,8 +27,8 @@ public class StudentWithdrawController extends BaseController {
 	@PostMapping("confirm")
 	@ApiOperation(value = "确认提现")
 	@PreAuthorize("@pcs.hasPermissions('studentWithdraw/confirm')")
-	public Object confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType) {
-		studentWithdrawService.confirmWithdraw(id, status, memo, transNo, transType);
+	public Object confirmWithdraw(Integer id, DealStatusEnum status, String memo, String transNo, TransTypeEnum transType, String platformAccountNo) {
+		studentWithdrawService.confirmWithdraw(id, status, memo, transNo, transType, platformAccountNo);
 		return succeed();
 	}