add 退团加退云教练

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupQuit.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(music_group_quit):
  */
@@ -42,6 +44,9 @@ public class MusicGroupQuit {
 	@ApiModelProperty(value = "是否有乐保",required = false)
 	private Boolean hasMaintenance = false;
 
+	@ApiModelProperty(value = "云教练金额",required = false)
+	private BigDecimal cloudTeacherAmount = BigDecimal.ZERO;
+
 	public void setId(Long id) {
 		this.id = id;
 	}
@@ -142,4 +147,12 @@ public class MusicGroupQuit {
 	public void setHasMaintenance(Boolean hasMaintenance) {
 		this.hasMaintenance = hasMaintenance;
 	}
+
+	public BigDecimal getCloudTeacherAmount() {
+		return cloudTeacherAmount;
+	}
+
+	public void setCloudTeacherAmount(BigDecimal cloudTeacherAmount) {
+		this.cloudTeacherAmount = cloudTeacherAmount;
+	}
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.entity.SysUserRole;
+import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
 import com.ym.mec.biz.dal.dao.StudentInstrumentDao;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.MusicGroupQuitQueryInfo;
@@ -28,6 +29,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @RequestMapping("musicGroupQuit")
@@ -47,6 +49,8 @@ public class MusicGroupQuitController extends BaseController {
     private EmployeeService employeeService;
     @Autowired
     private StudentInstrumentDao studentInstrumentDao;
+    @Autowired
+    private CloudTeacherOrderDao cloudTeacherOrderDao;
 
     @ApiOperation(value = "分页查询")
     @RequestMapping("/queryPage")
@@ -76,11 +80,19 @@ public class MusicGroupQuitController extends BaseController {
 
         if (musicGroupQuitPageInfo.getRows() != null && musicGroupQuitPageInfo.getRows().size() > 0) {
             //查询是否有有效期内乐保
+            Date nowDate = new Date();
             for (MusicGroupQuit row : musicGroupQuitPageInfo.getRows()) {
+                if (!row.getStatus().equals(ApprovalStatus.PROCESSING)) {
+                    continue;
+                }
                 StudentInstrument studentMaintenance = studentInstrumentDao.getStudentMaintenance(row.getUserId(), row.getMusicGroupId());
                 if (studentMaintenance != null) {
                     row.setHasMaintenance(true);
                 }
+                CloudTeacherOrder cloudTeacherOrder = cloudTeacherOrderDao.getStudentCloudTeacherOrder(row.getUserId(), row.getMusicGroupId());
+                if (cloudTeacherOrder != null && (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0)) {
+                    row.setCloudTeacherAmount(cloudTeacherOrder.getAmount());
+                }
             }
         }
         return succeed(musicGroupQuitPageInfo);
@@ -133,7 +145,7 @@ public class MusicGroupQuitController extends BaseController {
     })
     public HttpResponseResult directQuitMusicGroup(String musicGroupId, Integer userId, String reason, boolean isRefundCourseFee,
                                                    boolean isRefundInstrumentFee, boolean isRefundTeachingAssistantsFee,
-                                                   BigDecimal maintenanceFee,BigDecimal cloudTeacherAmount) throws Exception {
+                                                   BigDecimal maintenanceFee, BigDecimal cloudTeacherAmount) throws Exception {
         return succeed(musicGroupService.directQuitMusicGroup(musicGroupId, userId, reason, isRefundCourseFee, isRefundInstrumentFee,
                 isRefundTeachingAssistantsFee, maintenanceFee, cloudTeacherAmount));
     }