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

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

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

@@ -40,6 +40,8 @@ public class MusicGroupQuit {
 	private ApprovalStatus status;
 	
 	private Integer applyUserId;
+
+	private String applyUserName;
 	
 	private Boolean isVisit;
 	
@@ -63,6 +65,14 @@ public class MusicGroupQuit {
 	@ApiModelProperty(value = "云教练金额",required = false)
 	private BigDecimal cloudTeacherAmount = BigDecimal.ZERO;
 
+	public String getApplyUserName() {
+		return applyUserName;
+	}
+
+	public void setApplyUserName(String applyUserName) {
+		this.applyUserName = applyUserName;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}

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

@@ -13,12 +13,12 @@
         <result column="create_time_" property="createTime"/>
         <result column="reason_" property="reason"/>
         <result column="user_comment_" property="userComment"/>
-        <result column="apply_user_id_" property="applyUserId"/>
         <result column="is_visit_" property="isVisit"/>
         <result column="visit_time_" property="vistTime"/>
         <result column="return_total_fee_" property="returnTotalFee"/>
         <result column="fee_json_" property="feeJson"/>
         <result column="current_approve_role_" property="currentApproveRole"/>
+        <result column="apply_user_id_" property="applyUserId"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <association property="musicGroup" javaType="com.ym.mec.biz.dal.entity.MusicGroup">
             <result column="music_group_name_" property="name"/>
@@ -59,9 +59,6 @@
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>
-            <if test="id != null">
-                id_ = #{id},
-            </if>
             <if test="joinDate != null">
                 join_date_ = #{joinDate},
             </if>
@@ -77,9 +74,6 @@
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},
             </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
             <if test="applyUserId != null">
                 apply_user_id_ = #{applyUserId},
             </if>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/MusicGroupController.java

@@ -0,0 +1,46 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RequestMapping("musicGroup")
+@Api(tags = "乐团服务")
+@RestController
+public class MusicGroupController extends BaseController {
+
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private MusicGroupService musicGroupService;
+
+    @ApiOperation(value = "申请退团")
+    @PostMapping("/quitMusicGroup")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "studentId", value = "学员编号", required = true, dataType = "Integer")})
+    public HttpResponseResult quitMusicGroup(String musicGroupId, Integer studentId){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		MusicGroupQuit musicGroupQuit = new MusicGroupQuit();
+		musicGroupQuit.setUserId(studentId);
+		musicGroupQuit.setMusicGroupId(musicGroupId);
+        musicGroupQuit.setApplyUserId(sysUser.getId());
+        return succeed(musicGroupService.applyQuitMusicGroup(musicGroupQuit, sysUser.getId()));
+    }
+}

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

@@ -8,9 +8,12 @@ import io.swagger.annotations.ApiOperation;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 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.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.ApprovalStatus;
 import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
 import com.ym.mec.biz.dal.entity.Employee;
@@ -44,6 +48,7 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.json.JsonUtil;
 
@@ -69,6 +74,8 @@ public class MusicGroupQuitController extends BaseController {
     private StudentInstrumentDao studentInstrumentDao;
     @Autowired
     private CloudTeacherOrderDao cloudTeacherOrderDao;
+    @Autowired
+    private TeacherDao teacherDao;
 
     @ApiOperation(value = "分页查询")
     @RequestMapping("/queryPage")
@@ -95,11 +102,20 @@ public class MusicGroupQuitController extends BaseController {
             queryInfo.setEducationUserId(sysUser.getId());
         }
         PageInfo<MusicGroupQuit> musicGroupQuitPageInfo = musicGroupQuitService.queryPage(queryInfo);
-
-        if (musicGroupQuitPageInfo.getRows() != null && musicGroupQuitPageInfo.getRows().size() > 0) {
+        List<MusicGroupQuit> rows = musicGroupQuitPageInfo.getRows();
+        if (rows != null && rows.size() > 0) {
+            List<Integer> applyUserIds = rows.stream().map(e -> e.getApplyUserId()).collect(Collectors.toList());
+            applyUserIds.removeAll(Collections.singleton(null));
+            Map<Integer, String> nameByIdList = new HashMap<>(applyUserIds.size());
+            if(applyUserIds.size() > 0){
+                nameByIdList = MapUtil.convertMybatisMap(teacherDao.queryNameByIdList(applyUserIds));
+            }
             //查询是否有有效期内乐保
             Date nowDate = new Date();
-            for (MusicGroupQuit row : musicGroupQuitPageInfo.getRows()) {
+            for (MusicGroupQuit row : rows) {
+                if(row.getApplyUserId() != null){
+                    row.setApplyUserName(nameByIdList.get(row.getApplyUserId()));
+                }
                 if (!row.getStatus().equals(ApprovalStatus.PROCESSING)) {
                     continue;
                 }