增加成员名称

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

@@ -30,6 +30,7 @@ import com.gic.haoban.manage.service.service.hm.HmLinkService;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
 import com.gic.member.api.dto.es.MemberDataDTO;
+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.github.pagehelper.PageHelper;
@@ -102,7 +103,11 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
                 entity.setMemberLabelId(memberLabelId);
                 MemberTagItemDTO dto = this.memberTagApiService.findMemberTagItem(memberLabelId);
                 if (null != dto) {
-                    entity.setMemberName(dto.getTagName() + dto.getTagItemName());
+                    String tagId = dto.getTagId() ;
+                    MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId) ;
+                    entity.setMemberLabelName(tag.getTagName() + "-" + dto.getTagItemName());
+                }else {
+                    log.info("会员标签查询null,memberLabelId={}",memberLabelId);
                 }
             }
             if (null != qdto.getMemberId()) {

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

@@ -327,6 +327,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         }
         String staffId = staff.getStaffId();
+        String staffName = staff.getStaffName() ;
         String staffWxUserId = staff.getWxUserId();
         log.info("新增外部联系人,staff.getWxUserId():{}", staffWxUserId);
         dto.setWxUserId(staffWxUserId);
@@ -434,6 +435,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         wxUserAddLogQDTO.setExternalUserid(externalUserId);
         wxUserAddLogQDTO.setWxUserId(wxUserId);
         wxUserAddLogQDTO.setStaffId(staffId);
+        wxUserAddLogQDTO.setStaffName(staffName);
         wxUserAddLogService.save(wxUserAddLogQDTO);
     }