bug修复

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/impl/UserFddAuthServiceImpl.java

@@ -45,6 +45,9 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
     @Autowired
     private UserFddAuthDao userFddAuthDao;
 
+    @Autowired
+    private UserFddAuthService userFddAuthService;
+
     @Override
     public String register(String uid, String accountType) {
         return fddService.register(uid, accountType);
@@ -213,8 +216,20 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
         if (port.equals(0)) {
             UserAccountDO userInfo = userServiceDao.getUserAccountById(loginSuccessDTO.getUserAccountId());
             uId = this.replaceUnableString(userInfo.getUnionId());
-            if (flag == 2) {
-                uId = this.replaceUnableString(userInfo.getOpenId());
+            UserFddDO userFddInfo = userFddAuthDao.getAppUserFddInfo(uId);
+            if (userFddInfo == null) {
+                uId = userFddAuthService.replaceUnableString(userInfo.getOpenId());
+            } else {
+                Integer accountType = userFddInfo.getAccountType();
+                Integer personVerifyStatus = userFddInfo.getPersonVerifyStatus();
+                Integer entVerifyStatus = userFddInfo.getEntVerifyStatus();
+
+                boolean isPersonVerified = accountType.equals(1) && !personVerifyStatus.equals(2);
+                boolean isEntVerified = accountType.equals(2) && !entVerifyStatus.equals(4);
+
+                if (isPersonVerified || isEntVerified) {
+                    uId = userFddAuthService.replaceUnableString(userInfo.getOpenId());
+                }
             }
         } else {
             uId = loginSuccessDTO.getUserAccountId().toString();