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

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

@@ -38,10 +38,9 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
     /**
      * 获取乐团报名的云教练订单
      * @param studentId
-     * @param musicGroupId
      * @return
      */
-    List<CloudTeacherOrder> getStudentCloudTeacherOrder(@Param("studentId") Integer studentId, @Param("musicGroupId") String musicGroupId);
+    List<CloudTeacherOrder> getStudentCloudTeacherOrder(@Param("studentId") Integer studentId);
     
     /**
      * 根据订单编号查询订单详情

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

@@ -26,6 +26,8 @@ public class EduHomeworkCardDto {
 
     private String teacherName;
 
+    private String teacherAvatar;
+
     private Integer exceptStudentNum;
 
     private Integer submitStudentNum;
@@ -34,6 +36,14 @@ public class EduHomeworkCardDto {
 
     private Date createTime;
 
+    public String getTeacherAvatar() {
+        return teacherAvatar;
+    }
+
+    public void setTeacherAvatar(String teacherAvatar) {
+        this.teacherAvatar = teacherAvatar;
+    }
+
     public String getContent() {
         return content;
     }

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

@@ -52,10 +52,9 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
      * 获取乐团报名的云教练订单
      *
      * @param studentId
-     * @param musicGroupId
      * @return
      */
-    List<CloudTeacherOrder> getStudentCloudTeacherOrder(Integer studentId, String musicGroupId);
+    List<CloudTeacherOrder> getStudentCloudTeacherOrder(Integer studentId);
 
     /**
      * 退云教练

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

@@ -156,8 +156,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     @Override
-    public List<CloudTeacherOrder> getStudentCloudTeacherOrder(Integer studentId, String musicGroupId) {
-        return cloudTeacherOrderDao.getStudentCloudTeacherOrder(studentId, musicGroupId);
+    public List<CloudTeacherOrder> getStudentCloudTeacherOrder(Integer studentId) {
+        return cloudTeacherOrderDao.getStudentCloudTeacherOrder(studentId);
     }
 
     @Override

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

@@ -2004,13 +2004,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 groupEventSource.musicGroupStudentChangeEvent(musicGroupId, StudentMusicGroupStatusEnum.QUIT, new ArrayList<>(Arrays.asList(userId)));
 
             }
-            //删除乐团会员时长
-            studentDao.cleanMusicMember(userId);
-            if(isRefundMemberFee){
+            if (isRefundMemberFee){
+                if(musicGroup.getCourseViewType() != CourseViewTypeEnum.MEMBER_FEE){
+                    throw new BizException("非会员乐团不允许退云教练");
+                }
+                //删除乐团会员时长
+                studentDao.cleanMusicMember(userId);
                 //退云教练费用
                 if (cloudTeacherAmount != null) {
                     Date nowDate = new Date();
-                    List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId, musicGroupId);
+                    List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId);
                     BigDecimal orderAmount = BigDecimal.ZERO;
                     if(cloudTeacherOrders.size() > 0){
                         List<CloudTeacherOrder> quitCloudTeacherOrders = new ArrayList<>();
@@ -2030,6 +2033,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     //清除学员云教练
                     studentService.cleanMember(userId);
                 }
+            }else {
+                //删除乐团会员时长
+                Student student = studentDao.get(userId);
+                if(StringUtils.isNotEmpty(student.getMemberMusicGroupId())){
+                    if(student.getMemberMusicGroupId().equals(musicGroupId)){
+                        studentDao.cleanMusicMember(userId);
+                    }
+                }
             }
 
             if (isRefundCourseFee) {
@@ -2288,7 +2299,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //退云教练费用
             if (cloudTeacherAmount != null) {
                 Date nowDate = new Date();
-                List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId, musicGroupId);
+                List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId);
                 BigDecimal orderAmount = BigDecimal.ZERO;
                 if(cloudTeacherOrders.size() > 0){
                     List<CloudTeacherOrder> quitCloudTeacherOrders = new ArrayList<>();

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

@@ -534,6 +534,7 @@
 		SELECT
 			ee.id_ homeworkId,
 			su.real_name_ teacherName,
+		    su.avatar_ teacherAvatar,
 			ee.create_time_ createTime,
 			COUNT( eer.user_id_ ) exceptStudentNum,
 			SUM( eer.status_ ) submitStudentNum,

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

@@ -514,6 +514,7 @@
             CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) courseStartTime,
             cs.actual_teacher_id_ teacherId,
             su.real_name_ teacherName,
+            su.avatar_ teacherAvatar,
             COUNT( sch.user_id_ ) exceptStudentNum,
             SUM( sch.status_ ) submitStudentNum,
             SUM( sch.is_replied_ ) repliedStudentNum

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupQuitController.java

@@ -91,7 +91,7 @@ public class MusicGroupQuitController extends BaseController {
                 if (studentMaintenance != null) {
                     row.setHasMaintenance(true);
                 }
-                List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderDao.getStudentCloudTeacherOrder(row.getUserId(), row.getMusicGroupId());
+                List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderDao.getStudentCloudTeacherOrder(row.getUserId());
                 if(cloudTeacherOrders.size() > 0){
                     BigDecimal orderAmount = BigDecimal.ZERO;
                     for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {