Commit d9cadcfa d9cadcfad3468817ff0b2700cdb21585ac357865 by xianghan

1.添加查询会员日志

1 parent b1f50657
...@@ -22,6 +22,8 @@ import org.springframework.transaction.annotation.Propagation; ...@@ -22,6 +22,8 @@ import org.springframework.transaction.annotation.Propagation;
22 import org.springframework.transaction.annotation.Transactional; 22 import org.springframework.transaction.annotation.Transactional;
23 import org.springframework.util.Assert; 23 import org.springframework.util.Assert;
24 24
25 import java.util.Objects;
26
25 27
26 /** 28 /**
27 * @author XiangHan 29 * @author XiangHan
...@@ -97,7 +99,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -97,7 +99,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
97 private MemberDTO checkMember(MemberProfile resources){ 99 private MemberDTO checkMember(MemberProfile resources){
98 Long memberId = resources.getMemberId(); 100 Long memberId = resources.getMemberId();
99 String memberCode = resources.getMemberCode(); 101 String memberCode = resources.getMemberCode();
100 102 log.info("checkMember ==>> memberId ==>> {} || memberCode ==>> {}", memberId, memberCode);
101 return this.memberService.checkMember(memberId,memberCode); 103 return this.memberService.checkMember(memberId,memberCode);
102 } 104 }
103 105
...@@ -110,13 +112,19 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -110,13 +112,19 @@ public class MemberProfileServiceImpl implements MemberProfileService {
110 MemberDTO memberDTO = this.checkMember(resources); 112 MemberDTO memberDTO = this.checkMember(resources);
111 113
112 MemberProfileDTO _memberProfileDTO = this.findByMemberId(memberDTO.getId()); 114 MemberProfileDTO _memberProfileDTO = this.findByMemberId(memberDTO.getId());
113 resources.setMemberId(_memberProfileDTO.getMemberId()); 115
114 resources.setId(_memberProfileDTO.getId()); 116 if (Objects.nonNull(_memberProfileDTO.getId())) {
115 resources.setCreateTime(_memberProfileDTO.getCreateTime()); 117 resources.setId(_memberProfileDTO.getId());
118 resources.setCreateTime(_memberProfileDTO.getCreateTime());
119 }
120
121 resources.setMemberId(memberDTO.getId());
122
123 log.info("memberProfileServiceImpl ==>> update ==>> memberId ==>> {} || resources =>> {}", memberDTO.getId(), resources);
116 MemberProfile _memberProfile = this.memberProfileRepository.save(resources); 124 MemberProfile _memberProfile = this.memberProfileRepository.save(resources);
117 125
118 MemberProfileDTO memberProfileDTO = new MemberProfileDTO(); 126 MemberProfileDTO memberProfileDTO = new MemberProfileDTO();
119 BeanUtils.copyProperties(_memberProfile,memberProfileDTO); 127 BeanUtils.copyProperties(_memberProfile, memberProfileDTO);
120 return memberProfileDTO; 128 return memberProfileDTO;
121 129
122 } 130 }
......
...@@ -87,12 +87,15 @@ public class MemberServiceImpl implements MemberService { ...@@ -87,12 +87,15 @@ public class MemberServiceImpl implements MemberService {
87 87
88 if (StringUtils.isNotBlank(memberCode)) { 88 if (StringUtils.isNotBlank(memberCode)) {
89 MemberDTO memberDTO = this.findByCode(memberCode); 89 MemberDTO memberDTO = this.findByCode(memberCode);
90 log.info("checkMember ==>> findByCode result memberDTO id ==>> {}", memberDTO.getId());
90 return memberDTO; 91 return memberDTO;
91 } else if (Objects.nonNull(id)) { 92 } else if (Objects.nonNull(id)) {
92 MemberDTO memberDTO = this.findById(id); 93 MemberDTO memberDTO = this.findById(id);
94 log.info("checkMember ==>> findById result memberDTO id ==>> {}", memberDTO.getId());
93 return memberDTO; 95 return memberDTO;
94 } 96 }
95 97
98 log.info("checkMember ==>> result is null ==>> id ==>> {} || memberCode ==>> {}" ,id, memberCode);
96 return null; 99 return null;
97 } 100 }
98 101
......
...@@ -79,7 +79,7 @@ mutil-mq: ...@@ -79,7 +79,7 @@ mutil-mq:
79 # password: Topdraw1qaz 79 # password: Topdraw1qaz
80 # 虚拟空间 80 # 虚拟空间
81 # virtual-host: member_center_iptv_sichuan 81 # virtual-host: member_center_iptv_sichuan
82 virtual-host: user_center 82 virtual-host: member_center_small_sichuan
83 publisher-confirms: true #如果对异步消息需要回调必须设置为true 83 publisher-confirms: true #如果对异步消息需要回调必须设置为true
84 84
85 # 管理侧 85 # 管理侧
...@@ -106,6 +106,12 @@ service: ...@@ -106,6 +106,12 @@ service:
106 # routing-key: 106 # routing-key:
107 # active: service 107 # active: service
108 - source: collection 108 - source: collection
109 exchange: exchange.collection
110 queue: collection.queue
111 exchange-type: direct
112 routing-key:
113 active: service
114 - source: collection
109 exchange: userCenter_exchange 115 exchange: userCenter_exchange
110 queue: queue.collection.add 116 queue: queue.collection.add
111 exchange-type: direct 117 exchange-type: direct
...@@ -123,12 +129,7 @@ service: ...@@ -123,12 +129,7 @@ service:
123 exchange-type: direct 129 exchange-type: direct
124 routing-key: route.UserCollection.deleteall 130 routing-key: route.UserCollection.deleteall
125 active: service 131 active: service
126 - source: collection 132
127 exchange: exchange.collection
128 queue: collection.queue
129 exchange-type: direct
130 routing-key:
131 active: service
132 # - source: viewRecord 133 # - source: viewRecord
133 # exchange: viewRecord.exchange 134 # exchange: viewRecord.exchange
134 # queue: viewRecord.queue 135 # queue: viewRecord.queue
......