feat:解决冲突

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -131,10 +131,8 @@ public class PredictModelServiceImpl implements PredictModelService {
                 result.put("ad_predict", 1);
                 result.put("no_ad_strategy", "no_ad_time_with_time_plan");
                 return result;
-            } else if (isAdvanceShowAd()) {
-                log.info("提前出广告");
             } else if (
-                    (!condition1 || !condition2) && 0 <= hourOfDay && hourOfDay < 8) {
+                    (!condition1 || !condition2) && 0 <= hourOfDay && hourOfDay < 8 && !isAdvanceShowAd()) {
                 // 0点到8点 && （未开启555 || 555配置不包含abcode）
                 result.put("ad_predict", 1);
                 result.put("no_ad_strategy", "no_ad_time_with_fixed_time");