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

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

@@ -1700,7 +1700,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
             //更新实际缴费人数
             MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.getForLock(userLastCalenderDetail.getMusicGroupPaymentCalenderId());
-            musicGroupPaymentCalender.setActualNum(musicGroupPaymentCalender.getActualNum()+1);
+            Integer actualNum = musicGroupPaymentCalender.getActualNum() ==null ? 0:musicGroupPaymentCalender.getActualNum();
+            musicGroupPaymentCalender.setActualNum(actualNum);
             musicGroupPaymentCalender.setUpdateTime(date);
             musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);