Merge branch 'system_fee_update' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupStudentQueryInfo.java

@@ -48,6 +48,16 @@ public class MusicGroupStudentQueryInfo extends QueryInfo {
   private String createYear;
 
   private boolean isExport = false;
+  //是否有会员
+  private Integer hasMember;
+
+  public Integer getHasMember() {
+    return hasMember;
+  }
+
+  public void setHasMember(Integer hasMember) {
+    this.hasMember = hasMember;
+  }
 
   public Boolean getOweFlag() {
     return oweFlag;

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

@@ -2168,6 +2168,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     amount = amount.add(cloudTeacherAmount);
                     //清除学员云教练
                     studentService.cleanMember(userId);
+                    //如果有试用会员，不清除
+                    Student student = studentDao.get(userId);
+                    if(student.getExperienceMemberRankSettingId() != null){
+                        student.setMemberRankSettingId(student.getExperienceMemberRankSettingId());
+                        student.setMembershipStartTime(student.getExperienceMembershipStartTime());
+                        student.setMembershipEndTime(student.getExperienceMembershipEndTime());
+                        studentDao.update(student);
+                    }
                 }
             }else {
                 //删除乐团会员时长
@@ -2462,6 +2470,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 amount = amount.add(cloudTeacherAmount);
                 //清除学员云教练
                 studentService.cleanMember(userId);
+                //如果有试用会员，不清除
+                Student student = studentDao.get(userId);
+                if(student.getExperienceMemberRankSettingId() != null){
+                    student.setMemberRankSettingId(student.getExperienceMemberRankSettingId());
+                    student.setMembershipStartTime(student.getExperienceMembershipStartTime());
+                    student.setMembershipEndTime(student.getExperienceMembershipEndTime());
+                    studentDao.update(student);
+                }
             }
         }else {
             //删除乐团会员时长

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

@@ -467,6 +467,14 @@
 
     <sql id="queryMusicGroupStudentSql">
         <where>
+            <if test="hasMember != null">
+                <if test="hasMember == 0">
+                    AND s.member_rank_setting_id_ IS NULL
+                </if>
+                <if test="hasMember == 1">
+                    AND s.member_rank_setting_id_ IS NOT NULL
+                </if>
+            </if>
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.username_ LIKE CONCAT("%",#{search},"%") OR su.phone_ LIKE CONCAT("%",#{search},"%"))
             </if>

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

@@ -139,6 +139,15 @@
             <if test="membershipEndTime != null">
                 membership_end_time_=#{membershipEndTime},
             </if>
+            <if test="experienceMemberRankSettingId != null">
+                experience_member_rank_setting_id_=#{experienceMemberRankSettingId},
+            </if>
+            <if test="experienceMembershipStartTime != null">
+                experience_membership_start_time_=#{experienceMembershipStartTime},
+            </if>
+            <if test="experienceMembershipEndTime != null">
+                experience_membership_end_time_=#{experienceMembershipEndTime},
+            </if>
             <if test="activityCourseDetail != null">
                 activity_course_detail_=#{activityCourseDetail},
             </if>