Merge branch 'system_fee'

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

@@ -411,9 +411,22 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             user.setUsername(studentPreRegistration.getUserName());
             if (!user.getUserType().contains("STUDENT")) {
                 user.setUserType(user.getUserType() + ",STUDENT");
+                
+                Integer userId = user.getId();
+                //添加student
+                Student student = new Student();
+                student.setUserId(userId);
+                student.setCreateTime(date);
+                student.setUpdateTime(date);
+                student.setIsNewUser(true);
+                student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
+                student.setCurrentClass(studentPreRegistration.getCurrentClass());
+                studentDao.insert(student);
+                sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
             }
             user.setUpdateTime(new Date());
             teacherDao.updateUser(user);
+            
         }
 
         studentPreRegistration.setCreateTime(date);

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

@@ -864,6 +864,7 @@
                 AND DATEDIFF(MAX(cto.end_time_),NOW()) <= #{memberEndAutoQuitMusic} AND DATEDIFF(NOW(),MAX(cto.end_time_)) >= 0
             </if>
         </if>
+        <include refid="global.limit"/>
     </select>
     <sql id="queryMusicMemberListSql">
         <where>