Browse Source

系统收费

zouxuan 4 years ago
parent
commit
4625725484

+ 10 - 4
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicMemberDto.java

@@ -1,9 +1,5 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -19,12 +15,22 @@ public class MusicMemberDto {
 
 	private String musicGroupId;
 
+	private String phone;
+
 	private Integer memberDay;
 
 	private BigDecimal cloudTeacherAmount;
 
 	private Date visitTime;
 
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
 	public Date getVisitTime() {
 		return visitTime;
 	}

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

@@ -852,9 +852,10 @@
         <result property="username" column="username_"/>
         <result property="memberDay" column="member_day_"/>
         <result property="visitTime" column="visit_time_"/>
+        <result property="phone" column="phone_"/>
     </resultMap>
     <select id="queryMusicMemberList" resultMap="MusicMemberDto">
-        SELECT sr.user_id_,su.username_,o.name_ organ_name_,mg.name_ music_group_name_,
+        SELECT sr.user_id_,su.username_,su.phone_,o.name_ organ_name_,mg.name_ music_group_name_,
         DATEDIFF(MAX(cto.end_time_),NOW()) + 1 member_day_,sr.music_group_id_,MAX(sv.visit_time_) visit_time_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = sr.user_id_ AND cto.status_ IN (1,2)