Merge branch 'saas' into master_saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

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

@@ -555,6 +555,18 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChangeDao.insert(subjectChange);
         //差价小于0退到余额
         if (amountMargin.compareTo(BigDecimal.ZERO) <= 0) {
+            //sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
+            if (amountMargin.compareTo(BigDecimal.ZERO) < 0) {
+                SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
+                sysUserCashAccountLog.setUserId(subjectChange.getStudentId());
+                sysUserCashAccountLog.setGroupType(SUBJECT_CHANGE);
+                sysUserCashAccountLog.setOrganId(subjectChange.getOrganId());
+                sysUserCashAccountLog.setGroupId(subjectChange.getId().toString());
+                sysUserCashAccountLog.setAmount(amountMargin.negate());
+                sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.SUBJECT_CHANGE);
+                sysUserCashAccountLog.setComment("声部更换退还");
+                sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
+            }
             studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
         }
 

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

@@ -520,7 +520,7 @@
         <result property="username" column="username_"/>
         <result property="realName" column="real_name_"/>
         <result property="organId" column="organ_id_"/>
-        <result property="phone_" column="mobile"/>
+        <result property="mobile" column="phone_"/>
     </resultMap>
 
     <resultMap id="ExtendTeacherBasicDto" type="com.ym.mec.biz.dal.dto.ExtendTeacherBasicDto" extends="TeacherBasicDto">