Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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/service/impl/MusicGroupServiceImpl.java

@@ -272,26 +272,26 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         MusicGroup musicGroup = saveLog(musicGroupId,MusicGroupStatusEnum.PREPARE);
         //乐器采购清单是否确认
-        Map<String,Object> param = new HashMap<>();
-        param.put("musicGroupId",musicGroupId);
-        int i = musicGroupPurchaseListDao.queryCount(param);
-        if(i <= 0){
-            throw new Exception("采购清单未确认");
-        }
+//        Map<String,Object> param = new HashMap<>();
+//        param.put("musicGroupId",musicGroupId);
+//        int i = musicGroupPurchaseListDao.queryCount(param);
+//        if(i <= 0){
+//            throw new Exception("采购清单未确认");
+//        }
         //课酬是否确认
 //        courseScheduleTeacherSalaryDao.queryCount();
         //记录操作日志
-        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
-        musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
-        musicGroupDao.update(musicGroup);
+//        musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
+//        musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
+//        musicGroupDao.update(musicGroup);
         //3.0发送该消息
         if(new Integer(3).equals(musicGroup.getChargeTypeId())){
             //给老师发送乐团成立通知
-            Map<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(musicGroupDao.queryTeacherIdMap(musicGroupId))),HashMap.class);
-            sysMessageService.batchSendMessage(MessageSender.JIGUANG,MessageTypeEnum.TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN,
+            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))),HashMap.class);
+        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;
@@ -990,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);

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-util/src/main/java/com/ym/mec/util/http/HttpUtil.java

@@ -40,8 +40,8 @@ public class HttpUtil {
 
 	public static String getSortUrl(String url) throws IOException {
 		Map<String,Object> paramMap = new HashMap<>();
-		URLDecoder.decode(url,"UTF-8");
 		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");