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

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

@@ -66,7 +66,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
     public static final Integer INVITE_ITEMID = 3;
 
     public void handleRegister(RegisterQueueDTO registerQueueDTO) {
-
+        log.info("活动码注册成功：registerQueueDTO = {}", registerQueueDTO.toString());
         if (StringUtils.isNotBlank(registerQueueDTO.getInParamDTO().getActivityCode())) {
             String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "");
             AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
@@ -76,6 +76,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                 ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
                     setCode(activityCode);
                 }});
+                log.info("活动邀请注册：activityPopularize = {}", activityPopularize.toString());
                 if (activityPopularize != null) {
                     List<ActivityPopularizeItem> activityPopularizeItems = activityPopularizeItemBiz.selectByPopularizeId(activityPopularize.getId());
                     ActivityPopularizeItem activityPopularizeItem = activityPopularizeItems.get(activityPopularizeItems.size() - 1);

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