Merge branch 'master-captcha-branch' into dev

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

@@ -119,6 +119,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 							Integer num = relationBiz.getByUserIdAndPopularizeId(activityPopularizeRelation);
 
 							double amount = 0;
+							if (num <= 10) {
 								JSONObject jsonObject = JSONObject.parseObject(activityPopularizeItem.getDetail());
 								if (jsonObject != null && StringUtils.isNotBlank(jsonObject.getString("detail"))) {
 									JSONArray jsonArray = JSONArray.parseArray(jsonObject.getString("detail"));
@@ -130,6 +131,8 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 										}
 									}
 								}
+							}
+
 							double a = amount;
 							//添加活动关系
 							relationBiz.insertSelective(new ActivityPopularizeRelation() {{
@@ -185,9 +188,8 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 									//已完成，设置为活动结束
 									activityPopularize.setStatus(1);
 									popularizeBiz.updateSelectiveByIdRe(activityPopularize);
-									return ;
 								}
-								if ( userNumber >= 10 &&  limitNumber < activityPopularize.getNumLimit()) {
+								if ( userNumber == 10 &&  limitNumber < activityPopularize.getNumLimit()) {
 									apLogDTO.setStatus(SYS_TRUE);
 									popularizeLogBiz.updateSelectiveById(BeanUtil.toBean(apLogDTO, ActivityPopularizeLog.class));
 									activityPopularizeUser.setStatus(SYS_TRUE);