Merge branch 'online1'

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

@@ -640,14 +640,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StudentRegistration queryByUserIdAndMusicGroupId(Integer userId, String musicGroupId) {
-//        StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
-//        if (registration == null) {
-//            return null;
-//        }
-//        SysUserCashAccount account = sysUserCashAccountDao.getLocked(userId);
-//        registration.setBalance(account.getBalance());
-//        registration.setTransferStudent(registration.getTemporaryCourseFee() == null ? 0 : 1);
-        return studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+        StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+        if (registration == null) {
+            return null;
+        }
+        SysUserCashAccount account = sysUserCashAccountDao.getLocked(userId);
+        registration.setBalance(account==null?BigDecimal.ZERO : account.getBalance());
+        registration.setTransferStudent(0);
+        return registration;
     }
 
     @Override