新需求

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

@@ -794,4 +794,11 @@ public class CommConstant {
      * 企业实名状态
      */
     public static final Integer REAL_NAME_STATUS = 4;
+
+    /**
+     * 已授权自动签章
+     */
+    public static final String AUTO_AUTH_STATUS = "3000";
+
+    public static final String  AUTH_SUCCESS_DESC = "签章成功";
 }

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

@@ -131,6 +131,7 @@ public class TaCompanyController extends BaseController {
             for (TaCompany taCompany : taCompanyList){
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+                sealQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
             }
             responseBean.addSuccess(result);
@@ -174,6 +175,7 @@ public class TaCompanyController extends BaseController {
             for (TaCompany taCompany : taCompanyList){
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+                sealQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
             }
             responseBean.addSuccess(result);
@@ -468,17 +470,18 @@ public class TaCompanyController extends BaseController {
         taContract.setStatus(CommConstant.STATUS_NORMAL);
         iTaContractService.updateById(taContract);
 
-        TaCompany taCompany = new TaCompany();
-        taCompany.setCompanyId(iTaContractService.getById(contractId).getCompanyId());
-        taCompany.setAuthorizeStatus(resultCode);
-        taCompany.setAuthorizeTransactionId(transactionId);
-        taCompany.setAuthorizeContractId(String.valueOf(contractId));
-        taCompany.setAuthorizeDownloadUrl(downloadUrl);
-        taCompany.setAuthorizeViewUrl(viewpdfUrl);
-        taCompany.setAuthorizeDescription(resultDesc);
-        taCompany.setAuthorizeType(CommConstant.ONLINEAUTH);
-        iTaCompanyService.updateById(taCompany);
-
+        if (CommConstant.AUTO_AUTH_STATUS.equals(resultCode) && CommConstant.AUTH_SUCCESS_DESC.equals(resultDesc)){
+            TaCompany taCompany = new TaCompany();
+            taCompany.setCompanyId(iTaContractService.getById(contractId).getCompanyId());
+            taCompany.setAuthorizeStatus(resultCode);
+            taCompany.setAuthorizeTransactionId(transactionId);
+            taCompany.setAuthorizeContractId(String.valueOf(contractId));
+            taCompany.setAuthorizeDownloadUrl(downloadUrl);
+            taCompany.setAuthorizeViewUrl(viewpdfUrl);
+            taCompany.setAuthorizeDescription(resultDesc);
+            taCompany.setAuthorizeType(CommConstant.ONLINEAUTH);
+            iTaCompanyService.updateById(taCompany);
+        }
     }
 
     /**

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

@@ -59,6 +59,7 @@ public class TaCompanySealController extends BaseController {
 		    IPage<TaCompanySeal> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);

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

@@ -72,7 +72,7 @@ public class TaCompanySealUtil {
         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(fadadaProperties.getServeHost() + "?");
+        StringBuilder stringBuilder = new StringBuilder(fadadaProperties.getServeHost() + "before_authsign.api?");
         stringBuilder.append("app_id="+fadadaProperties.getAppId()+"&");
         stringBuilder.append("customer_id="+customerId+"&");
         stringBuilder.append("timestamp="+timeStamp+"&");