Merge branch 'luck_draw_feature' into dev

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

@@ -96,8 +96,8 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
     private List<ActivityPopup> getActivityPopupByTypes(String Types) {
         long timeMillis = System.currentTimeMillis();
         //获取有期限的弹窗timeType=1
-        Example exa = Example.builder(ActivityPopup.class)
-                .where(
+        Example exa = new Example(ActivityPopup.class);
+            /*    .where(
                         WeekendSqls.<ActivityPopup>custom()
                                 .andEqualTo(ActivityPopup::getTimeType, 1)
                                 .andGreaterThanOrEqualTo(ActivityPopup::getStartTime, BigInteger.valueOf(timeMillis))
@@ -106,7 +106,15 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup
                                 .andEqualTo(ActivityPopup::getStatus, 1)
                                 .andEqualTo(ActivityPopup::getIsDel, 0)
 
-                ).orderByAsc("sort").build();
+                ).orderByAsc("sort").build();*/
+
+        Example.Criteria criteria = exa.createCriteria();
+        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);
         List<ActivityPopup> activityPopups = mapper.selectByExample(exa);
 
         //获取永久的弹窗timeType=0