Merge branch 'master-activity-bk' into dev

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

@@ -103,6 +103,9 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 							//判断是否活动超时
 							if (now.before(start) || now.after(end)) {
 								log.error("不在活动范围内 入参Json：" + JSONUtil.toJsonStr(registerQueueDTO));
+								//已完成，设置为活动结束
+								activityPopularize.setStatus(1);
+								popularizeBiz.updateSelectiveByIdRe(activityPopularize);
 								return;
 							}
 
@@ -170,13 +173,21 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 							if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
 								//检查是否满足奖励
-								if (relationBiz.selectList(new ActivityPopularizeRelation() {{
-									setMajorUserId(majorUserId);
-									setPopularizeId(activityPopularize.getId());
-								}}).size() >= 10 && popularizeUserBiz.selectCount(new ActivityPopularizeUser() {{
+								Long limitNumber = popularizeUserBiz.selectCount(new ActivityPopularizeUser() {{
 									setPopularizeId(activityPopularize.getId());
 									setCurrentProgress(new BigDecimal("50"));
-								}}) <= activityPopularize.getNumLimit()) {
+								}});
+								Long userNumber = relationBiz.selectCount(new ActivityPopularizeRelation() {{
+									setMajorUserId(majorUserId);
+									setPopularizeId(activityPopularize.getId());
+								}});
+								if (limitNumber >= activityPopularize.getNumLimit()) {
+									//已完成，设置为活动结束
+									activityPopularize.setStatus(1);
+									popularizeBiz.updateSelectiveByIdRe(activityPopularize);
+									return ;
+								}
+								if ( userNumber >= 10 &&  limitNumber < activityPopularize.getNumLimit()) {
 									apLogDTO.setStatus(SYS_TRUE);
 									popularizeLogBiz.updateSelectiveById(BeanUtil.toBean(apLogDTO, ActivityPopularizeLog.class));
 									activityPopularizeUser.setStatus(SYS_TRUE);