Merge branch 'luck_draw_feature' into dev

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

@@ -111,11 +111,19 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
         Example.Criteria criteria = exa.createCriteria();
         exa.orderBy("sort").asc();
         criteria.andEqualTo("timeType",1);
-        criteria.andGreaterThanOrEqualTo("startTime",BigInteger.valueOf(timeMillis));
-        criteria.andLessThanOrEqualTo("endTime",BigInteger.valueOf(timeMillis));
         criteria.andIn("type",Arrays.asList(Types.split(",")));
         criteria.andEqualTo("status",1);
         criteria.andEqualTo("isDel",0);
+        criteria.orLessThanOrEqualTo("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