新需求

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -773,4 +773,6 @@ public class CommConstant {
      * 企业认证人员的身份 2 代理人
      */
     public static final String COMPANY_PRINCIPAL_TYPE_AGENT = "2";
+
+    public static final Integer AUTH_TYPE = 1;
 }

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

@@ -14,4 +14,6 @@ public class FadadaProperties {
     private String version;
     private String serveHost;
     private String companyNotify;
+    private String authReturnUrl;
+    private String authNotifyUrl;
 }

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -9,8 +9,10 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.eContract.entity.TaCompanySeal;
+import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -27,9 +29,13 @@ import com.huiju.estateagents.eContract.entity.TaCompany;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 /**
  * <p>
@@ -54,6 +60,9 @@ public class TaCompanyController extends BaseController {
     @Autowired
     private ITaCompanySealService iTaCompanySealService;
 
+    @Autowired
+    private ITaContractService iTaContractService;
+
     /**
      * 条件查询企业列表
      *
@@ -419,10 +428,45 @@ public class TaCompanyController extends BaseController {
         iTaCompanyService.updateById(taCompany);
     }
 
+    /**
+     * 自动授权签章回调
+     */
+    @RequestMapping(value = "/fadd/autoAuthCompanySeal", method = RequestMethod.POST)
+    public void autoAuthCompanySealNotify(@RequestParam String transactionId,
+                                          @RequestParam Integer contractId,
+                                          @RequestParam String downloadUrl,
+                                          @RequestParam String viewpdfUrl,
+                                          @RequestParam String resultCode,
+                                          @RequestParam String resultDesc,
+                                          HttpServletRequest request){
+        TaContract taContract = new TaContract();
+        taContract.setContractId(contractId);
+        QueryWrapper<TaContract> contractQueryWrapper = new QueryWrapper<>();
+        contractQueryWrapper.eq("contract_download_url", downloadUrl);
+        contractQueryWrapper.eq("contract_view_url", viewpdfUrl);
+        iTaContractService.update(taContract, contractQueryWrapper);
+
+        TaCompany taCompany = new TaCompany();
+        taCompany.setCompanyId(iTaContractService.getById(contractId).getCompanyId());
+        QueryWrapper<TaCompany> taCompanyQueryWrapper = new QueryWrapper<>();
+        taCompanyQueryWrapper.eq("authorize_status", resultCode.equals("3000") ? "1" : "0");
+        taCompanyQueryWrapper.eq("authorize_transaction_id", transactionId);
+        taCompanyQueryWrapper.eq("authorize_contract_id", contractId);
+        taCompanyQueryWrapper.eq("authorize_download_url", downloadUrl);
+        taCompanyQueryWrapper.eq("authorize_view_url", viewpdfUrl);
+        taCompanyQueryWrapper.eq("authorize_description", resultDesc);
+        iTaCompanyService.update(taCompany, taCompanyQueryWrapper);
+
+    }
+
     /**
      * 自动签章授权
      */
-    public ResponseBean autoAuthCompanySeal(Integer companyId, HttpServletRequest request){
-        return null;
+    @RequestMapping(value = "/channel/company/autoAuthCompany/{id}", method = RequestMethod.PUT)
+    public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request));
+        responseBean.addSuccess((Object)res);
+        return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/eContract/service/ITaCompanyService.java

@@ -33,4 +33,6 @@ public interface ITaCompanyService extends IService<TaCompany> {
      * @return
      */
     TaCompany updateCompanyInfoByFdd(Integer id) throws Exception;
+
+    String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception;
 }

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

@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 @Component
 public class TaCompanySealUtil {
@@ -65,4 +67,23 @@ public class TaCompanySealUtil {
 
         return HttpsUtil.doPost(fadadaProperties.getServeHost() + "remove_signature.api", params);
     }
+
+    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId) throws Exception {
+        String timeStamp = HttpsUtil.getTimeStamp();
+        String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(transactionId + timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
+        String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+        StringBuilder stringBuilder = new StringBuilder("http://test.api.fabigbig.com:8888/api/before_authsign.api?");
+        stringBuilder.append("app_id="+fadadaProperties.getAppId()+"&");
+        stringBuilder.append("customer_id="+customerId+"&");
+        stringBuilder.append("timestamp="+timeStamp+"&");
+        stringBuilder.append("v="+fadadaProperties.getVersion()+"&");
+        stringBuilder.append("transaction_id="+transactionId+"&");
+        stringBuilder.append("auth_type="+authType+"&");
+        stringBuilder.append("contract_id="+contractId+"&");
+        stringBuilder.append("msg_digest="+msgDigest+"&");
+        stringBuilder.append("notify_url="+fadadaProperties.getAuthNotifyUrl()+"&");
+        stringBuilder.append("return_url="+fadadaProperties.getAuthReturnUrl() + companyId);
+
+        return stringBuilder.toString();
+    }
 }

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

@@ -13,10 +13,15 @@ import com.fadada.sdk.util.http.HttpsUtil;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.controller.CommonController;
 import com.huiju.estateagents.eContract.entity.TaCompany;
+import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.mapper.TaCompanyMapper;
+import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.eContract.service.ITaCompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.sample.mapper.TaContactMapper;
 import jodd.util.URLDecoder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
@@ -44,6 +49,12 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
     @Autowired
     private TaCompanyMapper taCompanyMapper;
 
+    @Autowired
+    private TaContractMapper taContractMapper;
+
+    @Autowired
+    private TaCompanySealUtil taCompanySealUtil;
+
     /**
      * 在法大大创建一个新的企业信息
      *
@@ -185,6 +196,23 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         return taCompany;
     }
 
+    @Override
+    public String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception {
+        TaCompany taCompany = taCompanyMapper.selectById(companyId);
+        String timeStamp = HttpsUtil.getTimeStamp();
+        String transactionId = "TRAN" + timeStamp;
+        TaContract taContract = new TaContract();
+        taContract.setCompanyId(companyId);
+        taContract.setOrgId(orgId);
+        taContract.setCreateDate(LocalDateTime.now());
+        taContractMapper.insert(taContract);
+
+        Integer contractId = taContract.getContractId();
+        String customerId = taCompany.getFadadaCode();
+        String res = taCompanySealUtil.autoAuthCompanySeal(transactionId, CommConstant.AUTH_TYPE, String.valueOf(contractId), customerId, String.valueOf(companyId));
+        return res;
+    }
+
     /**
      * url解码
      * @param bizContent

src/main/resources/application-blue.yml

@@ -84,4 +84,6 @@ fadada:
   appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"

src/main/resources/application-green.yml

@@ -84,4 +84,6 @@ fadada:
   appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
-  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  companyNotify: "https://dev.pawoma.cn/api/fadd/company"
+  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"