Merge branch 'dev_v1.3.6_20221011'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/ShareProfitParam.java

@@ -2,6 +2,8 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * Description
  *
@@ -11,9 +13,11 @@ import io.swagger.annotations.ApiModelProperty;
 public class ShareProfitParam {
 
     @ApiModelProperty("分享人id")
+    @NotNull(message = "分享人id不能为空")
     private Long userId;
 
     @ApiModelProperty("曲目/专辑/直播课/视频课 id")
+    @NotNull(message = "分享内容不能为空")
     private Long bizId;
 
     public Long getUserId() {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -64,7 +65,7 @@ public class OpenShareController extends BaseController {
 
     @ApiOperation(value = "老师乐谱分享分润")
     @PostMapping(value="/musicShareProfit")
-    public HttpResponseResult<ShareProfitVo> shareMusicSheetProfit(@RequestBody ShareProfitParam param) {
+    public HttpResponseResult<ShareProfitVo> shareMusicSheetProfit(@RequestBody @Valid ShareProfitParam param) {
         SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
@@ -74,7 +75,7 @@ public class OpenShareController extends BaseController {
 
     @ApiOperation(value = "老师专辑分享分润")
     @PostMapping(value="/albumShareProfit")
-    public HttpResponseResult<ShareProfitVo> albumShareProfit(@RequestBody ShareProfitParam param) {
+    public HttpResponseResult<ShareProfitVo> albumShareProfit(@RequestBody @Valid  ShareProfitParam param) {
         SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
@@ -84,7 +85,7 @@ public class OpenShareController extends BaseController {
 
     @ApiOperation(value = "老师直播课分享分润")
     @PostMapping(value= "/liveShareProfit")
-    public HttpResponseResult<ShareProfitVo> shareLiveCourseProfit(@RequestBody ShareProfitParam param) {
+    public HttpResponseResult<ShareProfitVo> shareLiveCourseProfit(@RequestBody @Valid  ShareProfitParam param) {
         SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
@@ -96,7 +97,7 @@ public class OpenShareController extends BaseController {
 
     @ApiOperation(value = "老师视频课分享分润")
     @PostMapping(value= "/videoShareProfit")
-    public HttpResponseResult<ShareProfitVo> shareVideoCourseProfit(@RequestBody ShareProfitParam param) {
+    public HttpResponseResult<ShareProfitVo> shareVideoCourseProfit(@RequestBody @Valid  ShareProfitParam param) {
         SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
@@ -108,7 +109,7 @@ public class OpenShareController extends BaseController {
 
     @ApiOperation(value = "老师VIP分享分润")
     @PostMapping(value="/vipProfit")
-    public HttpResponseResult<ShareProfitVo> shareVipProfit(@RequestBody ShareProfitParam param) {
+    public HttpResponseResult<ShareProfitVo> shareVipProfit(@RequestBody  @Valid ShareProfitParam param) {
         SysUser sysUser = sysUserFeignService.queryUserById(param.getUserId());
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");