Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

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

@@ -142,20 +142,15 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                         setPopularizeId(activityPopularize.getId());
                     }});
                     double currentProgress =  activityPopularizeUser.getCurrentProgress().doubleValue();
-                    log.info("用户原活动进度：currentProgress = {}", currentProgress);
+                    log.info("用户原活动进度：currentProgress = {}", activityPopularizeUser.toString());
                     currentProgress += Double.parseDouble(a + "");
                     BigDecimal bigDecimal = new BigDecimal(currentProgress);
                     log.info("用户现活动进度：newCurrentProgress = {}", currentProgress);
-                    if (activityPopularizeUser.getEndProgress().compareTo(bigDecimal) != 0) {
-                        activityPopularizeUser.setStatus(0);
-                    } else {
-                        activityPopularizeUser.setStatus(1);
-                    }
                     //修改当前进度
                     activityPopularizeUser.setCurrentProgress(bigDecimal);
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                     //任务没有完成
-                    if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
+                    if (SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
                         //检查是否满足奖励
                         if (relationBiz.selectList(new ActivityPopularizeRelation() {{

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