提交：BUG处理

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -263,11 +263,12 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                             if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribeVo.getApplySiteExamTime(), userMockSubscribeVo.getApplySiteEndTime())) {
                                 userMockSubscribeVos.add(userMockSubscribeVo);
                             }
-                        }else if (ObjectUtils.isNotNull(userMockSubscribeVo.getActivityEndTime()) && System.currentTimeMillis()/1000 < userMockSubscribeVo.getActivityEndTime()){
-                            userMockSubscribeVos.add(userMockSubscribeVo);
-                        }else {
+                        }else if (ObjectUtils.isNotNull(userMockSubscribeVo.getActivityEndTime()) && System.currentTimeMillis()/1000 < userMockSubscribeVo.getActivityEndTime()) {
                             userMockSubscribeVos.add(userMockSubscribeVo);
                         }
+//                        }else {
+//                            userMockSubscribeVos.add(userMockSubscribeVo);
+//                        }
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
@@ -336,6 +337,11 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                                 userMockSubscribe.getMockActivity() == 1){
                             userMockSubscribeVo.setCanDo(0);
                         }
+                        if (ObjectUtils.isNotNull(userMockSubscribe.getActivityEndTime()) &&
+                                System.currentTimeMillis()/1000 > userMockSubscribe.getActivityEndTime()&&
+                                userMockSubscribe.getMockActivity() == 1){
+                            userMockSubscribeVo.setCanDo(0);
+                        }
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMockSubscribeMapper.xml

@@ -247,7 +247,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN mock_major mm ON mms.mock_major_id = mm.mock_major_id
                 LEFT JOIN mock_apply ma ON mm.apply_id = ma.apply_id
         WHERE
-            mmg.goods_id = #{goodsId} AND ma.mock_activity = 1
+            mmg.goods_id = #{goodsId}
+          AND ma.mock_activity = 1
+          AND ma.status = 1
+          AND unix_timestamp(now()) <![CDATA[ <= ]]> ma.activity_end_time
     </select>
 
 </mapper>