Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -375,9 +375,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 wxUserAddLogQDTO.setLinkId(refId);
                 wxUserAddLogQDTO.setHmId(hmId);
 
-                hmQrcodeDTO = hmQrcodeApiService.getSimpleById(refId);
+                hmQrcodeDTO = hmQrcodeApiService.getSimpleById(hmId);
                 if (hmQrcodeDTO == null) {
-                    log.error("活码动态为空：{}", refId);
+                    log.error("活码动态为空：{}", hmId);
                     return;
                 }
                 staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmQrcodeDTO.getClerkId(), wxEnterpriseId);

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

@@ -472,15 +472,12 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             if (hmGroupSettingBO != null) {
                 hmQrcodeBO.setHmGroupName(hmGroupSettingBO.getGroupName());
             }
-            MemberTagDTO memberTagDTO = memberTagApiService.getMemberTagById(hmQrcodeBO.getMemberLabelId());
-            if (memberTagDTO != null) {
-                MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(hmQrcodeBO.getMemberLabelId());
-                if (null != tagItem) {
-                    String tagId = tagItem.getTagId() ;
-                    MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId) ;
-                    hmQrcodeBO.setMemberLabelName(tag.getTagName() + "-" + tagItem.getTagItemName());
-                    hmQrcodeBO.setMemberLabelStatus(tagItem.getStatus());
-                }
+            MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(hmQrcodeBO.getMemberLabelId());
+            if (null != tagItem) {
+                String tagId = tagItem.getTagId() ;
+                MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId) ;
+                hmQrcodeBO.setMemberLabelName(tag.getTagName() + "-" + tagItem.getTagItemName());
+                hmQrcodeBO.setMemberLabelStatus(tagItem.getStatus());
             }
             Integer hmType = hmQrcodeBO.getHmType();
             List<HmClerkDTO> clerkDTOList = new ArrayList<>();