新需求

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

@@ -775,5 +775,18 @@ public class CommConstant {
      */
     public static final String COMPANY_PRINCIPAL_TYPE_AGENT = "2";
 
+    /**
+     * 授权类型 1自动签
+     */
     public static final Integer AUTH_TYPE = 1;
+
+    /**
+     * 合同关联业务类型
+     */
+    public static final String AUTH = "auth";
+
+    /**
+     * 接口线上授权
+     */
+    public static final String ONLINEAUTH = "onLine";
 }

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

@@ -264,7 +264,8 @@ public class TaCompanyController extends BaseController {
     public ResponseBean taCompanyGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaCompanyService.getById(id));
+            TaCompany taCompany = iTaCompanyService.getCompanyAndContractInfo(id);
+            responseBean.addSuccess(taCompany);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taCompanyDelete -=- {}", e.toString());
@@ -461,21 +462,27 @@ public class TaCompanyController extends BaseController {
                                           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);
+        taContract.setContractDownloadUrl(downloadUrl);
+        taContract.setContractViewUrl(viewpdfUrl);
+        iTaContractService.updateById(taContract);
 
         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);
+        taCompany.setAuthorizeStatus(resultCode);
+        taCompany.setAuthorizeTransactionId(transactionId);
+        taCompany.setAuthorizeContractId(String.valueOf(contractId));
+        taCompany.setAuthorizeDownloadUrl(downloadUrl);
+        taCompany.setAuthorizeViewUrl(viewpdfUrl);
+        taCompany.setAuthorizeDescription(resultDesc);
+        taCompany.setAuthorizeType(CommConstant.ONLINEAUTH);
+//        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.updateById(taCompany);
 
     }
 
@@ -486,6 +493,10 @@ public class TaCompanyController extends BaseController {
     public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request, HttpServletResponse response) throws Exception {
         ResponseBean responseBean = new ResponseBean();
         String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request));
+        TaCompany taCompany = new TaCompany();
+        taCompany.setCompanyId(id);
+        taCompany.setAuthorizeAddress(res);
+        iTaCompanyService.updateById(taCompany);
         responseBean.addSuccess((Object)res);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/eContract/entity/TaCompany.java

@@ -167,4 +167,7 @@ public class TaCompany implements Serializable {
 
     @TableField(exist = false)
     private Integer sealNum;
+
+    @TableField(exist = false)
+    private String contractId;
 }

src/main/java/com/huiju/estateagents/eContract/mapper/TaCompanyMapper.java

@@ -18,5 +18,5 @@ import org.springframework.stereotype.Component;
 @Mapper
 @Component
 public interface TaCompanyMapper extends BaseMapper<TaCompany> {
-
+    TaCompany getCompanyAndContractInfo(@Param("companyId") Integer companyId);
 }

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

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

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

@@ -205,6 +205,9 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         taContract.setCompanyId(companyId);
         taContract.setOrgId(orgId);
         taContract.setCreateDate(LocalDateTime.now());
+        taContract.setTargetType(CommConstant.AUTH);
+        taContract.setStatus(CommConstant.STATUS_NORMAL);
+        taContract.setOrgId(orgId);
         taContractMapper.insert(taContract);
 
         Integer contractId = taContract.getContractId();
@@ -213,6 +216,11 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         return res;
     }
 
+    @Override
+    public TaCompany getCompanyAndContractInfo(Integer companyId) {
+        return taCompanyMapper.getCompanyAndContractInfo(companyId);
+    }
+
     /**
      * url解码
      * @param bizContent

src/main/resources/mapper/eContract/TaCompanyMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.eContract.mapper.TaCompanyMapper">
 
+    <select id="getCompanyAndContractInfo" resultType="com.huiju.estateagents.eContract.entity.TaCompany">
+        select *,a.contract_id From ta_company t
+        left join ta_contract a on t.company_id = a.company_id and a.target_type = 'auth'
+        where t.company_id = #{companyId}
+    </select>
+
 </mapper>