lmk-shop-java.git

			@@ -24,6 +24,8 @@
			import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
			import cn.lili.modules.connect.service.ConnectService;
			import cn.lili.modules.lmk.domain.entity.VideoAccount;
			import cn.lili.modules.lmk.domain.form.MemberTagForm;
			import cn.lili.modules.lmk.service.MemberTagService;
			import cn.lili.modules.lmk.service.VideoAccountService;
			import cn.lili.modules.member.aop.annotation.PointLogPoint;
			import cn.lili.modules.member.entity.dos.Member;
			@@ -111,6 +113,9 @@

			@Autowired
			private VideoAccountService videoAccountService;

			@Autowired
			private MemberTagService memberTagService;

			@Override
			public Member findByUsername(String userName) {
			@@ -487,6 +492,7 @@
			}

			@Override
			@Transactional
			public Member updateMember(ManagerMemberEditDTO managerMemberEditDTO) {
			//过滤会员昵称敏感词
			if (CharSequenceUtil.isNotBlank(managerMemberEditDTO.getNickName())) {
			@@ -501,6 +507,13 @@
			//传递修改会员信息
			BeanUtil.copyProperties(managerMemberEditDTO, member);
			this.updateById(member);
			if (managerMemberEditDTO.getTags() != null) {
			MemberTagForm memberTagForm = new MemberTagForm();
			memberTagForm.setMemberId(member.getId());
			memberTagForm.setTagIds(managerMemberEditDTO.getTags());
			memberTagForm.setCreateType("MANAGER");
			memberTagService.addMemberTag(memberTagForm);
			}
			return member;
			}

			@@ -786,7 +799,7 @@

			@Override
			public MemberVO getMember(String id) {
			return new MemberVO(this.getById(id));
			return baseMapper.getVoById(id);
			}

			@Override