Merge remote-tracking branch 'origin/master' into lih

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentIndexController.java

@@ -193,8 +193,11 @@ public class AgentIndexController {
         Map<String, Integer> bannedCountMap = new HashMap<>();
         List<YtPlatformBanned> banneds = riskMapper.queryMonthBanned(appIdList);
         if(CollUtil.isNotEmpty(banneds)){
-            List<YtPlatformBanned> collect = banneds.stream().filter(
-                    s -> DateUtil.isSameDay(s.getBannedTime(), new Date())).collect(Collectors.toList());
+            Date currentDate = new Date();
+            List<YtPlatformBanned> collect = banneds.stream()
+                    .filter(s -> DateUtil.isSameDay(s.getBannedTime(), currentDate))
+                    .filter(item -> !"预估收益不到上限游客用户风控".equals(item.getBannedReason()))
+                    .collect(Collectors.toList());
             if(CollUtil.isNotEmpty(collect)){
                 SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Map<LocalDateTime, List<YtPlatformBanned>> bannedMap = collect.stream().collect(Collectors.groupingBy(

yt-agent/agent-service/src/main/resources/mapper/RiskMapper.xml

@@ -442,6 +442,7 @@
                     and DATE_FORMAT(banned_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
                 </when>
             </choose>
+            and banned_reason != '预估收益不到上限游客用户风控'
         </where>
     </select>
     <select id="queryMonthBanned" resultType="com.ytpm.agent.model.YtPlatformBanned">