会员试用

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

@@ -130,6 +130,26 @@ public class MusicGroupStudentsDto{
     private Integer experienceMembershipDay;
     private Integer membershipDay;
     private Integer musicMembershipDay;
+    //是否有未生效的云教练订单
+    private Boolean hasNoStartCloudTeacher = false;
+
+    private Integer memberRankSettingId;
+
+    public Integer getMemberRankSettingId() {
+        return memberRankSettingId;
+    }
+
+    public void setMemberRankSettingId(Integer memberRankSettingId) {
+        this.memberRankSettingId = memberRankSettingId;
+    }
+
+    public Boolean getHasNoStartCloudTeacher() {
+        return hasNoStartCloudTeacher;
+    }
+
+    public void setHasNoStartCloudTeacher(Boolean hasNoStartCloudTeacher) {
+        this.hasNoStartCloudTeacher = hasNoStartCloudTeacher;
+    }
 
     public Integer getExperienceMembershipDay() {
         return experienceMembershipDay;

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

@@ -114,6 +114,17 @@ public class StudentManageListDto {
 
     private Date experienceMembershipEndTime;
 
+    //是否有未生效的云教练订单
+    private Boolean hasNoStartCloudTeacher = false;
+
+    public Boolean getHasNoStartCloudTeacher() {
+        return hasNoStartCloudTeacher;
+    }
+
+    public void setHasNoStartCloudTeacher(Boolean hasNoStartCloudTeacher) {
+        this.hasNoStartCloudTeacher = hasNoStartCloudTeacher;
+    }
+
     public Integer getMembershipDay() {
         return membershipDay;
     }

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

@@ -169,7 +169,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             if(dto.getMemberRankSettingId() == null){
                 String s = cloudMap.get(dto.getUserId().longValue());
                 if(StringUtils.isNotEmpty(s)){
-                    dto.setMembershipEndTime(DateUtil.toDateTime(s));
+                    dto.setHasNoStartCloudTeacher(true);
                 }
             }
 
@@ -508,8 +508,15 @@ public class StudentManageServiceImpl implements StudentManageService {
             List<CloudTeacherOrder> studentCloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrders(collect, queryInfo.getMusicGroupId());
             Map<Integer, List<CloudTeacherOrder>> studentCloudTeacherMap = studentCloudTeacherOrders.stream().collect(Collectors.groupingBy(CloudTeacherOrder::getStudentId));
             Date nowDate = new Date();
-
+            Map<Long,String> cloudMap = MapUtil.convertMybatisMap(cloudTeacherOrderService.queryNoStartByUserIds(new HashSet<>(collect)));
             dataList.forEach(e->{
+                //如果会员已过期、是否有未生效的会员
+                if(e.getMemberRankSettingId() == null){
+                    String s = cloudMap.get(e.getUserId().longValue());
+                    if(StringUtils.isNotEmpty(s)){
+                        e.setHasNoStartCloudTeacher(true);
+                    }
+                }
                 e.setHasCourse(hasCourseStudent.contains(e.getUserId()));
                 e.setNoPaymentAmount(totalAmountMap.get(e.getUserId()));
                 if (studentWaitPayChange.containsKey(e.getUserId())) {

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

@@ -567,6 +567,7 @@
         <result column="experience_membership_day_" property="experienceMembershipDay"/>
         <result column="membership_day_" property="membershipDay"/>
         <result column="music_membership_day_" property="musicMembershipDay"/>
+        <result column="member_rank_setting_id_" property="memberRankSettingId"/>
     </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_,
@@ -576,7 +577,7 @@
         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_
+        ,DATEDIFF(sr.membership_end_time_,NOW()) music_membership_day_,s.member_rank_setting_id_
         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_