update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -21,7 +21,7 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 
 	@Override
 	public SysUser queryUserInfo() {
-		return new SysUser();
+		return null;
 	}
 
 	@Override

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

@@ -2,7 +2,9 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +16,26 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     List<MusicCardDto> queryUserMusicGroups(Integer userId);
+
+    /**
+     * 获取个人中心乐团数据
+     * @param id
+     * @return
+     */
+    MusicCardDto queryPersonalMusicGroups(Integer id);
+
+    /**
+     * 获取用户有效的乐团数
+     * @param userId
+     * @return
+     */
+    int countUserMusicGroups(Integer userId);
+
+    /**
+     * 根据课程类型获取剩余课时
+     * @param userId
+     * @param type
+     * @return
+     */
+    int countCourseByType(@Param("userId") Integer userId, @Param("type") ClassGroupTypeEnum type);
 }

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

@@ -23,6 +23,28 @@ public class MusicCardDto {
     @ApiModelProperty(value = "是否缴费",required = true)
     private YesOrNoEnum paymentStatus;
 
+    @ApiModelProperty(value = "乐团数量",required = true)
+    private Integer musicGroupNum;
+
+    @ApiModelProperty(value = "vip课数量",required = true)
+    private Integer vipClassNum;
+
+    public Integer getMusicGroupNum() {
+        return musicGroupNum;
+    }
+
+    public void setMusicGroupNum(Integer musicGroupNum) {
+        this.musicGroupNum = musicGroupNum;
+    }
+
+    public Integer getVipClassNum() {
+        return vipClassNum;
+    }
+
+    public void setVipClassNum(Integer vipClassNum) {
+        this.vipClassNum = vipClassNum;
+    }
+
     public String getUserName() {
         return userName;
     }

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

@@ -26,4 +26,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
      * @return
      */
     List<MusicCardDto> queryUserMusicGroups(Integer userId);
+
+    /**
+     * 获取个人中心乐团数据
+     * @param id
+     * @return
+     */
+    MusicCardDto queryPersonalMusicGroups(Integer id);
 }

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

@@ -4,10 +4,10 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -93,4 +93,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 	public List<MusicCardDto> queryUserMusicGroups(Integer userId) {
 		return musicGroupDao.queryUserMusicGroups(userId);
 	}
+
+	@Override
+	public MusicCardDto queryPersonalMusicGroups(Integer id) {
+		MusicCardDto musicCardDto = musicGroupDao.queryPersonalMusicGroups(id);
+		musicCardDto.setMusicGroupNum(musicGroupDao.countUserMusicGroups(id));
+		musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(id,ClassGroupTypeEnum.VIP));
+		return musicGroupDao.queryPersonalMusicGroups(id);
+	}
 }

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

@@ -68,10 +68,9 @@
     </update>
 
     <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM cooperation_organ WHERE id_ =
-		#{id}
-	</delete>
+    <update id="delete">
+		UPDATE cooperation_organ SET det_flag_ = 1 WHERE id_ =#{id}
+	</update>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="CooperationOrgan"

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

@@ -133,8 +133,11 @@
 		<result column="current_class_" property="currentClass" />
 		<result column="current_grade_" property="currentGrade" />
 		<result column="music_group_name_" property="musicGroupName" />
+		<result column="vip_class_num_" property="vipClassNum" />
+		<result column="music_group_num_" property="musicGroupNum" />
 		<result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
+
     <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
 		SELECT sr.name_ user_name_,sr.current_class_,sr.current_grade_,
 		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_
@@ -143,4 +146,24 @@
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
 		WHERE sr.user_id_ = #{userId}
 	</select>
+
+	<select id="queryPersonalMusicGroups" resultMap="queryUserMusicGroupsMap">
+		SELECT sr.name_ user_name_,mg.name_ music_group_name_,s.name_ subject_name_
+		FROM student_registration sr
+		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
+		WHERE sr.user_id_ = #{userId}
+	</select>
+
+	<select id="countUserMusicGroups" resultType="int">
+		SELECT COUNT(mg.id_)
+		FROM student_registration sr
+		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+		WHERE sr.user_id_ = #{userId}
+	</select>
+    <select id="countCourseByType" resultType="java.lang.Integer">
+		SELECT SUM(cg.total_class_times_) - SUM(cg.current_class_times_) FROM student_registration sr
+		LEFT JOIN class_group cg ON sr.class_group_id_ = cg.id_
+		WHERE sr.user_id_ = #{userId} AND cg.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+	</select>
 </mapper>

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

@@ -23,11 +23,21 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生所在乐团列表")
     @GetMapping(value = "/queryUserMusicGroups")
-    private Object queryUserMusicGroups(){
+    public Object queryUserMusicGroups(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed("请重新登录");
         }
         return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
     }
+
+    @ApiOperation("获取学生个人中心乐团信息")
+    @GetMapping(value = "/queryPersonalMusicGroups")
+    public Object queryPersonalMusicGroups(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("请重新登录");
+        }
+        return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
+    }
 }

mec-student/src/main/java/com/ym/mec/student/controller/RechargeController.java

@@ -36,7 +36,7 @@ public class RechargeController extends BaseController {
 
     @ApiOperation("充值")
     @GetMapping(value = "/recharge")
-    private Object recharge(RechargeDto rechargeDto){
+    public Object recharge(RechargeDto rechargeDto){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed("请重新登录");

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 
-@RequestMapping("cooperationOrgan")
+@RequestMapping("studentWithdraw")
 @Api(tags = "提现服务")
 @RestController
 public class StudentWithdrawController extends BaseController {