From 3d8eaf1bd86751d9df305650091c784071653dd7 Mon Sep 17 00:00:00 2001
From: 邓实川 <544939826@qq.com>
Date: Tue, 19 May 2020 18:11:31 +0800
Subject: [PATCH] 企业中心接口，电子合同优化
---
src/main/java/cn/timer/api/controller/dzht/DzhtController2.java | 20 ++++++++++++++++++--
src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java | 8 +++++---
src/main/resources/application-dev.yml | 2 ++
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java b/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
index 72b4159..4de3694 100644
--- a/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
+++ b/src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
@@ -9,6 +9,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -73,6 +74,12 @@ import io.swagger.annotations.ApiOperation;
@RequestMapping(value = "/dzhtApi", produces = { "application/json" })
public class DzhtController2 {
+ @Value("${config-8timer.esign.callbackUrl}")
+ public String callbackUrl; // 回调地址
+
+ @Value("${config-8timer.esign.redirectUrl}")
+ public String redirectUrl; // 重定向地址
+
private String getID(Integer empNum) {
QueryWrapper<DzhtAssoGrzc> queryWrapper = new QueryWrapper<DzhtAssoGrzc>();
queryWrapper.eq("emp_num", empNum);
@@ -434,9 +441,18 @@ public class DzhtController2 {
// SignFlowStart sfs = new SignFlowStart(null, "测试签署流程开启", null, null, null,
// null, null, cfgInfo);
- String a = lc.getNoticeDeveloperUrl();
+ String a = null;
+ if (callbackUrl != null) {
+ a = callbackUrl;
+ }
+// lc.getNoticeDeveloperUrl(); // 回调地址
+ String c = null;
+ if (redirectUrl != null) {
+ c = redirectUrl;
+ }
+// lc.getRedirectUrl(); // 签署完成回调地址
+
String b = lc.getNoticeType();
- String c = lc.getRedirectUrl();
String d = lc.getSignPlatform();
ConfigInfo cfgInfo = new ConfigInfo(a, b, c, d);
diff --git a/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java b/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
index bdf6d8c..b8cfaee 100644
--- a/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
+++ b/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
@@ -305,9 +305,11 @@ public class QyzxBusinessController {
@GetMapping(value = "/queryContractUseRecord")
@ApiOperation(value = "查询电子合同套餐使用记录", httpMethod = "GET", notes = "接口发布说明")
- public Result<Object> queryContractUseRecord(@CurrentUser UserBean userBean) {
- // TODO
- return null;
+ public Result<Object> queryContractUseRecord(@CurrentUser UserBean userBean, String orderNo) {
+ return ResultUtil.data(QyzxUseRecord.builder().build()
+ .selectList(new LambdaQueryWrapper<QyzxUseRecord>().eq(QyzxUseRecord::getOrgCode, userBean.getOrgCode())
+ .eq(QyzxUseRecord::getPmid, 2).eq(orderNo != null, QyzxUseRecord::getOrderNo, orderNo)),
+ "查询成功");
}
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e2aa4ec..13586f0 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -167,6 +167,8 @@ config-8timer:
expirationTime: 3153600000000L
expirationTime_pri: 600000L
esign: # e签宝
+ callbackUrl: 'http://192.168.4.13/callback/esign/dev'
+ redirectUrl: 'http://test-8timer-pc.youlingrc.com/#/ElecCon/index'
# host: https://smlopenapi.esign.cn
# test: https://smlopenapi.esign.cn
# pro: https://openapi.esign.cn
--
libgit2 0.26.0