Merge remote-tracking branch 'origin/dev' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java

@@ -97,33 +97,15 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
         long timeMillis = System.currentTimeMillis();
         //获取有期限的弹窗timeType=1
         Example exa = new Example(ActivityPopup.class);
-            /*    .where(
-                        WeekendSqls.<ActivityPopup>custom()
-                                .andEqualTo(ActivityPopup::getTimeType, 1)
-                                .andGreaterThanOrEqualTo(ActivityPopup::getStartTime, BigInteger.valueOf(timeMillis))
-                                .andLessThanOrEqualTo(ActivityPopup::getEndTime, BigInteger.valueOf(timeMillis))
-                                .andIn(ActivityPopup::getType, Arrays.asList(Types.split(",")))
-                                .andEqualTo(ActivityPopup::getStatus, 1)
-                                .andEqualTo(ActivityPopup::getIsDel, 0)
-
-                ).orderByAsc("sort").build();*/
-
         Example.Criteria criteria = exa.createCriteria();
         exa.orderBy("sort").asc();
         criteria.andEqualTo("timeType",1);
         criteria.andIn("type",Arrays.asList(Types.split(",")));
         criteria.andEqualTo("status",1);
         criteria.andEqualTo("isDel",0);
-        criteria.orLessThanOrEqualTo("endTime",BigInteger.valueOf(timeMillis));
+        criteria.andLessThanOrEqualTo("startTime",BigInteger.valueOf(timeMillis));
+        criteria.andGreaterThanOrEqualTo("endTime",BigInteger.valueOf(timeMillis));
 
-        Example.Criteria exaCriteria = exa.createCriteria();
-        exa.orderBy("sort").asc();
-        criteria.andEqualTo("timeType",1);
-        criteria.andIn("type",Arrays.asList(Types.split(",")));
-        criteria.andEqualTo("status",1);
-        criteria.andEqualTo("isDel",0);
-        criteria.orGreaterThanOrEqualTo("startTime",BigInteger.valueOf(timeMillis));
-        exa.or(exaCriteria);
         List<ActivityPopup> activityPopups = mapper.selectByExample(exa);
 
         //获取永久的弹窗timeType=0