1.优化

@@ -1522,10 +1522,15 @@ public class UserOperationServiceImpl implements UserOperationService {
         String appId = resources.getAppid();
         String appId = resources.getAppid();
         String openId = resources.getOpenid();
         String openId = resources.getOpenid();
         String unionId = resources.getUnionid();
         String unionId = resources.getUnionid();
+        String nickname = resources.getNickname();
+        String headimgurl = resources.getHeadimgurl();
 
 
         // 检查账户是否存在
         // 检查账户是否存在
-        UserWeixinDTO userWeixinDTO = this.findFirstByUnionIdAndAppIdAndOpenId(unionId,appId, openId);
-        if (Objects.nonNull(userWeixinDTO.getId()))
+//        UserWeixinDTO userWeixinDTO = this.findFirstByUnionIdAndAppIdAndOpenId(unionId,appId, openId);
+
+        UserWeixinDTO userWeixinDTO = this.findUserWeiXinByOpenIdAndAppId(appId, openId);
+        if (Objects.nonNull(userWeixinDTO.getId()) && StringUtils.isNotBlank(userWeixinDTO.getUnionid()) &&
+                Objects.nonNull(userWeixinDTO.getMemberId()))
             return userWeixinDTO;
             return userWeixinDTO;
 
 
         // 当前用户的任意微信app
         // 当前用户的任意微信app
@@ -1547,22 +1552,48 @@ public class UserOperationServiceImpl implements UserOperationService {
 
 
         }
         }
 
 
-        userWeixinDTO1.setId(null);
-        userWeixinDTO1.setAppid(appId);
-        userWeixinDTO1.setOpenid(openId);
-        userWeixinDTO1.setUnionid(unionId);
-        log.info("createWeixinUserAndCreateMember ==>> [{}]",userWeixinDTO1);
-        // 保存微信账户
-        userWeixinDTO1 = this.doCreateUserWeiXin(userWeixinDTO1,memberId);
+        if (Objects.nonNull(userWeixinDTO.getId())) {
+            String unionid = userWeixinDTO.getUnionid();
+            if (StringUtils.isBlank(unionid)) {
+                userWeixinDTO.setUnionid(unionId);
+            }
+            String nickname_ = userWeixinDTO.getNickname();
+            if (StringUtils.isBlank(nickname_)) {
+                userWeixinDTO.setNickname(nickname);
+            }
+            String headimgurl_ = userWeixinDTO.getHeadimgurl();
+            if (StringUtils.isBlank(headimgurl_)) {
+                userWeixinDTO.setHeadimgurl(headimgurl);
+            }
+
+            UserWeixinDTO userWeixinDTO_ = this.doCreateUserWeiXin(userWeixinDTO,memberId);
+            MemberProfileDTO memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
+            if (Objects.isNull(memberProfileDTO))
+                // 创建会员属性信息
+                this.createMemberProfile(userWeixinDTO_);
 
 
-        log.info("userWeixinDTO1 ==>> [{}]",userWeixinDTO1);
+            return userWeixinDTO;
 
 
-        MemberProfileDTO memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
-        if (Objects.isNull(memberProfileDTO))
-            // 创建会员属性信息
-            this.createMemberProfile(userWeixinDTO1);
+        } else {
+
+            userWeixinDTO1.setId(null);
+            userWeixinDTO1.setAppid(appId);
+            userWeixinDTO1.setOpenid(openId);
+            userWeixinDTO1.setUnionid(unionId);
+            log.info("createWeixinUserAndCreateMember ==>> [{}]",userWeixinDTO1);
+            // 保存微信账户
+            userWeixinDTO1 = this.doCreateUserWeiXin(userWeixinDTO1,memberId);
 
 
-        return userWeixinDTO1;
+            log.info("userWeixinDTO1 ==>> [{}]",userWeixinDTO1);
+
+            MemberProfileDTO memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
+            if (Objects.isNull(memberProfileDTO))
+                // 创建会员属性信息
+                this.createMemberProfile(userWeixinDTO1);
+
+            return userWeixinDTO1;
+
+        }
     }
     }
 
 
     @Override
     @Override

@@ -2,9 +2,9 @@
 spring:
 spring:
   datasource:
   datasource:
 #    测试/演示库url:
 #    测试/演示库url:
-    url: jdbc:log4jdbc:mysql://139.196.192.242:3306/tj_user_0819?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+    url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs_test?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
     username: root
     username: root
-    password: Tjlh@2017
+    password: Tjlh@2021
 
 
     driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
     driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
     #Druid
     #Druid