1.优化

@@ -112,7 +112,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
     public MemberProfileDTO update(MemberProfile resources) {
     public MemberProfileDTO update(MemberProfile resources) {
 
 
         log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
         log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
-//        this.redisUtils.doLock("memberProfile::memberId::" + resources.getMemberId());
+        this.redisUtils.doLock("memberProfile::memberId::" + resources.getMemberId());
         try {
         try {
 
 
             MemberProfileDTO _memberProfileDTO1 = this.findById(resources.getId());
             MemberProfileDTO _memberProfileDTO1 = this.findById(resources.getId());
@@ -138,7 +138,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
             e.printStackTrace();
             e.printStackTrace();
             throw e;
             throw e;
         } finally {
         } finally {
-//            this.redisUtils.doUnLock("memberProfile::memberId::" + resources.getId());
+            this.redisUtils.doUnLock("memberProfile::memberId::" + resources.getMemberId());
         }
         }
 
 
     }
     }

@@ -87,6 +87,7 @@ public class UserTvServiceImpl implements UserTvService {
             Long id = memberDTO.getId();
             Long id = memberDTO.getId();
             resources.setMemberId(id);
             resources.setMemberId(id);
             UserTv userTv = this.userTvRepository.save(resources);
             UserTv userTv = this.userTvRepository.save(resources);
+            userTv.setMemberCode(memberDTO.getCode());
             return this.userTvMapper.toDto(userTv);
             return this.userTvMapper.toDto(userTv);
         }
         }
         return null;
         return null;

@@ -10,4 +10,6 @@ public class TvUnBindBean extends BindBean {
     /** 是否自动设置主账号  true：是；false（默认）：否 */
     /** 是否自动设置主账号  true：是；false（默认）：否 */
     private Boolean autoModel;
     private Boolean autoModel;
 
 
+    /** 需要绑定的会员code */
+    private String bindMemberCode;
 }
 }

@@ -36,6 +36,9 @@ public class WeiXinUserBean {
     /** 会员id */
     /** 会员id */
     private Long memberId;
     private Long memberId;
 
 
+    /** 会员code */
+    private String memberCode;
+
     /** 加密信息 */
     /** 加密信息 */
     private String encryptedData;
     private String encryptedData;
 
 

@@ -441,10 +441,11 @@ public class UserOperationServiceImpl implements UserOperationService {
     public void tvUnbind(TvUnBindBean resources) {
     public void tvUnbind(TvUnBindBean resources) {
 
 
         Boolean autoModel = resources.getAutoModel();
         Boolean autoModel = resources.getAutoModel();
+        String bindMemberCode = resources.getBindMemberCode();
         String platformAccount = resources.getPlatformAccount();
         String platformAccount = resources.getPlatformAccount();
-        Long memberId = resources.getMemberId();
-        MemberDTO memberDTO = this.memberService.findById(memberId);
-        String memberCode = memberDTO.getCode();
+        String memberCode = resources.getMemberCode();
+
+        this.memberService.findByCode(memberCode);
 
 
         UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
         UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
         if (Objects.isNull(userTvDTO))
         if (Objects.isNull(userTvDTO))
@@ -454,7 +455,7 @@ public class UserOperationServiceImpl implements UserOperationService {
         MemberDTO _memberDTO = this.minaUnbind_(this.findMemberByCode(memberCode));
         MemberDTO _memberDTO = this.minaUnbind_(this.findMemberByCode(memberCode));
 
 
         // 置空主账号
         // 置空主账号
-        UserTvDTO _userTvDTO = this.resetMainAccount(memberCode, userTvDTO.getId(), autoModel);
+        UserTvDTO _userTvDTO = this.resetMainAccount(memberCode, userTvDTO.getId(), autoModel, bindMemberCode);
 
 
         // 同步至iptv
         // 同步至iptv
         ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUnbind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
         ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUnbind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
@@ -942,12 +943,13 @@ public class UserOperationServiceImpl implements UserOperationService {
      * @param id 大屏id
      * @param id 大屏id
      * @param autoModel true：自动设置主账号  false: 手动设置
      * @param autoModel true：自动设置主账号  false: 手动设置
      */
      */
-    private UserTvDTO resetMainAccount(String memberCode, Long id, Boolean autoModel) {
+    private UserTvDTO resetMainAccount(String memberCode, Long id, Boolean autoModel, String bindMemberCode) {
 
 
         UserTvDTO userTvDTO = this.userTvService.findByPriorityMemberCode(memberCode);
         UserTvDTO userTvDTO = this.userTvService.findByPriorityMemberCode(memberCode);
         if (Objects.nonNull(userTvDTO)) {
         if (Objects.nonNull(userTvDTO)) {
 
 
-            if (autoModel == true) {
+            if (StringUtils.isBlank(bindMemberCode)) {
+
                 // 有其他绑定的小程序会员
                 // 有其他绑定的小程序会员
                 List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id);
                 List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id);
                 if (CollectionUtils.isNotEmpty(memberDTOList)) {
                 if (CollectionUtils.isNotEmpty(memberDTOList)) {
@@ -976,8 +978,10 @@ public class UserOperationServiceImpl implements UserOperationService {
 
 
             } else {
             } else {
 
 
+                this.memberService.findByCode(bindMemberCode);
+
                 // 绑定新的主账号
                 // 绑定新的主账号
-                UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, null, "manual");
+                UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, bindMemberCode, "manual");
 
 
                 return _userTvDTO;
                 return _userTvDTO;
 
 

@@ -45,7 +45,7 @@ public class RestTemplateClient {
     public static String netImage(String imageUrl) {
     public static String netImage(String imageUrl) {
         Image image = new Image(imageUrl);
         Image image = new Image(imageUrl);
         String entityBody = "";
         String entityBody = "";
-        String url = BASE_URL + "/common/upload/netImage";
+        String url = BASE_URL + "/ucs/common/upload/netImage";
         log.info("request uc : url is " + url + ", memberId is " + com.alibaba.fastjson.JSONObject.toJSONString(image));
         log.info("request uc : url is " + url + ", memberId is " + com.alibaba.fastjson.JSONObject.toJSONString(image));
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, image, String.class);
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, image, String.class);
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
         if (responseEntity.getStatusCode().is2xxSuccessful()) {

@@ -141,4 +141,4 @@ weixin:
       env: dev
       env: dev
 
 
 api:
 api:
-  uc-service: https://inet.dev1.topmall.topdraw.cn
\ No newline at end of file
+  uc-service: http://127.0.0.1:8210
\ No newline at end of file