1.update

@@ -45,8 +45,8 @@ public class MemberBuilder {
         member.setBirthday(StringUtils.isBlank(member.getBirthday())?"1900-01-01":member.getBirthday());
         String nickname = member.getNickname();
         if (StringUtils.isNotEmpty(nickname)) {
-            String base64Nickname = new String(Base64.getEncoder().encode(nickname.getBytes(StandardCharsets.UTF_8)));
-            member.setNickname(base64Nickname);
+//            String base64Nickname = new String(Base64.getEncoder().encode(nickname.getBytes(StandardCharsets.UTF_8)));
+            member.setNickname(nickname);
         }
         return member;
     }

@@ -53,10 +53,8 @@ public class MemberServiceImpl implements MemberService {
     public MemberDTO findByCode(String code) {
 
         Member member = this.memberRepository.findFirstByCode(code).orElseGet(Member::new);
-        ValidationUtil.isNull(member.getId(),"Member","id",code);
 
         return this.memberMapper.toDto(member);
-
     }
 
     private MemberDTO findByIdOrCode(Long id, String code) {

@@ -97,12 +97,17 @@ public class UserOperationServiceImpl implements UserOperationService {
 
         } else {
 
-            this.updateUserTv(_userTvDTO, userTvDTO);
-
             String code = memberDTO.getCode();
             MemberDTO _memberDTO = this.memberService.findByCode(code);
+            if (Objects.nonNull(_memberDTO.getId())) {
                 this.updateMember(_memberDTO, memberDTO);
+            } else {
+                memberDTO.setId(null);
+                MemberDTO _memberDTO0 = this.createMember(memberDTO);
+                userTvDTO.setMemberId(_memberDTO0.getId());
+            }
 
+            this.updateUserTv(_userTvDTO, userTvDTO);
         }
     }
 
@@ -275,8 +280,18 @@ public class UserOperationServiceImpl implements UserOperationService {
 
     private void updateUserTv(UserTvDTO _userTvDTO, UserTvDTO userTvDTO){
         userTvDTO.setId(_userTvDTO.getId());
-        userTvDTO.setVisUserId(_userTvDTO.getVisUserId());
-        userTvDTO.setMemberId(_userTvDTO.getMemberId());
+
+        Long memberId = _userTvDTO.getMemberId();
+        if (Objects.isNull(memberId)){
+            String memberCode = userTvDTO.getMemberCode();
+            if (StringUtils.isNotBlank(memberCode)) {
+                MemberDTO memberDTO = this.memberService.findByCode(memberCode);
+                userTvDTO.setMemberId(memberDTO.getId());
+            }
+        } else {
+            userTvDTO.setMemberId(memberId);
+        }
+
         userTvDTO.setPlatformAccount(_userTvDTO.getPlatformAccount());
         userTvDTO.setCreateTime(_userTvDTO.getCreateTime());
 

@@ -149,7 +149,3 @@ service:
             fileName: error
             start: on
 
-# uc-engine服务地址
-api:
-  baseUrl: http://127.0.0.1:8218
-