Merge remote-tracking branch 'origin/master'

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

@@ -1,12 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.math.BigDecimal;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
 
 /**
  * 对应数据库表(student_withdraw):
@@ -23,10 +24,6 @@ public class StudentWithdraw {
 	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 
-	/** 用户编号 */
-	@ApiModelProperty(value = "用户名",required = false)
-	private String realName;
-	
 	/** 银行卡号 */
 	@ApiModelProperty(value = "银行卡号",required = false)
 	private String bankCardNo;
@@ -43,10 +40,6 @@ public class StudentWithdraw {
 	@ApiModelProperty(value = "提现金额",required = false)
 	private BigDecimal amount;
 
-	/** 提现金额 */
-	@ApiModelProperty(value = "可用余额",required = false)
-	private BigDecimal balance;
-	
 	/** 用户承担的费用（单位：分） */
 	@ApiModelProperty(value = "用户承担的费用",required = false)
 	private BigDecimal feeUser;
@@ -63,50 +56,30 @@ public class StudentWithdraw {
 	@ApiModelProperty(value = "备注",required = false)
 	private String comment;
 
-	/** 描述 */
-	@ApiModelProperty(value = "支付渠道",required = false)
-	private String channel;
-
-	/** 备注 */
-	@ApiModelProperty(value = "平台账户号",required = false)
-	private String platformAccountNo;
-	
 	/** 创建时间 */
 	private java.util.Date createTime;
 	
 	/** 修改时间 */
 	private java.util.Date modifyTime;
+	
+	private SysUserCashAccountDetail detail = new SysUserCashAccountDetail();
+	
+	private SysUser user = new SysUser();
 
-	public String getRealName() {
-		return realName;
-	}
-
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-
-	public BigDecimal getBalance() {
-		return balance;
-	}
-
-	public void setBalance(BigDecimal balance) {
-		this.balance = balance;
-	}
-
-	public String getChannel() {
-		return channel;
+	public SysUser getUser() {
+		return user;
 	}
 
-	public void setChannel(String channel) {
-		this.channel = channel;
+	public void setUser(SysUser user) {
+		this.user = user;
 	}
 
-	public String getPlatformAccountNo() {
-		return platformAccountNo;
+	public SysUserCashAccountDetail getDetail() {
+		return detail;
 	}
 
-	public void setPlatformAccountNo(String platformAccountNo) {
-		this.platformAccountNo = platformAccountNo;
+	public void setDetail(SysUserCashAccountDetail detail) {
+		this.detail = detail;
 	}
 
 	public String getWithdrawNo() {

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

@@ -2,8 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
-
 import com.ym.mec.biz.dal.enums.TransTypeEnum;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -63,6 +63,14 @@ public class SysUserCashAccountDetail {
 
 	private String attribute;
 
+	/** 描述 */
+	@ApiModelProperty(value = "支付渠道",required = false)
+	private String channel;
+
+	/** 备注 */
+	@ApiModelProperty(value = "平台账户号",required = false)
+	private String platformAccountNo;
+
 	public String getAttribute() {
 		return attribute;
 	}
@@ -167,6 +175,22 @@ public class SysUserCashAccountDetail {
 		this.transType = transType;
 	}
 
+	public String getChannel() {
+		return channel;
+	}
+
+	public void setChannel(String channel) {
+		this.channel = channel;
+	}
+
+	public String getPlatformAccountNo() {
+		return platformAccountNo;
+	}
+
+	public void setPlatformAccountNo(String platformAccountNo) {
+		this.platformAccountNo = platformAccountNo;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -449,7 +449,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
 
                 if(musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.CLASSROOM_SALARY)){
-                    courseType = "CLASSROOM_SALARY";
+                    courseType = "CLASSROOM";
                 }
 
                 List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), courseType, type);

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

@@ -82,7 +82,6 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 		studentWithdraw.setModifyTime(date);
 		studentWithdraw.setStatus(status);
 		studentWithdraw.setTransNo(transNo);
-		studentWithdraw.setPlatformAccountNo(platformAccountNo);
 
 		studentWithdrawDao.update(studentWithdraw);
 
@@ -113,6 +112,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 			sysUserCashAccountDetail.setTransNo(transNo);
 			sysUserCashAccountDetail.setTransType(transType);
 			sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
+			sysUserCashAccountDetail.setPlatformAccountNo(platformAccountNo);
 
 			cashAccountDetailService.insert(sysUserCashAccountDetail);
 
@@ -178,7 +178,6 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 				account.setUpdateTime(date);
 				sysUserCashAccountDao.update(account);
 
-				withdraw.setBalance(subtract);
 				studentWithdrawDao.insert(withdraw);
 
 				SysUserCashAccountDetail cashAccountDetail = new SysUserCashAccountDetail();

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

@@ -526,10 +526,10 @@
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
                 cg.del_flag_ = 0
-            <if test="classScheduleType != null and classScheduleType != ''">
+            <if test="classScheduleType != null">
                 AND cs.type_ = #{classScheduleType}
             </if>
-            <if test="classScheduleStatus != null and classScheduleStatus != ''">
+            <if test="classScheduleStatus != null">
                 AND cs.status_ = #{classScheduleStatus}
             </if>
             <if test="startTime != null and startTime != ''">

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

@@ -20,10 +20,10 @@
         <result column="withdraw_no_" property="withdrawNo"/>
         <result column="create_time_" property="createTime"/>
         <result column="modify_time_" property="modifyTime"/>
-        <result column="channel_" property="channel"/>
-        <result column="platform_account_no_" property="platformAccountNo"/>
-        <result column="balance_" property="balance"/>
-        <result column="real_name_" property="realName"/>
+        <result column="channel_" property="detail.channel"/>
+        <result column="platform_account_no_" property="detail.platformAccountNo"/>
+        <result column="balance_" property="detail.balance"/>
+        <result column="real_name_" property="user.realName"/>
     </resultMap>
     
     <!-- 根据主键查询一条记录 -->

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

@@ -175,7 +175,7 @@
     </select>
     
     <select id="findByTeacherAttendanceInfo" resultMap="TeacherAttendance">
-        SELECT * FROM teacher_attendance WHERE teacher_id_=#{teacherId} AND course_schedule_id_=#{courseScheduleId}
+        SELECT * FROM teacher_attendance WHERE teacher_id_=#{teacherId} AND course_schedule_id_=#{courseScheduleId} LIMIT 1
     </select>
 
     <resultMap id="TeacherAbnormalAttendanceInfoDto" type="com.ym.mec.biz.dal.dto.TeacherAbnormalAttendanceInfoDto">