新增推送e签宝状态回写

mjava-hengyilong/src/main/java/com/malk/hengyilong/service/impl/EqbHylServiceImpl.java

@@ -42,8 +42,10 @@ public class EqbHylServiceImpl implements EqbHylService {
     private String appKey;
     @Value("${eqb.host}")
     private String host;
-    @Value("${eqb.orgId}")
-    private String orgId;
+    @Value("${eqb.orgIdSh}")
+    private String orgIdSh;
+    @Value("${eqb.orgIdHyl}")
+    private String orgIdHyl;
     @Value("${eqb.psnId}")
     private String psnId;
     @Value("${server.host}")
@@ -124,7 +126,11 @@ public class EqbHylServiceImpl implements EqbHylService {
             signer.put("signConfig",UtilMap.map("signOrder",1));
             Map orgSignerInfo = new HashMap();
             //企业/机构账号ID
-            orgSignerInfo.put("orgId",orgId);
+            if ("恒益隆贸易(上海)有限公司".equals(UtilMap.getString(formData, "selectField_mjmlcp4y"))) {
+                orgSignerInfo.put("orgId",orgIdHyl);
+            }else  if ("上海绍贺贸易有限公司".equals(UtilMap.getString(formData, "selectField_mjmlcp4y"))){
+                orgSignerInfo.put("orgId",orgIdSh);
+            }
             //经办人信息
             Map transactorInfo = new HashMap();
             transactorInfo.put("psnId",psnId);//经办人id
@@ -154,7 +160,7 @@ public class EqbHylServiceImpl implements EqbHylService {
                 //经办人信息
                 Map otherTransactorInfo = new HashMap();
                 otherTransactorInfo.put("psnAccount",UtilMap.getString(formData, "textField_mqejx60y"));//经办人账号标识，手机号或邮箱，必须配合psnName（经办人姓名）传入
-                otherTransactorInfo.put("psnInfo",UtilMap.map("psnName",UtilMap.getString(formData, "textField_ml0iaa3i")));//经办人姓名
+                otherTransactorInfo.put("psnInfo",UtilMap.map("psnName",UtilMap.getString(formData, "textField_mqj4ypzj")));//经办人姓名
                 otherOrgSignerInfo.put("transactorInfo",otherTransactorInfo);
                 otherSigner.put("orgSignerInfo",otherOrgSignerInfo);
 
@@ -181,12 +187,16 @@ public class EqbHylServiceImpl implements EqbHylService {
             String shortUrl = UtilMap.getString(signLink, "shortUrl");
             ydClient.operateData(YDParam.builder()
                     .formInstanceId(formInstance)
-                    .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("textField_moh0gw9l",shortUrl)))
+                    .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("textField_moh0gw9l, textareaField_mqj4ypzk",shortUrl,"成功推送e签宝")))
                     .build(), YDConf.FORM_OPERATION.update);
             return McR.success(shortUrl);
 
 //            return McR.success(fileId);
         } catch (Exception e) {
+            ydClient.operateData(YDParam.builder()
+                    .formInstanceId(formInstance)
+                    .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("textareaField_mqj4ypzk",e.getMessage())))
+                    .build(), YDConf.FORM_OPERATION.update);
             return McR.errorParam(e.getMessage());
         }
     }

mjava-hengyilong/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ logging:
   config: classpath:logback-spring.xml
   path: /home/server/hengyilong/log/
   level:
-    com.malk.*: debug
+    com.malk.*: info
 
 
 mybatis-plus:
@@ -41,7 +41,8 @@ eqb:
   host: https://smlopenapi.esign.cn
   appKey: ae304291c5702141ea7c98bcdaae6a17
   appId: 7439110455
-  orgId: 04dd6dbad3d8456b9e551fc329c516d7
+  orgIdSh: fed0042d62a848de9052de45b31b83ea
+  orgIdHyl: abd5bdbc7fec4a95a10fdd77108118b4
   psnId: c086503ade9a4a3aba83f69c07b14178
   bjd_docTemplateId: ee7bdf1404154c0686ed38a7cf65a7ff
   ht_docTemplateId: 0064564bea704fc587a249680064b98c

mjava-hengyilong/src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ logging:
   config: classpath:logback-spring.xml
   path: /home/server/hengyilong/log/
   level:
-    com.malk.*: debug
+    com.malk.*: info
 
 mybatis-plus:
   configuration:
@@ -40,7 +40,8 @@ eqb:
   host: https://openapi.esign.cn
   appKey: 7e464621b3aa4a0e39a6557009b38214
   appId: 5112061694
-  orgId: fed0042d62a848de9052de45b31b83ea
+  orgIdSh: fed0042d62a848de9052de45b31b83ea
+  orgIdHyl: abd5bdbc7fec4a95a10fdd77108118b4
   psnId: b15ea57b95bb4b6883b5cc759e1c342d # 合同章负责人-覃李勇
   bjd_docTemplateId: 1d2f50e82f514144b72313b1dddcb552
   ht_docTemplateId: 0064564bea704fc587a249680064b98c

mjava-hengyilong/src/test/java/com/malk/hengyilong/mjavahengyilong/MjavaHengyilongApplicationTests.java

@@ -32,7 +32,7 @@ class MjavaHengyilongApplicationTests {
 
     @Test
     void quotationToEqb(){
-//        McR mcR = eqbHylService.quotationToEqb(UtilMap.map("formInstance, type","14033dcc-0339-4892-aafc-a348d91da635, contract"));
+//        McR mcR = eqbHylService.quotationToEqb(UtilMap.map("formInstance, type","a4edd8d8-a742-4a95-80fa-bd57779c9520, contract"));
     }
 
     @Test

mjava-hengyilong/src/test/java/com/malk/hengyilong/mjavahengyilong/ToEqbTest.java

@@ -93,7 +93,7 @@ public class ToEqbTest {
 //        //6.2开发者使用【查询文件上传状态】接口获取填充后文件链接，通过此链接可查看填充后文件效果
 //        253a487cfc1c464190006e7b8532479f
 //b97b73a033a341129bf788281a064f43
-        getFileInfo(appId,appKey,host,"cc1106f83a1a40b99e450eb10863bb9d");
+//        getFileInfo(appId,appKey,host,"cc1106f83a1a40b99e450eb10863bb9d");
 
 
         //基于文件发起签署
@@ -106,7 +106,7 @@ public class ToEqbTest {
 //        downloadFile(appId,appKey,host,"8ef134f1e4e648acba2aa0cbe822bd55");
 
         //查询机构认证信息
-//        getOrgInfo(appId,appKey,host,"上海绍贺贸易有限公司 ");
+        getOrgInfo(appId,appKey,host,"恒益隆贸易（上海）有限公司  ");
 
 //        getOrgUserInfo(appId,appKey,host,"fed0042d62a848de9052de45b31b83ea");