Merge branch 'master-activity-bk' into dev

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

@@ -86,7 +86,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 				}});
 				log.info("活动邀请注册：activityPopularize = {}", activityPopularize.toString());
 				if (activityPopularize != null) {
-                    String lockKey = String.format("%s%d:%d:%d", registerQueueDTO.getAppUserId(), registerQueueDTO.getInParamDTO().getUsername(), activityPopularize.getId());
+                    String lockKey = String.format("%s%d:%s:%d",registerQueueDTO.getInParamDTO().getActivityCode(), registerQueueDTO.getAppUserId(), registerQueueDTO.getInParamDTO().getUsername(), activityPopularize.getId());
                     RLock rLock = redissonLock.getRLock(lockKey);
                     try {
                         boolean isSuccess = rLock.tryLock(5, 5, TimeUnit.SECONDS);