update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
-import java.sql.DatabaseMetaData;
 import java.sql.Date;
 
 /**
@@ -94,6 +93,27 @@ public class StudentRegistration {
     @ApiModelProperty(value = "临时课程费用", required = true)
     private BigDecimal temporaryCourseFee;
 
+    @ApiModelProperty(value = "余额", required = true)
+    private BigDecimal balance;
+
+    @ApiModelProperty(value = "是否是插班生0不是，1是", required = true)
+    private int transferStudent;
+
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+
+    public int getTransferStudent() {
+        return transferStudent;
+    }
+
+    public void setTransferStudent(int transferStudent) {
+        this.transferStudent = transferStudent;
+    }
 
     public ClassGroupStudentStatusEnum getMusicGroupStatus() {
         return musicGroupStatus;

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

@@ -412,7 +412,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public StudentRegistration queryByUserIdAndMusicGroupId(Integer userId, String musicGroupId) {
-        return studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+        StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+        SysUserCashAccount account = sysUserCashAccountDao.getLocked(userId);
+        registration.setBalance(account.getBalance());
+        registration.setTransferStudent(registration.getTemporaryCourseFee() == null?0:1);
+        return registration;
     }
 
     @Override

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

@@ -343,9 +343,9 @@
     </select>
 
     <select id="queryByUserIdAndMusicGroupId" resultMap="StudentRegistration">
-        select sr.*,su.id_card_no_ from student_registration sr
-        left join sys_user su on su.id_ =sr.user_id_
-        where sr.music_group_id_ = #{musicGroupId} and sr.user_id_ = #{userId} AND sr.music_group_status_ != 'QUIT'
+        SELECT sr.*,su.id_card_no_ FROM student_registration sr
+        LEFT JOIN sys_user su ON su.id_ =sr.user_id_
+        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.user_id_ = #{userId} AND sr.music_group_status_ != 'QUIT'
     </select>
 
     <!-- 根据乐团编号和手机号查询注册乐团注册信息-->