fix：标签修改

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

@@ -44,6 +44,7 @@ import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
 import com.gic.member.tag.api.dto.MemberTagDTO;
+import com.gic.member.tag.api.dto.MemberTagItemDTO;
 import com.gic.member.tag.api.service.MemberTagApiService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.response.QywxResponseDTO;
@@ -312,15 +313,17 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         String memberLabelId = hmQrcodeQDTO.getMemberLabelId();
         String memberLabelIdOld = hmOld.getMemberLabelId();
         if (!memberLabelId.equals(memberLabelIdOld)) {
-            MemberTagDTO memberTagDTO = memberTagApiService.getMemberTagById(memberLabelId);
-            MemberTagDTO memberTagDTOOld = memberTagApiService.getMemberTagById(memberLabelIdOld);
+            MemberTagItemDTO tagItem =  memberTagApiService.findMemberTagItem(memberLabelId);
+            MemberTagItemDTO tagItemOld = memberTagApiService.findMemberTagItem(memberLabelIdOld);
             String oldTagName = "";
             String tagName = "";
-            if (memberTagDTOOld != null) {
-                oldTagName = memberTagDTOOld.getTagName();
+            if (tagItemOld != null) {
+                MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagItemOld.getTagId()) ;
+                oldTagName = tag.getTagName() + "-" + tagItem.getTagItemName();
             }
-            if (memberTagDTO != null) {
-                tagName = memberTagDTO.getTagName();
+            if (tagItem != null) {
+                MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagItem.getTagId()) ;
+                tagName = tag.getTagName() + "-" + tagItem.getTagItemName();
             }
             logContent.append("活码标签「").append(oldTagName).append("」").append("变更为「").append(tagName).append("」");
         }
@@ -471,8 +474,13 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             }
             MemberTagDTO memberTagDTO = memberTagApiService.getMemberTagById(hmQrcodeBO.getMemberLabelId());
             if (memberTagDTO != null) {
-                hmQrcodeBO.setMemberLabelName(memberTagDTO.getTagName());
-                hmQrcodeBO.setMemberLabelStatus(memberTagDTO.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<>();