系统收费优化

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

@@ -36,10 +36,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/service/CloudTeacherOrderService.java

@@ -50,10 +50,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

@@ -154,8 +154,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

@@ -2013,7 +2013,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<>();
@@ -2299,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-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) {