update

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

@@ -3,8 +3,10 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum MusicGroupStatusEnum implements BaseEnum<String, MusicGroupStatusEnum> {
-	DRAFT("DRAFT", "草稿"), AUDIT("AUDIT", "审核中"), AUDIT_FAILED("AUDIT_FAILED", "审核失败"), APPLY("APPLY", "报名中"), PAY("PAY", "缴费中"), PREPARE("PREPARE", "筹备中"), PROGRESS(
-			"PROGRESS", "进行中"), CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
+	DRAFT("DRAFT", "草稿"), AUDIT("AUDIT", "审核中"),
+	AUDIT_FAILED("AUDIT_FAILED", "审核失败"), APPLY("APPLY", "报名中"),
+	PAY("PAY", "缴费中"), PREPARE("PREPARE", "筹备中"),
+	PROGRESS("PROGRESS", "进行中"), CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
 
 	private String code;
 	private String msg;

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

@@ -231,4 +231,10 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @param musicGroupId
 	 */
 	void musicGroupAuditSuccess(String musicGroupId) throws Exception;
+
+	/**
+	 * 乐团筹备结束后，3.0乐团推送小班课缴费信息
+	 * @param musicGroupId
+	 */
+	void pushMessage(String musicGroupId) throws IOException;
 }

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

@@ -182,7 +182,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             });
             studentRegistrationDao.batchInsert(studentRegistrationList);
-            musicGroup.setStatus(MusicGroupStatusEnum.PREPARE);
+            musicGroup.setStatus(MusicGroupStatusEnum.PAY);
             musicGroupDao.update(musicGroup);
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "跨团调整", sysUser.getId(),""));
         }
@@ -261,7 +261,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
         musicGroupDao.update(musicGroup);
         //3.0发送该消息
-        if(new Integer(3).equals(musicGroup.getChargeTypeId())){
+        /*if(new Integer(3).equals(musicGroup.getChargeTypeId())){
             Map<Integer,String> studentMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findIdMapByMusicGroupId(musicGroupId,2))),HashMap.class);
             if(studentMap != null && studentMap.size() > 0){
                 String url = "http://mstudev.dayaedu.com/#/smallRegister?musicGroupId=" + musicGroupId;
@@ -269,7 +269,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE,
                         studentMap,null,0,"5?" + url,musicGroup.getName(),HttpUtil.getSortUrl(url),serverPhone);
             }
-        }
+        }*/
         //给老师发送乐团成立通知
         Map<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(musicGroupDao.queryTeacherIdMap(musicGroupId))),HashMap.class);
         if(map != null && map.size() > 0){
@@ -350,6 +350,21 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
+    public void pushMessage(String musicGroupId) throws IOException {
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        //3.0发送该消息
+        if(new Integer(3).equals(musicGroup.getChargeTypeId())){
+            Map<Integer,String> studentMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(studentRegistrationDao.findIdMapByMusicGroupId(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.JIGUANG,MessageTypeEnum.SMS_BASICS_SKILL_APPLY_MESSAGE,
+                        studentMap,null,0,"5?" + url,musicGroup.getName(),HttpUtil.getSortUrl(url),serverPhone);
+            }
+        }
+    }
+
+    @Override
     public List<MusicCardDto> queryUserMusicGroups(Integer userId) {
         List<MusicCardDto> musicCardDtos = musicGroupDao.queryUserMusicGroups(userId);
         Set<String> musicGroupIds = musicCardDtos.stream().map(MusicCardDto::getMusicGroupId).collect(Collectors.toSet());

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

@@ -365,7 +365,6 @@
 
     <sql id="queryTeacherAttendanceSql">
         <where>
-            (cs.type_ = 'SINGLE' OR cs.type_ = 'MIX')
             <if test="startTime != null and startTime != ''">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>

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

@@ -116,6 +116,21 @@ public class MusicGroupController extends BaseController {
 		return succeed(musicGroupService.createGroup(subFeeSettingDto));
 	}
 
+	@ApiOperation(value = "乐团筹备结束后，3.0乐团推送小班课缴费信息")
+	@PostMapping("/pushMessage")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/pushMessage')")
+	public Object pushMessage(String musicGroupId) throws Exception {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null || sysUser.getId() == null) {
+			return failed("获取用户信息失败");
+		}
+		if(StringUtils.isEmpty(musicGroupId)){
+			throw new Exception("参数校验错误");
+		}
+		musicGroupService.pushMessage(musicGroupId);
+		return succeed();
+	}
+
 	@ApiOperation(value = "根据乐团ids获取乐团列表")
 	@PostMapping("/queryListByIds")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/queryListByIds')")