Commit 530a9a13 530a9a13a56150127fd41b22b6ec70d4b95b9cad by xianghan

1.优化

1 parent 2cd36de6
...@@ -112,7 +112,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -112,7 +112,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
112 public MemberProfileDTO update(MemberProfile resources) { 112 public MemberProfileDTO update(MemberProfile resources) {
113 113
114 log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources); 114 log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
115 // this.redisUtils.doLock("memberProfile::memberId::" + resources.getMemberId()); 115 this.redisUtils.doLock("memberProfile::memberId::" + resources.getMemberId());
116 try { 116 try {
117 117
118 MemberProfileDTO _memberProfileDTO1 = this.findById(resources.getId()); 118 MemberProfileDTO _memberProfileDTO1 = this.findById(resources.getId());
...@@ -138,7 +138,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -138,7 +138,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
138 e.printStackTrace(); 138 e.printStackTrace();
139 throw e; 139 throw e;
140 } finally { 140 } finally {
141 // this.redisUtils.doUnLock("memberProfile::memberId::" + resources.getId()); 141 this.redisUtils.doUnLock("memberProfile::memberId::" + resources.getMemberId());
142 } 142 }
143 143
144 } 144 }
......
...@@ -87,6 +87,7 @@ public class UserTvServiceImpl implements UserTvService { ...@@ -87,6 +87,7 @@ public class UserTvServiceImpl implements UserTvService {
87 Long id = memberDTO.getId(); 87 Long id = memberDTO.getId();
88 resources.setMemberId(id); 88 resources.setMemberId(id);
89 UserTv userTv = this.userTvRepository.save(resources); 89 UserTv userTv = this.userTvRepository.save(resources);
90 userTv.setMemberCode(memberDTO.getCode());
90 return this.userTvMapper.toDto(userTv); 91 return this.userTvMapper.toDto(userTv);
91 } 92 }
92 return null; 93 return null;
......
...@@ -10,4 +10,6 @@ public class TvUnBindBean extends BindBean { ...@@ -10,4 +10,6 @@ public class TvUnBindBean extends BindBean {
10 /** 是否自动设置主账号 true:是;false(默认):否 */ 10 /** 是否自动设置主账号 true:是;false(默认):否 */
11 private Boolean autoModel; 11 private Boolean autoModel;
12 12
13 /** 需要绑定的会员code */
14 private String bindMemberCode;
13 } 15 }
......
...@@ -36,6 +36,9 @@ public class WeiXinUserBean { ...@@ -36,6 +36,9 @@ public class WeiXinUserBean {
36 /** 会员id */ 36 /** 会员id */
37 private Long memberId; 37 private Long memberId;
38 38
39 /** 会员code */
40 private String memberCode;
41
39 /** 加密信息 */ 42 /** 加密信息 */
40 private String encryptedData; 43 private String encryptedData;
41 44
......
...@@ -441,10 +441,11 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -441,10 +441,11 @@ public class UserOperationServiceImpl implements UserOperationService {
441 public void tvUnbind(TvUnBindBean resources) { 441 public void tvUnbind(TvUnBindBean resources) {
442 442
443 Boolean autoModel = resources.getAutoModel(); 443 Boolean autoModel = resources.getAutoModel();
444 String bindMemberCode = resources.getBindMemberCode();
444 String platformAccount = resources.getPlatformAccount(); 445 String platformAccount = resources.getPlatformAccount();
445 Long memberId = resources.getMemberId(); 446 String memberCode = resources.getMemberCode();
446 MemberDTO memberDTO = this.memberService.findById(memberId); 447
447 String memberCode = memberDTO.getCode(); 448 this.memberService.findByCode(memberCode);
448 449
449 UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount); 450 UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
450 if (Objects.isNull(userTvDTO)) 451 if (Objects.isNull(userTvDTO))
...@@ -454,7 +455,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -454,7 +455,7 @@ public class UserOperationServiceImpl implements UserOperationService {
454 MemberDTO _memberDTO = this.minaUnbind_(this.findMemberByCode(memberCode)); 455 MemberDTO _memberDTO = this.minaUnbind_(this.findMemberByCode(memberCode));
455 456
456 // 置空主账号 457 // 置空主账号
457 UserTvDTO _userTvDTO = this.resetMainAccount(memberCode, userTvDTO.getId(), autoModel); 458 UserTvDTO _userTvDTO = this.resetMainAccount(memberCode, userTvDTO.getId(), autoModel, bindMemberCode);
458 459
459 // 同步至iptv 460 // 同步至iptv
460 ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUnbind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO)); 461 ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUnbind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
...@@ -942,12 +943,13 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -942,12 +943,13 @@ public class UserOperationServiceImpl implements UserOperationService {
942 * @param id 大屏id 943 * @param id 大屏id
943 * @param autoModel true:自动设置主账号 false: 手动设置 944 * @param autoModel true:自动设置主账号 false: 手动设置
944 */ 945 */
945 private UserTvDTO resetMainAccount(String memberCode, Long id, Boolean autoModel) { 946 private UserTvDTO resetMainAccount(String memberCode, Long id, Boolean autoModel, String bindMemberCode) {
946 947
947 UserTvDTO userTvDTO = this.userTvService.findByPriorityMemberCode(memberCode); 948 UserTvDTO userTvDTO = this.userTvService.findByPriorityMemberCode(memberCode);
948 if (Objects.nonNull(userTvDTO)) { 949 if (Objects.nonNull(userTvDTO)) {
949 950
950 if (autoModel == true) { 951 if (StringUtils.isBlank(bindMemberCode)) {
952
951 // 有其他绑定的小程序会员 953 // 有其他绑定的小程序会员
952 List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id); 954 List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id);
953 if (CollectionUtils.isNotEmpty(memberDTOList)) { 955 if (CollectionUtils.isNotEmpty(memberDTOList)) {
...@@ -976,8 +978,10 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -976,8 +978,10 @@ public class UserOperationServiceImpl implements UserOperationService {
976 978
977 } else { 979 } else {
978 980
981 this.memberService.findByCode(bindMemberCode);
982
979 // 绑定新的主账号 983 // 绑定新的主账号
980 UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, null, "manual"); 984 UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, bindMemberCode, "manual");
981 985
982 return _userTvDTO; 986 return _userTvDTO;
983 987
......
...@@ -45,7 +45,7 @@ public class RestTemplateClient { ...@@ -45,7 +45,7 @@ public class RestTemplateClient {
45 public static String netImage(String imageUrl) { 45 public static String netImage(String imageUrl) {
46 Image image = new Image(imageUrl); 46 Image image = new Image(imageUrl);
47 String entityBody = ""; 47 String entityBody = "";
48 String url = BASE_URL + "/common/upload/netImage"; 48 String url = BASE_URL + "/ucs/common/upload/netImage";
49 log.info("request uc : url is " + url + ", memberId is " + com.alibaba.fastjson.JSONObject.toJSONString(image)); 49 log.info("request uc : url is " + url + ", memberId is " + com.alibaba.fastjson.JSONObject.toJSONString(image));
50 ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, image, String.class); 50 ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, image, String.class);
51 if (responseEntity.getStatusCode().is2xxSuccessful()) { 51 if (responseEntity.getStatusCode().is2xxSuccessful()) {
......
...@@ -141,4 +141,4 @@ weixin: ...@@ -141,4 +141,4 @@ weixin:
141 env: dev 141 env: dev
142 142
143 api: 143 api:
144 uc-service: https://inet.dev1.topmall.topdraw.cn
...\ No newline at end of file ...\ No newline at end of file
144 uc-service: http://127.0.0.1:8210
...\ No newline at end of file ...\ No newline at end of file
......