会员试用

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

@@ -127,6 +127,34 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "试用会员截止时间",required = false)
     private Date experienceMembershipEndTime;
 
+    private Integer experienceMembershipDay;
+    private Integer membershipDay;
+    private Integer musicMembershipDay;
+
+    public Integer getExperienceMembershipDay() {
+        return experienceMembershipDay;
+    }
+
+    public void setExperienceMembershipDay(Integer experienceMembershipDay) {
+        this.experienceMembershipDay = experienceMembershipDay;
+    }
+
+    public Integer getMembershipDay() {
+        return membershipDay;
+    }
+
+    public void setMembershipDay(Integer membershipDay) {
+        this.membershipDay = membershipDay;
+    }
+
+    public Integer getMusicMembershipDay() {
+        return musicMembershipDay;
+    }
+
+    public void setMusicMembershipDay(Integer musicMembershipDay) {
+        this.musicMembershipDay = musicMembershipDay;
+    }
+
     public Date getMusicMembershipEndTime() {
         return musicMembershipEndTime;
     }

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

@@ -540,13 +540,19 @@
         <result column="membership_end_time_" property="membershipEndTime"/>
         <result column="music_membership_end_time_" property="musicMembershipEndTime"/>
         <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
+        <result column="experience_membership_day_" property="experienceMembershipDay"/>
+        <result column="membership_day_" property="membershipDay"/>
+        <result column="music_membership_day_" property="musicMembershipDay"/>
     </resultMap>
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
         SELECT sr.id_ student_registration_id_,sr.user_id_,su.username_ real_name_,su.gender_,su.phone_ parents_phone_,sr.current_grade_,sr.current_grade_date_,
         sr.current_class_,sr.music_group_status_ student_status_,sr.payment_status_,sr.subject_id_ reg_subject_id_,rs.name_ regSubjectName,sr.remark_,
         sr.actual_subject_id_ subject_id_,s.name_ subject_name_,sr.music_group_id_,CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
         IF(DATE_FORMAT(sr.create_time_,'%Y-%m-%d') > DATE_FORMAT(mg.payment_expire_date_,'%Y-%m-%d'),1,0) is_new_student_,
-        stu.care_package_,stu.come_on_package_,sr.create_time_ registerTime,sr.membership_end_time_ music_membership_end_time_,stu.membership_end_time_,stu.experience_membership_end_time_
+        stu.care_package_,stu.come_on_package_,sr.create_time_ registerTime,
+        sr.membership_end_time_ music_membership_end_time_,stu.membership_end_time_,stu.experience_membership_end_time_,
+        DATEDIFF(stu.experience_membership_end_time_,NOW()) experience_membership_day_,DATEDIFF(stu.membership_end_time_,NOW()) membership_day_
+        ,DATEDIFF(sr.membership_end_time_,NOW()) music_membership_day_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN subject s ON s.id_ = sr.actual_subject_id_