bugfix

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

@@ -528,8 +528,8 @@ public class WxAuthApi {
      * @return
      */
     @GetMapping("/get/video/username")
-    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId){
-        return authService.getVideoByUsername(mobile,clubUserId);
+    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId,Integer authUserId){
+        return authService.getVideoByUsername(mobile,clubUserId,authUserId);
     }
 
     /**

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

@@ -198,9 +198,9 @@ public interface AuthMapper {
     RossChallengeRoundVo getcontestedInfoByUserName(@Param("mobile")String mobile,@Param("startTime")String startTime,@Param("endTime")String endTime);
 
 
-    List<RossChallengeVideo> getVideoAll(@Param("mobileOrAuthpart")String mobileOrAuthpart,Integer authUserId);
+    List<RossChallengeVideo> getVideoAll(@Param("mobileOrAuthpart")String mobileOrAuthpart,Integer authUserId,@Param("StartTime")String StartTime,@Param("endTime")String endTime);
 
-    List<RossChallengeVideo> getVideoByUsername(@Param("mobile")String mobile);
+    List<RossChallengeVideo> getVideoByUsername(@Param("mobile")String mobile,@Param("StartTime")String StartTime,@Param("endTime")String endTime);
 
     List<RossChallengeVideo> checkVideoByUsername(@Param("mobile")String mobile,@Param("startTime")String startTime,@Param("endTime")String endTime);
 

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

@@ -337,7 +337,7 @@ public interface AuthService {
      * @param mobile  登录账号
      * @return
      */
-    ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId);
+    ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId,Integer authUserId);
     /**
      * 验证机构是否已经上传了3个视频
      * @param mobile 登录账号

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

@@ -199,7 +199,7 @@ public class AuthClubServiceImpl implements AuthClubService {
                 System.out.println();
                 //短信类型：1通知短信，2验证码短信，3营销短信
                 Integer type=3;
-                String conn="[" + authParty + "]尊敬的会员，ROSS视频挑战赛报名通道已开启，点此【http://f6d.cn/Fgp6r】进入ROSS认证通，了解详情";
+                String conn="[" + authParty + "]尊敬的会员，ROSS视频挑战赛报名通道已开启，点此https://zp.caimei365.com/12/ross/activity/challenge进入ROSS认证通，了解详情。";
                 if(StringUtils.isNotEmpty(mobile)){
                     Boolean aBoolean = SmsUtils.sendSms(type, mobile, conn);
                     if(aBoolean){

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

@@ -1578,16 +1578,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();
     }
@@ -1977,8 +1977,12 @@ public class AuthServiceImpl implements AuthService {
      */
     @Override
     public ResponseJson<PageInfo<RossChallengeVideo>> getVideoAll(String mobileOrAuthpart,Integer clubUserId,Integer authUserId,Integer pageNum,Integer pageSize){
+        ChallengeActivityVo activityTime = authMapper.getActivityTime(authUserId);
+        if(null==activityTime&&StringUtils.isEmpty(activityTime.getStartTime())&&StringUtils.isEmpty(activityTime.getEndTime())){
+            return ResponseJson.success();
+        }
         PageHelper.startPage(pageNum, pageSize);
-        List<RossChallengeVideo> videoAll = authMapper.getVideoAll(mobileOrAuthpart,authUserId);
+        List<RossChallengeVideo> videoAll = authMapper.getVideoAll(mobileOrAuthpart,authUserId,activityTime.getStartTime(),activityTime.getEndTime());
         PageInfo<RossChallengeVideo> pageData = new PageInfo<>(videoAll);
         //获取该用户点赞过的视频
         //如果clubUserId为空，用户不能点赞，直接返回所有视频
@@ -2006,8 +2010,13 @@ public class AuthServiceImpl implements AuthService {
      * @return
      */
     @Override
-    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId){
-        List<RossChallengeVideo> videoByUsername = authMapper.getVideoByUsername(mobile);
+    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId,Integer authUserId){
+        //获取活动时间内的机构列表信息
+        ChallengeActivityVo activityTime = authMapper.getActivityTime(authUserId);
+        if(null==activityTime&&StringUtils.isEmpty(activityTime.getStartTime())&&StringUtils.isEmpty(activityTime.getEndTime())){
+            return ResponseJson.success();
+        }
+        List<RossChallengeVideo> videoByUsername = authMapper.getVideoByUsername(mobile,activityTime.getStartTime(),activityTime.getEndTime());
         //获取该用户点赞过的视频
         if(null!=clubUserId){
         if(null!=videoByUsername&& videoByUsername.size()>0){

src/main/resources/mapper/AuthMapper.xml

@@ -851,6 +851,7 @@
         select cr.*,cba.authParty from cm_ross_challenge_video cr
         left join cm_brand_auth cba on cr.authId=cba.id
         where cr.authUserId=#{authUserId}
+        and cr.releaseTime > #{StartTime} and cr.releaseTime < #{endTime}
         <if test="mobileOrAuthpart != null and mobileOrAuthpart != ''">
             and (cr.userName like concat('%', #{mobileOrAuthpart})
             or  cba.authParty like concat('%', #{mobileOrAuthpart},'%') )
@@ -861,6 +862,7 @@
         select * from cm_ross_challenge_video
         where
            userName = #{mobile}
+          and releaseTime &gt; #{StartTime} and releaseTime &lt; #{endTime}
         order by diggCount desc,releaseTime
     </select>
     <select id="checkVideoByUsername" resultType="com.caimei.model.vo.RossChallengeVideo">