企业、个人双实名

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

@@ -49,8 +49,14 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
 
     @Override
     public ResultBody getPersonVerifyUrl(Integer userAccountId) {
+        String unionId;
         UserAccountDO userInfo = userServiceDao.getUserAccountById(userAccountId);
-        String unionId = this.replaceUnableString(userInfo.getUnionId());
+        unionId = this.replaceUnableString(userInfo.getUnionId());
+        // 判断是否使用unionId注册过企业认证，如果注册过那就用openid注册
+        String companyCustomerId = this.checkRegisterFdd(unionId, 2);
+        if (companyCustomerId != null) {
+            unionId = this.replaceUnableString(userInfo.getOpenId());
+        }
         //验证是否注册个人
         String customerId = this.checkRegisterFdd(unionId, 1);
         if (customerId == null) {
@@ -119,7 +125,14 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
         if (port.equals(0)) {
             // 获取小程序用户信息拿到unionId
             UserAccountDO userInfo = userServiceDao.getUserAccountById(loginSuccessDTO.getUserAccountId());
-            uId = this.replaceUnableString(userInfo.getUnionId());
+            String unionId = this.replaceUnableString(userInfo.getUnionId());
+            // 判断是否用uid注册个人认证，如果用了那么就用openid进行企业认证
+            String customerId = this.checkRegisterFdd(unionId, 1);
+            if (customerId == null) {
+                uId = unionId;
+            } else {
+                uId = this.replaceUnableString(userInfo.getOpenId());
+            }
         } else {
             uId = loginSuccessDTO.getUserAccountId().toString();
         }