Commit d9cadcfa d9cadcfad3468817ff0b2700cdb21585ac357865 by xianghan

1.添加查询会员日志

1 parent b1f50657
......@@ -22,6 +22,8 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.Objects;
/**
* @author XiangHan
......@@ -97,7 +99,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
private MemberDTO checkMember(MemberProfile resources){
Long memberId = resources.getMemberId();
String memberCode = resources.getMemberCode();
log.info("checkMember ==>> memberId ==>> {} || memberCode ==>> {}", memberId, memberCode);
return this.memberService.checkMember(memberId,memberCode);
}
......@@ -110,13 +112,19 @@ public class MemberProfileServiceImpl implements MemberProfileService {
MemberDTO memberDTO = this.checkMember(resources);
MemberProfileDTO _memberProfileDTO = this.findByMemberId(memberDTO.getId());
resources.setMemberId(_memberProfileDTO.getMemberId());
if (Objects.nonNull(_memberProfileDTO.getId())) {
resources.setId(_memberProfileDTO.getId());
resources.setCreateTime(_memberProfileDTO.getCreateTime());
}
resources.setMemberId(memberDTO.getId());
log.info("memberProfileServiceImpl ==>> update ==>> memberId ==>> {} || resources =>> {}", memberDTO.getId(), resources);
MemberProfile _memberProfile = this.memberProfileRepository.save(resources);
MemberProfileDTO memberProfileDTO = new MemberProfileDTO();
BeanUtils.copyProperties(_memberProfile,memberProfileDTO);
BeanUtils.copyProperties(_memberProfile, memberProfileDTO);
return memberProfileDTO;
}
......
......@@ -87,12 +87,15 @@ public class MemberServiceImpl implements MemberService {
if (StringUtils.isNotBlank(memberCode)) {
MemberDTO memberDTO = this.findByCode(memberCode);
log.info("checkMember ==>> findByCode result memberDTO id ==>> {}", memberDTO.getId());
return memberDTO;
} else if (Objects.nonNull(id)) {
MemberDTO memberDTO = this.findById(id);
log.info("checkMember ==>> findById result memberDTO id ==>> {}", memberDTO.getId());
return memberDTO;
}
log.info("checkMember ==>> result is null ==>> id ==>> {} || memberCode ==>> {}" ,id, memberCode);
return null;
}
......
......@@ -79,7 +79,7 @@ mutil-mq:
# password: Topdraw1qaz
# 虚拟空间
# virtual-host: member_center_iptv_sichuan
virtual-host: user_center
virtual-host: member_center_small_sichuan
publisher-confirms: true #如果对异步消息需要回调必须设置为true
# 管理侧
......@@ -106,6 +106,12 @@ service:
# routing-key:
# active: service
- source: collection
exchange: exchange.collection
queue: collection.queue
exchange-type: direct
routing-key:
active: service
- source: collection
exchange: userCenter_exchange
queue: queue.collection.add
exchange-type: direct
......@@ -123,12 +129,7 @@ service:
exchange-type: direct
routing-key: route.UserCollection.deleteall
active: service
- source: collection
exchange: exchange.collection
queue: collection.queue
exchange-type: direct
routing-key:
active: service
# - source: viewRecord
# exchange: viewRecord.exchange
# queue: viewRecord.queue
......