bug

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java

@@ -267,10 +267,24 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         }
 
         taContractMapper.updateById(taContract);
-        String manualUrl = getFddDownServerHost(person.getMiniappId(), signUrl);
+        String manualUrl = getFddServerHost(person.getMiniappId(), signUrl);
         return manualUrl;
     }
 
+
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+
     /**
      * 检查签署合同状态
      *

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java

@@ -62,9 +62,10 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         queryWrapper.eq("mini_openid",MD5Utils.md5(person.getMiniOpenid()));
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
         if (null != taContractUser) {
-            taContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
-            taContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),taContractUser.getCertifiedAddress()));
-            return taContractUser;
+            TaContractUser firstCustomerInfo = getFirstCustomerInfo(person);
+            firstCustomerInfo.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+            firstCustomerInfo.setCertifiedAddress(getFddServerHost(person.getMiniappId(),taContractUser.getCertifiedAddress()));
+            return firstCustomerInfo;
         }
         //没有法大大账号的先注册
         log.info("========法大大个人注册=======");
@@ -90,7 +91,8 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         newContractUser.setOrgId(person.getOrgId());
 
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
-        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        log.info("appid {} , secret {}, version {} , serverhost {}",fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
         String customer_id = jsonObject.getString("data");
         //0:三要素标准方案； 1:三要素补充方案 4 纯三要素方案；
         String verifyed_way = "4";
@@ -107,7 +109,7 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         if (null !=data){
             String url = JSON.parseObject(data).getString("url");
             url = decode(url);
-            newContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),url));
+            newContractUser.setCertifiedAddress(getFddDownServerHost(person.getMiniappId(),url));
             newContractUser.setCertifiedSerialNumber(JSON.parseObject(data).getString("transactionNo"));
         }
         newContractUser.setStatus(0);
@@ -130,6 +132,22 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         return newUrl;
     }
 
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddDownServerHost(String miniappId,String subUrl) {
+        if (StringUtils.isEmpty(subUrl)){
+            return subUrl;
+        }
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddDownloadHost()) ? subUrl : taMiniapp.getFddDownloadHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+
     /**
      * 去法大大处更新客户的状态
      *