Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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/controller/TaContractController.java

@@ -1,10 +1,12 @@
 package com.huiju.estateagents.eContract.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fadada.sdk.client.FddClientBase;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 import com.huiju.estateagents.common.CommonUtils;
+import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.entity.TaContractUser;
 import com.huiju.estateagents.eContract.service.ITaContractService;
@@ -55,6 +57,9 @@ public class TaContractController extends BaseController {
     @Autowired
     public ITaPersonService taPersonService;
 
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
     /**
      * 条件查询合同列表 -- admin端
      *
@@ -209,7 +214,11 @@ public class TaContractController extends BaseController {
                 taContract.setArchivesTime(LocalDateTime.now());
             }
             if (iTaContractService.updateById(taContract)) {
-                responseBean.addSuccess(taContract);
+                FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+                String contract_id = taContract.getContractId().toString();
+                String result = base.invokeContractFilling(contract_id);
+                logger.info("合同归档结果{}",result);
+                responseBean.addSuccess(iTaContractService.getById(taContract.getContractId()));
             } else {
                 responseBean.addError("fail");
             }

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

@@ -117,7 +117,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
          * 1：对公打款；
          * 2：纸质审核',
          */
-        String verifyed_way = "1";
+        String verifyed_way = "0";
         //是否允许客户页面修改1允许
         String page_modify = "1";
         String m_verified_way = "1";
@@ -178,8 +178,14 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
                 taCompany.setStatus(companyJson.getInteger("status"));
                 taCompany.setReason(companyJson.getString("auditFailReason"));
 
-                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.s");
-                taCompany.setVerifyTime(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(companyJson.getString("auditorTime"),df));
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                String auditorTime = companyJson.getString("auditorTime");
+                if (!StringUtils.isEmpty(auditorTime)){
+                    int index = auditorTime.lastIndexOf(".");
+                    String substringTime = auditorTime.substring(0, index);
+                    taCompany.setVerifyTime(LocalDateTime.parse(substringTime,df));
+                }
+                taCompany.setVerifyTime(null);
             }
 
             //银行卡信息

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,12 +168,15 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         }
 
         //反更新合同地址
-        taContract.setContractDownloadUrl(autoSignResultJson.getString("download_url"));
-        taContract.setContractViewUrl(autoSignResultJson.getString("viewpdf_url"));
-        taContractMapper.updateById(taContract);
-
-        //企业名称
+        taContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
+        taContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
+        taContract.setContractName(taContractBusiness.getContractTemplateName());
+        //合同详情
         taContract.setCompanyName(taContractBusiness.getCompanyName());
+        taContract.setSignatoryName(taContractBusiness.getCompanyName());
+        taContract.setSignatoryTime(LocalDateTime.now());
+        taContract.setArchives(false);
+        taContractMapper.updateById(taContract);
         return taContract;
     }
 
@@ -178,12 +184,15 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
      * 替换法大大服务器地址
      * @return
      */
-    private String getFddServerHost(String miniappId,String subUrl) {
+    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.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddDownloadHost()) ? subUrl : taMiniapp.getFddDownloadHost() + subUrl.substring(threeIndex);
         return newUrl;
     }
 
@@ -221,10 +230,21 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setContract_id(taContract.getContractId().toString());
         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?id=" + taContract.getInvoiceTargetId(), "utf-8");
+        String return_url=  fadadaProperties.getRedirectUrl() + "?appid=123&redirect="+ redirectUrl;
+        req.setReturn_url(return_url);
         req.setNotify_url(fadadaProperties.getSignNotify());
-        String signUrl = base.invokeExtSign(req);
+        String signUrl = base.invokeExtSignDIY(req,"1","0");
+
+        //更新乙方数据
+        TaRaiseRecord taRaiseRecord = taRaiseRecordMapper.selectById(taContract.getInvoiceTargetId());
+        taContract.setCustomerName(taRaiseRecord.getUserName());
+        taContract.setCustomerTel(taRaiseRecord.getTel());
+        taContract.setCustomerIdcard(taRaiseRecord.getIdcard());
+        taContract.setCustomerTime(LocalDateTime.now());
+        taContractMapper.updateById(taContract);
         return signUrl;
     }
 
@@ -256,6 +276,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;
 
 /**
@@ -87,7 +88,6 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         newContractUser.setAuthStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
         newContractUser.setCreateDate(LocalDateTime.now());
         newContractUser.setOrgId(person.getOrgId());
-        newContractUser.setOrgId(CommConstant.STATUS_UNACCALIMED);
 
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
         GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
@@ -96,7 +96,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"