认证通1.7.7版本功能开发

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

@@ -468,10 +468,19 @@ public class WxAuthApi {
      * @return
      */
     @GetMapping("/get/video/username")
-    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile){
-        return authService.getVideoByUsername(mobile);
+    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId){
+        return authService.getVideoByUsername(mobile,clubUserId);
     }
 
+    /**
+     * 查询视频列表
+     * @param mobileOrAuthpart 电话号码或者机构名称
+     * @return
+     */
+    @GetMapping("/get/video/all")
+    public ResponseJson<List<RossChallengeVideo>> getVideoAll(String mobileOrAuthpart,Integer clubUserId){
+        return authService.getVideoAll(mobileOrAuthpart,clubUserId);
+    }
     /**
      * 验证机构是否已经上传了3个视频（点击上传视频时验证）
      * @param mobile 登录账号
@@ -483,13 +492,16 @@ public class WxAuthApi {
     }
     /**
      * 点赞与取消点赞
-     * @param id
-     * @param diggFlag
      * @return
      */
-    @GetMapping("/up/video/diggcount")
-    public ResponseJson upVideoDiggCount(Integer id,Integer diggFlag){
-        return  authService.upVideoDiggCount(id,diggFlag);
+    @PostMapping("/up/video/diggcount")
+    public ResponseJson upVideoDiggCount(@RequestBody String params){
+        JSONObject jsonObject=JSONObject.parseObject(params);
+        Integer id=jsonObject.getInteger("id");
+        Integer diggStatus=jsonObject.getInteger("diggStatus");
+        String clubUserIds=jsonObject.getString("clubUserIds");
+        Integer clubUserId=jsonObject.getInteger("clubUserId");
+        return  authService.upVideoDiggCount(id,diggStatus,clubUserId,clubUserIds);
     }
     /**
      * 1.7.7保存视频信息

src/main/java/com/caimei/mapper/cmMapper/AuthMapper.java

@@ -195,7 +195,7 @@ public interface AuthMapper {
 
     List<RossChallengeVideo> checkVideoByUsername(@Param("mobile")String mobile);
 
-    void upVideoDiggCount(Integer videoId,Integer diggFlag);
+    void upVideoDiggCount(Integer videoId,Integer diggFlag,@Param("clubUserIds")String clubUserIds);
 
     List<RossChallengeRoundVo> getAuthInfo(@Param("mobile")String mobile);
 

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

@@ -44,8 +44,16 @@ public class RossChallengeVideo {
      * 视频链接
      */
     private String linked;
+    /**
+     *
+     */
+    private String clubUserIds;
     /**
      * 机构名称
      */
     private String authParty;
+    /**
+     * 是否点赞（0，未点赞；1已点赞）
+     */
+    private Integer diggStatus;
 }

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

@@ -324,14 +324,14 @@ public interface AuthService {
      * @param mobileOrAuthpart 电话号码或者机构名称
      * @return
      */
-    ResponseJson<List<RossChallengeVideo>> getVideoAll(String mobileOrAuthpart);
+    ResponseJson<List<RossChallengeVideo>> getVideoAll(String mobileOrAuthpart,Integer clubUserId);
 
     /**
      * 根据手机号码查询该机构视频列表
      * @param mobile  登录账号
      * @return
      */
-    ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile);
+    ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId);
     /**
      * 验证机构是否已经上传了3个视频
      * @param mobile 登录账号
@@ -345,7 +345,7 @@ public interface AuthService {
      * @param diggFlag
      * @return
      */
-    ResponseJson upVideoDiggCount(Integer id,Integer diggFlag);
+    ResponseJson upVideoDiggCount(Integer id,Integer diggFlag,Integer clubUserId,String clubUserIds);
     /**
      * 查询机构信息（后端）
      * @param mobile

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

@@ -1566,16 +1566,16 @@ public class AuthServiceImpl implements AuthService {
             authMapper.saveActivityInfo(startTime,endTime,status,authUserId);
             //1.7.7ross挑战赛新加逻辑
             //活动开启后给供应商下所有机构手机号码发送短信
-            if(status==1){
-               smsSend(authUserId);
-            }
+//            if(status==1){
+//               smsSend(authUserId);
+//            }
         }else {
             authMapper.upActivityInfo(startTime,endTime,status,authUserId);
             //1.7.7ross挑战赛新加逻辑
             //活动开启后给供应商下所有机构手机号码发送短信
-            if(status==1){
-                smsSend(authUserId);
-            }
+//            if(status==1){
+//                smsSend(authUserId);
+//            }
         }
         return ResponseJson.success();
     }
@@ -1912,13 +1912,13 @@ public class AuthServiceImpl implements AuthService {
     public ResponseJson saveRossInfo(RossChallengeRoundVo rossChallengeRoundVo){
         authMapper.saveRossInfo(rossChallengeRoundVo);
         //如果活动已经开始了，则用户报名成功后向用户发送短信
-        if(null!=rossChallengeRoundVo.getAuthUserId()){
-            ChallengeActivityVo activityTime = authMapper.getActivityTime(rossChallengeRoundVo.getAuthUserId());
-            //判断活动是否开启
-            if(null!=activityTime &&null!=rossChallengeRoundVo.getAuthUserId()&&null!=activityTime.getStatus()&&activityTime.getStatus()==1){
-                smsSend(rossChallengeRoundVo.getAuthUserId());
-            }
-        }
+//        if(null!=rossChallengeRoundVo.getAuthUserId()){
+//            ChallengeActivityVo activityTime = authMapper.getActivityTime(rossChallengeRoundVo.getAuthUserId());
+//            //判断活动是否开启
+//            if(null!=activityTime &&null!=rossChallengeRoundVo.getAuthUserId()&&null!=activityTime.getStatus()&&activityTime.getStatus()==1){
+//                smsSend(rossChallengeRoundVo.getAuthUserId());
+//            }
+//        }
         return ResponseJson.success();
     }
 
@@ -1948,8 +1948,22 @@ public class AuthServiceImpl implements AuthService {
      * @return
      */
     @Override
