Browse Source

新需求

魏超 5 years ago
parent
commit
c8ef132e7f

+ 7
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java View File

794
      * 企业实名状态
794
      * 企业实名状态
795
      */
795
      */
796
     public static final Integer REAL_NAME_STATUS = 4;
796
     public static final Integer REAL_NAME_STATUS = 4;
797
+
798
+    /**
799
+     * 已授权自动签章
800
+     */
801
+    public static final String AUTO_AUTH_STATUS = "3000";
802
+
803
+    public static final String  AUTH_SUCCESS_DESC = "签章成功";
797
 }
804
 }

+ 14
- 11
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java View File

131
             for (TaCompany taCompany : taCompanyList){
131
             for (TaCompany taCompany : taCompanyList){
132
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
132
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
133
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
133
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
134
+                sealQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
134
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
135
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
135
             }
136
             }
136
             responseBean.addSuccess(result);
137
             responseBean.addSuccess(result);
174
             for (TaCompany taCompany : taCompanyList){
175
             for (TaCompany taCompany : taCompanyList){
175
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
176
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
176
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
177
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
178
+                sealQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
177
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
179
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
178
             }
180
             }
179
             responseBean.addSuccess(result);
181
             responseBean.addSuccess(result);
468
         taContract.setStatus(CommConstant.STATUS_NORMAL);
470
         taContract.setStatus(CommConstant.STATUS_NORMAL);
469
         iTaContractService.updateById(taContract);
471
         iTaContractService.updateById(taContract);
470
 
472
 
471
-        TaCompany taCompany = new TaCompany();
472
-        taCompany.setCompanyId(iTaContractService.getById(contractId).getCompanyId());
473
-        taCompany.setAuthorizeStatus(resultCode);
474
-        taCompany.setAuthorizeTransactionId(transactionId);
475
-        taCompany.setAuthorizeContractId(String.valueOf(contractId));
476
-        taCompany.setAuthorizeDownloadUrl(downloadUrl);
477
-        taCompany.setAuthorizeViewUrl(viewpdfUrl);
478
-        taCompany.setAuthorizeDescription(resultDesc);
479
-        taCompany.setAuthorizeType(CommConstant.ONLINEAUTH);
480
-        iTaCompanyService.updateById(taCompany);
481
-
473
+        if (CommConstant.AUTO_AUTH_STATUS.equals(resultCode) && CommConstant.AUTH_SUCCESS_DESC.equals(resultDesc)){
474
+            TaCompany taCompany = new TaCompany();
475
+            taCompany.setCompanyId(iTaContractService.getById(contractId).getCompanyId());
476
+            taCompany.setAuthorizeStatus(resultCode);
477
+            taCompany.setAuthorizeTransactionId(transactionId);
478
+            taCompany.setAuthorizeContractId(String.valueOf(contractId));
479
+            taCompany.setAuthorizeDownloadUrl(downloadUrl);
480
+            taCompany.setAuthorizeViewUrl(viewpdfUrl);
481
+            taCompany.setAuthorizeDescription(resultDesc);
482
+            taCompany.setAuthorizeType(CommConstant.ONLINEAUTH);
483
+            iTaCompanyService.updateById(taCompany);
484
+        }
482
     }
485
     }
483
 
486
 
484
     /**
487
     /**

+ 1
- 0
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanySealController.java View File

59
 		    IPage<TaCompanySeal> pg = new Page<>(pageNum, pageSize);
59
 		    IPage<TaCompanySeal> pg = new Page<>(pageNum, pageSize);
60
             QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
60
             QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
61
             queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
61
             queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
62
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
62
             queryWrapper.orderByDesc("create_date");
63
             queryWrapper.orderByDesc("create_date");
63
 
64
 
64
             IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);
65
             IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);

+ 1
- 1
src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanySealUtil.java View File

72
         String timeStamp = HttpsUtil.getTimeStamp();
72
         String timeStamp = HttpsUtil.getTimeStamp();
73
         String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(transactionId + timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
73
         String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(transactionId + timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
74
         String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
74
         String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
75
-        StringBuilder stringBuilder = new StringBuilder(fadadaProperties.getServeHost() + "?");
75
+        StringBuilder stringBuilder = new StringBuilder(fadadaProperties.getServeHost() + "before_authsign.api?");
76
         stringBuilder.append("app_id="+fadadaProperties.getAppId()+"&");
76
         stringBuilder.append("app_id="+fadadaProperties.getAppId()+"&");
77
         stringBuilder.append("customer_id="+customerId+"&");
77
         stringBuilder.append("customer_id="+customerId+"&");
78
         stringBuilder.append("timestamp="+timeStamp+"&");
78
         stringBuilder.append("timestamp="+timeStamp+"&");