新需求

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

@@ -245,7 +245,7 @@ public class TaCompanyController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taCompany/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/channel/taCompany/{id}", method = RequestMethod.GET)
     public ResponseBean taCompanyGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -418,4 +418,11 @@ public class TaCompanyController extends BaseController {
         taCompany.setStatus(Integer.valueOf(status));
         iTaCompanyService.updateById(taCompany);
     }
+
+    /**
+     * 自动签章授权
+     */
+    public ResponseBean autoAuthCompanySeal(Integer companyId, HttpServletRequest request){
+        return null;
+    }
 }

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

@@ -90,6 +90,7 @@ public class TaCompanySealController extends BaseController {
             QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("company_id", companyId);
             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);
@@ -114,7 +115,7 @@ public class TaCompanySealController extends BaseController {
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
             String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
             JSONObject params = JSONObject.parseObject(result);
-            if (!String.valueOf(CommConstant.STATUS_NORMAL).equals(params.get("code"))){
+            if ((Integer) params.get("code") != 1){
                 responseBean.addError(params.get("msg").toString());
                 return responseBean;
             }
@@ -150,14 +151,15 @@ public class TaCompanySealController extends BaseController {
             iTaCompanyService.getById(taCompanySeal.getCompanyId());
             String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
             JSONObject params = JSONObject.parseObject(res);
-            if (!String.valueOf(params.get("code")).equals(CommConstant.STATUS_NORMAL)){
+            Integer code = (Integer) params.get("code");
+            if (code != 1){
                 responseBean.addError(params.getString("msg"));
                 return responseBean;
             }
 
             TaCompanySeal delInfo = new TaCompanySeal();
-            taCompanySeal.setSealId(id);
-            taCompanySeal.setStatus(CommConstant.STATUS_DELETE);
+            delInfo.setSealId(id);
+            delInfo.setStatus(CommConstant.STATUS_DELETE);
             if(iTaCompanySealService.updateById(delInfo)){
                 responseBean.addSuccess("success");
             }else {
@@ -183,7 +185,8 @@ public class TaCompanySealController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
+            TaCompanySeal sealInfo = iTaCompanySealService.getById(id);
+            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg());
             JSONObject params = JSONObject.parseObject(res);
             Integer code = (Integer) params.get("code");
             if (code != 1){

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

@@ -22,17 +22,18 @@ public class TaCompanySealUtil {
         return base.invokeaddSignature(customerId, base64Url);
     }
 
-    public String replaceSignature(String customerId, String imgUrl){
+    public String replaceSignature(String customerId, String signatureId, String imgUrl){
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         ArrayList params = new ArrayList();
 
         try {
             String timeStamp = HttpsUtil.getTimeStamp();
-            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + base64Url));
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + signatureId + base64Url));
             String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
             params.add(new BasicNameValuePair("customer_id", customerId));
             params.add(new BasicNameValuePair("signature_img_base64", base64Url));
             params.add(new BasicNameValuePair("app_id", fadadaProperties.getAppId()));
+            params.add(new BasicNameValuePair("signature_id", signatureId));
             params.add(new BasicNameValuePair("timestamp", timeStamp));
             params.add(new BasicNameValuePair("v", fadadaProperties.getVersion()));
             params.add(new BasicNameValuePair("msg_digest", msgDigest));