新需求

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

@@ -69,6 +69,7 @@ public class TaCompanyController extends BaseController {
 
     public ITaContractUserService iTaContractUserService;
 
+
     /**
      * 条件查询企业列表
      *
@@ -464,6 +465,7 @@ public class TaCompanyController extends BaseController {
         taContract.setContractId(contractId);
         taContract.setContractDownloadUrl(downloadUrl);
         taContract.setContractViewUrl(viewpdfUrl);
+        taContract.setStatus(CommConstant.STATUS_NORMAL);
         iTaContractService.updateById(taContract);
 
         TaCompany taCompany = new TaCompany();
@@ -475,13 +477,6 @@ public class TaCompanyController extends BaseController {
         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);
 
     }
@@ -522,4 +517,23 @@ public class TaCompanyController extends BaseController {
         taContract.setContractViewUrl(viewpdf_url);
         iTaContractService.updateById(taContract);
     }
+
+    /**
+     * 查询授权状态接口
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/channel/company/getAuthStatus/{id}", method = RequestMethod.GET)
+    public ResponseBean getAuthStatus(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        String res = iTaCompanyService.getAuthStatus(id);
+        JSONObject result = JSONObject.parseObject(res);
+
+        if ((Integer) result.get("code") != 1){
+            responseBean.addError(result.getString("msg"));
+            return responseBean;
+        }
+        responseBean.addSuccess(result.get("data"));
+        return responseBean;
+    }
 }

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

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

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

@@ -86,4 +86,24 @@ public class TaCompanySealUtil {
 
         return stringBuilder.toString();
     }
+
+    public String getAuthStatus(String customerId){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("customer_id", customerId));
+            params.add(new BasicNameValuePair("app_id", fadadaProperties.getAppId()));
+            params.add(new BasicNameValuePair("timestamp", timeStamp));
+            params.add(new BasicNameValuePair("v", fadadaProperties.getVersion()));
+            params.add(new BasicNameValuePair("msg_digest", msgDigest));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "get_auth_status.api", params);
+    }
 }

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

@@ -206,7 +206,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         taContract.setOrgId(orgId);
         taContract.setCreateDate(LocalDateTime.now());
         taContract.setTargetType(CommConstant.AUTH);
-        taContract.setStatus(CommConstant.STATUS_NORMAL);
+        taContract.setStatus(CommConstant.STATUS_UNACCALIMED);
         taContract.setOrgId(orgId);
         taContractMapper.insert(taContract);
 
@@ -221,6 +221,12 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         return taCompanyMapper.getCompanyAndContractInfo(companyId);
     }
 
+    @Override
+    public String getAuthStatus(Integer companyId) {
+        TaCompany taCompany = taCompanyMapper.selectById(companyId);
+        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode());
+    }
+
     /**
      * url解码
      * @param bizContent

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

@@ -4,7 +4,7 @@
 
     <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'
+        left join ta_contract a on t.company_id = a.company_id and a.target_type = 'auth' and a.status = 1
         where t.company_id = #{companyId}
     </select>