update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicCardDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -28,8 +29,11 @@ public class MusicCardDto {
     @ApiModelProperty(value = "所在班级",required = true)
     private String currentClass;
 
-    @ApiModelProperty(value = "是否缴费",required = true)
-    private YesOrNoEnum paymentStatus;
+//    @ApiModelProperty(value = "是否缴费",required = true)
+//    private YesOrNoEnum paymentStatus;
+
+    @ApiModelProperty(value = "缴费状态",required = true)
+    private MusicGroupStudentFee.PaymentStatus paymentStatus;
 
     @ApiModelProperty(value = "乐团数量",required = true)
     private Integer musicGroupNum;
@@ -37,6 +41,10 @@ public class MusicCardDto {
     @ApiModelProperty(value = "vip课数量",required = true)
     private Integer vipClassNum;
 
+    public void setPaymentStatus(MusicGroupStudentFee.PaymentStatus paymentStatus) {
+        this.paymentStatus = paymentStatus;
+    }
+
     public String getMusicGroupId() {
         return musicGroupId;
     }
@@ -101,14 +109,6 @@ public class MusicCardDto {
         this.currentClass = currentClass;
     }
 
-    public YesOrNoEnum getPaymentStatus() {
-        return paymentStatus;
-    }
-
-    public void setPaymentStatus(YesOrNoEnum paymentStatus) {
-        this.paymentStatus = paymentStatus;
-    }
-
     public String getRegisterId() {
         return registerId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -10,7 +10,7 @@ public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
 	MIX("MIX", "合奏班级"),
 	HIGH("HIGH", "提高班"),
 	VIP("VIP", "vip课"),
-	DEMO("demo", "试听课");
+	DEMO("DEMO", "试听课");
 
 	private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/KitPurchaseMethodEnum.java

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
  * 器材购买方式（团购、自备）
  */
 public enum KitPurchaseMethodEnum implements BaseEnum<String, KitPurchaseMethodEnum> {
-	GROUP("GROUP", "团购"), OWNED("OWNED", "自备");
+	GROUP("GROUP", "团购"), OWNED("OWNED", "自备"), LEASE("LEASE", "租赁");
 
 	private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MusicGroupStatusEnum.java

@@ -4,7 +4,9 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum MusicGroupStatusEnum implements BaseEnum<String, MusicGroupStatusEnum> {
 
-	APPLY("APPLY", "报名中"), PAY("PAY", "缴费中"), PREPARE("PREPARE", "筹备中"), PROGRESS("PROGRESS", "进行中"), CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
+	APPLY("APPLY", "报名中"), PAY("PAY", "缴费中"),
+	PREPARE("PREPARE", "筹备中"), PROGRESS("PROGRESS", "进行中"),
+	CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");
 
 	private String code;
 	private String msg;

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

@@ -178,7 +178,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 	@Override
 	public List<MusicCardDto> queryUserMusicGroups(Integer userId) {
-		return musicGroupDao.queryUserMusicGroups(userId);
+		List<MusicCardDto> musicCardDtos = musicGroupDao.queryUserMusicGroups(userId);
+		//获取学员在该乐团续费状态
+		musicCardDtos.forEach(e->{
+			e.setPaymentStatus(musicGroupStudentFeeDao.findByUser(userId, e.getMusicGroupId()).getPaymentStatus());
+		});
+		return musicCardDtos;
 	}
 
 	@Override

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

@@ -150,12 +150,12 @@
 		<result column="music_group_id_" property="musicGroupId" />
 		<result column="vip_class_num_" property="vipClassNum" />
 		<result column="music_group_num_" property="musicGroupNum" />
-		<result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<!--<result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>-->
 	</resultMap>
 
     <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
-		SELECT sr.id_ register_id_,sr.name_ user_name_,sr.current_class_,sr.current_grade_,
-		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_,s.id_ subject_id_,mg.id_ music_group_id_
+		SELECT sr.id_ register_id_,sr.name_ user_name_,sr.current_class_,sr.current_grade_
+		,mg.name_ music_group_name_,s.name_ subject_name_,s.id_ subject_id_,mg.id_ music_group_id_
 		FROM student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_

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

@@ -155,8 +155,7 @@
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
             cs.status_ course_status_,
             su.username_ teacher_name_
-        FROM
-            class_group cg
+        FROM class_group cg
             LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
             <if test="vipGroupId!=null">
                 LEFT JOIN vip_group_class_group_mapper vgcgm ON cgsm.class_group_id_=vgcgm.class_group_id_
@@ -169,10 +168,7 @@
     </select>
 
     <select id="countStudentCourses" resultType="int">
-        SELECT
-        count(*)
-        FROM
-        class_group cg
+        SELECT count(cg.*) FROM class_group cg
         LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
         <if test="vipGroupId!=null">
             LEFT JOIN vip_group_class_group_mapper vgcgm ON cgsm.class_group_id_=vgcgm.class_group_id_