bug

src/main/java/com/huiju/estateagents/config/FadadaProperties.java

@@ -18,4 +18,5 @@ public class FadadaProperties {
     private String authReturnUrl;
     private String authNotifyUrl;
     private String signNotify;
+    private String redirectUrl;
 }

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

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
+import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Map;
@@ -121,6 +122,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         queryWrapper.eq("person_id",person.getPersonId());
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
         if (null != oldContract){
+            oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
+            oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
             return oldContract;
         }
 
@@ -165,8 +168,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         }
 
         //反更新合同地址
-        taContract.setContractDownloadUrl(autoSignResultJson.getString("download_url"));
-        taContract.setContractViewUrl(autoSignResultJson.getString("viewpdf_url"));
+        taContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
+        taContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
         taContractMapper.updateById(taContract);
 
         //企业名称
@@ -178,12 +181,12 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
      * 替换法大大服务器地址
      * @return
      */
-    private String getFddServerHost(String miniappId,String subUrl) {
+    private String getFddDownServerHost(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);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddDownloadHost()) ? subUrl : taMiniapp.getFddDownloadHost() + subUrl.substring(threeIndex);
         return newUrl;
     }
 
@@ -222,7 +225,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
+        String redirectUrl = URLEncoder.encode("/onlineSelling/pages/raiseMoney/signResult" + taContract.getInvoiceTargetId(), "utf-8");
+        String return_url=  fadadaProperties.getAuthReturnUrl() + "?appid=123&redirect="+ redirectUrl;
+        req.setReturn_url(return_url);
         req.setNotify_url(fadadaProperties.getSignNotify());
         String signUrl = base.invokeExtSign(req);
         return signUrl;
@@ -256,6 +261,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
         queryWrapper.eq("person_id",person.getPersonId());
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
+        oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
+        oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
         return oldContract;
     }
 }

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

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.net.URLEncoder;
 import java.time.LocalDateTime;
 
 /**
@@ -96,7 +97,8 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         String verifyed_way = "1";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
-        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
+        String redirectUrl = URLEncoder.encode("/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId(), "utf-8");
+        String return_url=  fadadaProperties.getAuthReturnUrl() + "?appid=123&redirect="+ redirectUrl;
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
                 page_modify,notify_url,return_url,null,customer_ident_type,

src/main/java/com/huiju/estateagents/service/impl/TaRaiseServiceImpl.java

@@ -186,6 +186,11 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
                 new String[]{} : taRaise.getInviteTel().split("\n");
 
+        QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+        taRaiseInviteQueryWrapper.eq("org_id", orgId);
+        taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
+        taRaiseInviteService.remove(taRaiseInviteQueryWrapper);
+
         Arrays.asList(inviteTelArr).stream().distinct().forEach(record -> {
             TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
             taRaiseInvite.setOrgId(orgId);
@@ -193,22 +198,8 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             taRaiseInvite.setBuildingId(taRaise.getBuildingId());
             taRaiseInvite.setSalesBatchId(taRaise.getSalesBatchId());
             taRaiseInvite.setCreateDate(LocalDateTime.now());
-
-            // 为新增 直接增加，跳过重复添加数据校验
-            if (isAdd) {
-                taRaiseInvite.setInviteTel(record);
-                taRaiseInviteList.add(taRaiseInvite);
-            } else {
-                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-                taRaiseInviteQueryWrapper.eq("org_id", orgId);
-                taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
-                taRaiseInviteQueryWrapper.eq("invite_tel", record);
-                TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-                if (queryResult == null) {
-                    taRaiseInvite.setInviteTel(record);
-                    taRaiseInviteList.add(taRaiseInvite);
-                }
-            }
+            taRaiseInvite.setInviteTel(record);
+            taRaiseInviteList.add(taRaiseInvite);
         });
         return taRaiseInviteService.saveBatch(taRaiseInviteList);
     }

src/main/resources/application-blue.yml

@@ -89,3 +89,4 @@ fadada:
   authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
   authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
   signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  redirectUrl: "https://dev.pawoma.cn/other/redirect.html"

src/main/resources/application-green.yml

@@ -86,6 +86,7 @@ fadada:
   authServeHost: "http://test.api.fabigbig.com:8888/api/"
   serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  authReturnUrl: "http://dev.pawoma.cn/#/eContract/seal/list"
+  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
   authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
   signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  redirectUrl: "https://dev.pawoma.cn/other/redirect.html"

src/main/resources/application-prod-blue.yml

@@ -85,9 +85,13 @@ pay-refund: https://lt.pawoma.cn/api/refund/
 
 #法大大服务器地址
 fadada:
-  appId: ""
-  appSecret: ""
+  appId: "403057"
+  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
-  serveHost: "https://testapi.fadada.com:8443/api/"
+  authServeHost: "http://test.api.fabigbig.com:8888/api/"
+  serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  redirectUrl: "https://dev.pawoma.cn/other/redirect.html"

src/main/resources/application-prod-green.yml

@@ -85,9 +85,13 @@ pay-refund: https://lt.pawoma.cn/api/refund/
 
 #法大大服务器地址
 fadada:
-  appId: ""
-  appSecret: ""
+  appId: "403057"
+  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
-  serveHost: "https://testapi.fadada.com:8443/api/"
+  authServeHost: "http://test.api.fabigbig.com:8888/api/"
+  serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  redirectUrl: "https://dev.pawoma.cn/other/redirect.html"