认证通挑战赛优化

src/main/java/com/caimei/controller/wechat/WxAuthApi.java

@@ -579,7 +579,7 @@ public class WxAuthApi {
      * @return
      */
     @PostMapping("/save/video")
-    public ResponseJson saveVideo(@RequestBody String params){
+    public ResponseJson<RossChallengeVideo> saveVideo(@RequestBody String params){
         JSONObject jsonObject=JSONObject.parseObject(params);
         Integer authId=jsonObject.getInteger("authId");
         String userName=jsonObject.getString("userName");

src/main/java/com/caimei/model/vo/RossChallengeVideo.java

@@ -65,4 +65,14 @@ public class RossChallengeVideo {
      * 用户id
      */
     private Integer clubUserId;
+
+//      1.7.10新加属性
+    /**
+     * 用户已上传视频数量
+     */
+    private Integer uploadVideoNum;
+    /**
+     * 用户未上传视频数量
+     */
+    private Integer NoUploadVideoNum;
 }

src/main/java/com/caimei/service/auth/AuthService.java

@@ -167,7 +167,7 @@ public interface AuthService {
      * 1.7.7（ROSS）保存视频信息
      * @return
      */
-    ResponseJson saveVideo(RossChallengeVideo rossChallengeVideo);
+    ResponseJson<RossChallengeVideo> saveVideo(RossChallengeVideo rossChallengeVideo);
     /**
      * 根据authid获取authUserId
      */

src/main/java/com/caimei/service/auth/impl/AuthServiceImpl.java

@@ -1282,14 +1282,24 @@ public class AuthServiceImpl implements AuthService {
      * @return
      */
     @Override
-    public ResponseJson saveVideo(RossChallengeVideo ross){
+    public ResponseJson<RossChallengeVideo> saveVideo(RossChallengeVideo ross){
         Date date=new Date();
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String releaseTime = sf.format(date).replace("T", "");
         //根据手机号获取clubuserid
         List<Integer> clubUserId = authMapper.getClubUserId(ross.getUserName());
         authMapper.saveVideo(ross.getUserName(),ross.getCover(),ross.getOssUrl(),ross.getOssName(),ross.getTitle(),releaseTime,ross.getAuthId(),ross.getLinked(),ross.getAuthUserId(),clubUserId.get(0));
-        return ResponseJson.success("保存成功",null);
+       //  1.7.10 获取用户上传和未上传的视频信息
+        RossChallengeVideo rc=new RossChallengeVideo();
+        //获取活动时间
+        ChallengeActivityVo activityTime = authMapper.getActivityTime(ross.getAuthUserId());
+        if(null!=activityTime&&StringUtils.isNotEmpty(activityTime.getStartTime())&&StringUtils.isNotEmpty(activityTime.getEndTime())){
+            //活动时间内用户是否参与比赛
+            List<RossChallengeVideo> rossChallengeVideos = authMapper.checkVideoByUsername(ross.getUserName(),activityTime.getStartTime(),activityTime.getEndTime());
+            rc.setUploadVideoNum(rossChallengeVideos.size());//已上传视频
+            rc.setNoUploadVideoNum(3-rossChallengeVideos.size());//未上传视频
+        }
+        return ResponseJson.success("保存成功",rc);
     }
 
     /**