update

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

@@ -1,32 +1,54 @@
 package com.ym.mec.student.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-import com.ym.mec.biz.dal.enums.*;
-import com.ym.mec.biz.service.*;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.GoodsType;
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
+import com.ym.mec.biz.service.PayService;
+import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.biz.service.StudentRegistrationService;
 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.service.IdGeneratorService;
 import com.ym.mec.util.string.IdWorker;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
 
 @RequestMapping("musicGroup")
 @Api(tags = "乐团服务")
@@ -59,7 +81,7 @@ public class MusicGroupController extends BaseController {
     public Object queryUserMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
     }
@@ -69,7 +91,7 @@ public class MusicGroupController extends BaseController {
     public Object queryPersonalMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
     }
@@ -79,7 +101,7 @@ public class MusicGroupController extends BaseController {
     public Object findTeachersByStuId() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
     }

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

@@ -75,7 +75,7 @@ public class SysMessageController extends BaseController {
 	public Object queryCountOfUnread() {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
-			return failed("请重新登录");
+			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		return succeed(sysMessageService.queryCountOfUnread(sysUser.getId()));
 	}