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

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

@@ -67,11 +67,11 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
 
     public void handleRegister(RegisterQueueDTO registerQueueDTO) {
 
+        if (StringUtils.isNotBlank(registerQueueDTO.getInParamDTO().getActivityCode())) {
             String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "");
             AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
-
             //获取活动code,并且注册来源是app 并且 非普通登录
-        if(!RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign())) {
+            if(!RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign()) && StringUtils.isNotBlank(activityCode)) {
                 //查询出活动
                 ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
                     setCode(activityCode);
@@ -168,4 +168,5 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                 }
             }
         }
+    }
 }
\ No newline at end of file