Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentDao.java

@@ -408,7 +408,5 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     List<Student> queryStudent(Map<String, Object> params);
 
-    int updateMembershipEndTime(@Param("studentId")Integer studentId, @Param("endTime")Date endTime);
-
     SysUser getUserByPhone(String phone);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentService.java

@@ -156,8 +156,6 @@ public interface StudentService extends BaseService<Integer, Student> {
      */
     PageInfo<CloudTeacherActiveTargetDetailDto> countCloudTeacherActiveDetail(CloudTeacherActiveQueryInfo queryInfo);
 
-    int updateMembershipEndTime(Integer studentId, Date endTime);
-
     /**
     * @description: 根据手机号检测学员是否存在，存在就更新，不存在插入
      * @param student

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

@@ -352,7 +352,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cto.setEndTime(endTime);
             cto.setStatus(2);
             cloudTeacherOrderDao.update(cto);
-            studentService.updateMembershipEndTime(cto.getStudentId(), cto.getEndTime());
+            studentService.updateMemberRank(cto.getStudentId(), cto.getType(), cto.getTime(), 1);
         }
 
         log.info("tenant orderNotify update order status end");

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

@@ -1186,11 +1186,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     }
 
     @Override
-    public int updateMembershipEndTime(Integer studentId, Date endTime) {
-        return studentDao.updateMembershipEndTime(studentId, endTime);
-    }
-
-    @Override
     @Transactional(rollbackFor = Exception.class)
     public <T extends BaseStudentDto> SysUser upSetStudent(T baseStudent) {
         // 判断用户是否存在

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

@@ -1323,9 +1323,6 @@
         AND sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ != 2 AND mg.`status_` = 'PROGRESS'
         GROUP BY sr.user_id_)t)
     </update>
-    <update id="updateMembershipEndTime">
-        update student set membership_end_time_ = #{endTime} where user_id_ = #{studentId}
-    </update>
 
     <select id="queryStudent" resultMap="Student">
         SELECT s.*,su.username_,su.phone_,o.name_ organ_name_,sb.name_ subject_name_ FROM student s