Merge branch 'master' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -351,7 +351,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         //活码处理 "DT" "HM"
         WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
         String memberLabelId = "";
-        if (StringUtils.isNotBlank(state)) {
+        if (StringUtils.isNotBlank(state) && (state.startsWith(Manage3Constants.HM)||state.startsWith(Manage3Constants.DT))) {
             String id = state.substring(2);
             Long hmId = null;
             HmQrcodeDTO hmQrcodeDTO = null;
@@ -692,7 +692,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String relationKey = SecureUtil.md5(staffId + dto.getExternalUserid());
 
         WelcomeDetailBO welcomeDetailBO = null;
-        if (StringUtils.isNotBlank(state)) {
+        if (StringUtils.isNotBlank(state) && (state.startsWith(Manage3Constants.HM)||state.startsWith(Manage3Constants.DT))) {
             //"HM+id" "DT+key"
             log.info("特殊欢迎语 state:{}", state);
             WelcomeReferBO welcomeReferBo = getWelcomeReferBo(state);