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

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

@@ -272,18 +272,18 @@ 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())){
             //给老师发送乐团成立通知

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

@@ -561,9 +561,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,
                     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);
+//            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
+//                    MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED,map,null,0,"1",
+//                    studentApplyUrl);
         }
 
         return studentPaymentOrder;