-    public ResponseJson<List<RossChallengeVideo>> getVideoAll(String mobileOrAuthpart){
+    public ResponseJson<List<RossChallengeVideo>> getVideoAll(String mobileOrAuthpart,Integer clubUserId){
         List<RossChallengeVideo> videoAll = authMapper.getVideoAll(mobileOrAuthpart);
+        //获取该用户点赞过的视频
+        if(null!=videoAll&& videoAll.size()>0){
+           for(RossChallengeVideo video:videoAll){
+               if (StringUtils.isNotEmpty(video.getClubUserIds())) {
+                   if (video.getClubUserIds().contains(clubUserId.toString())) {
+                       video.setDiggStatus(1);
+                   } else {
+                       video.setDiggStatus(0);
+                   }
+               } else {
+                   video.setDiggStatus(0);
+               }
+           };
+        }
         return ResponseJson.success(videoAll);
     }
 
@@ -1959,8 +1973,22 @@ public class AuthServiceImpl implements AuthService {
      * @return
      */
     @Override
-    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile){
+    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId){
         List<RossChallengeVideo> videoByUsername = authMapper.getVideoByUsername(mobile);
+        //获取该用户点赞过的视频
+        if(null!=videoByUsername&& videoByUsername.size()>0){
+            for(RossChallengeVideo video:videoByUsername){
+                if (StringUtils.isNotEmpty(video.getClubUserIds())) {
+                    if (video.getClubUserIds().contains(clubUserId.toString())) {
+                        video.setDiggStatus(1);
+                    } else {
+                        video.setDiggStatus(0);
+                    }
+                } else {
+                    video.setDiggStatus(0);
+                }
+            };
+        }
         return ResponseJson.success(videoByUsername);
 
     }
@@ -1986,8 +2014,31 @@ public class AuthServiceImpl implements AuthService {
      * @return
      */
     @Override
-    public ResponseJson upVideoDiggCount(Integer id,Integer diggFlag){
-        authMapper.upVideoDiggCount(id,diggFlag);
+    public ResponseJson upVideoDiggCount(Integer id,Integer diggFlag,Integer clubUserId,String clubUserIds){
+        if(diggFlag==0){
+            //取消点赞
+            if(StringUtils.isNotEmpty(clubUserIds)){
+                if(clubUserIds.contains(clubUserId.toString())){
+                    clubUserIds=clubUserIds.replace(clubUserId.toString(),"");
+                    clubUserIds=clubUserIds.replace(",,",",");
+                    if(clubUserIds.lastIndexOf(",")==clubUserIds.length()-1){
+                        clubUserIds=clubUserIds.substring(0,clubUserIds.length()-1);
+                    }
+                    if(clubUserIds.indexOf(",")==0){
+                        clubUserIds=clubUserIds.substring(1,clubUserIds.length());
+                    }
+                }
+            }
+        }else if(diggFlag==1){
+            //点赞
+            if(StringUtils.isEmpty(clubUserIds)){
+                clubUserIds=clubUserIds+clubUserId;
+            }else{
+                clubUserIds=clubUserIds+","+clubUserId;
+            }
+        }
+
+        authMapper.upVideoDiggCount(id,diggFlag,clubUserIds);
         return ResponseJson.success();
     }
 

src/main/resources/mapper/AuthMapper.xml

@@ -853,11 +853,12 @@
     <update id="upVideoDiggCount">
         update cm_ross_challenge_video
             <set>
+                clubUserIds=#{clubUserIds}
             <if test="null != diggFlag and diggFlag==1">
-                diggCount=diggCount+1
+                ,diggCount=diggCount+1
             </if>
             <if test="null != diggFlag and diggFlag==0">
-                diggCount=diggCount-1
+                ,diggCount=diggCount-1
             </if>
             </set>
         where id=#{videoId}