Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-support-rlwx
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
rl
hls-support-rlwx
Commits
18c9ffa8
Commit
18c9ffa8
authored
Oct 13, 2020
by
5359
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
正式环境参数修改
parent
ce84e2ac
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
161 additions
and
87 deletions
+161
-87
SignHclcController.java
...om/hand/app/esignHclc/controllers/SignHclcController.java
+85
-39
IOrganSignInfoHclcService.java
...hand/app/esignHclc/service/IOrganSignInfoHclcService.java
+3
-0
OrganSignInfoHclcServiceImpl.java
.../esignHclc/service/impl/OrganSignInfoHclcServiceImpl.java
+2
-1
SignInfoHclcServiceImpl.java
...d/app/esignHclc/service/impl/SignInfoHclcServiceImpl.java
+30
-9
SignHclcUtils.java
...main/java/com/hand/app/esignHclc/utils/SignHclcUtils.java
+1
-1
SignInfoHclcMapper.xml
...ain/resources/app/esignHclc/mapper/SignInfoHclcMapper.xml
+4
-1
config.properties
core/src/main/resources/config.properties
+9
-9
config.properties
core/src/main/resources/profiles/dev/config.properties
+9
-9
config.properties
core/src/main/resources/profiles/sit/config.properties
+9
-9
config.properties
core/src/main/resources/profiles/uat/config.properties
+9
-9
No files found.
core/src/main/java/com/hand/app/esignHclc/controllers/SignHclcController.java
View file @
18c9ffa8
...
@@ -231,8 +231,19 @@ public class SignHclcController extends BaseController {
...
@@ -231,8 +231,19 @@ public class SignHclcController extends BaseController {
BeanUtils
.
copyProperties
(
dto
,
signUserInfoHclcHis
);
BeanUtils
.
copyProperties
(
dto
,
signUserInfoHclcHis
);
signUserInfoHclcHisService
.
insert
(
iRequest
,
signUserInfoHclcHis
);
signUserInfoHclcHisService
.
insert
(
iRequest
,
signUserInfoHclcHis
);
//重置结构用户信息为空
dto
.
setAccountId
(
""
);
dto
.
setAuthAccountId
(
""
);
dto
.
setOrgAuthId
(
null
);
dto
.
setAuthFlag
(
"N"
);
dto
.
setCreateCode
(
""
);
dto
.
setCreateMessage
(
""
);
dto
.
setManagerAuthFlag
(
"N"
);
//注销经办人用户
//注销经办人用户
map
=
signHclcService
.
deletePersonAccount
(
iRequest
,
dto
);
SignUserInfoHclc
agentSignInfo
=
new
SignUserInfoHclc
();
agentSignInfo
.
setOpenId
(
dto
.
getOpenId
());
map
=
signHclcService
.
deletePersonAccount
(
iRequest
,
agentSignInfo
);
if
(
"0"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"40051667"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"000003"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
()))
{
if
(
"0"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"40051667"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"000003"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
()))
{
// if ("N".equalsIgnoreCase(dto.getIsManagerFlag())) {
// if ("N".equalsIgnoreCase(dto.getIsManagerFlag())) {
// map = organSignHclcService.unBindOrgansAgent(dto);
// map = organSignHclcService.unBindOrgansAgent(dto);
...
@@ -241,34 +252,37 @@ public class SignHclcController extends BaseController {
...
@@ -241,34 +252,37 @@ public class SignHclcController extends BaseController {
//复制用户信息到历史表
//复制用户信息到历史表
//初始化经办人人脸识别信息
//初始化经办人人脸识别信息
SignUserInfoHclc
agentSignInfo
=
new
SignUserInfoHclc
();
SignUserInfoHclc
agentSignInfo
2
=
new
SignUserInfoHclc
();
agentSignInfo
.
setOpenId
(
dto
.
getOpenId
()
+
"personHclc"
);
agentSignInfo
2
.
setOpenId
(
dto
.
getOpenId
()
+
"personHclc"
);
agentSignInfo
=
signHclcService
.
selectByPrimaryKey
(
iRequest
,
agentSignInfo
);
agentSignInfo
2
=
signHclcService
.
selectByPrimaryKey
(
iRequest
,
agentSignInfo2
);
SignUserInfoHclcHis
agentUserInfoHclcHis
=
new
SignUserInfoHclcHis
();
SignUserInfoHclcHis
agentUserInfoHclcHis
=
new
SignUserInfoHclcHis
();
BeanUtils
.
copyProperties
(
agentSignInfo
,
agentUserInfoHclcHis
);
BeanUtils
.
copyProperties
(
agentSignInfo
2
,
agentUserInfoHclcHis
);
signUserInfoHclcHisService
.
insert
(
iRequest
,
agentUserInfoHclcHis
);
signUserInfoHclcHisService
.
insert
(
iRequest
,
agentUserInfoHclcHis
);
signHclcService
.
deleteByPrimaryKey
(
agentSignInfo
);
signHclcService
.
deleteByPrimaryKey
(
agentSignInfo
2
);
map
.
put
(
"code"
,
"0"
);
map
.
put
(
"code"
,
"0"
);
}
else
{
}
else
{
//重置结构用户信息为空
dto
.
setAccountId
(
""
);
dto
.
setAuthAccountId
(
""
);
dto
.
setOrgAuthId
(
null
);
dto
.
setAuthFlag
(
"N"
);
dto
.
setCreateCode
(
""
);
dto
.
setCreateMessage
(
""
);
dto
.
setManagerAuthFlag
(
"N"
);
signHclcService
.
updateByPrimaryKey
(
iRequest
,
dto
);
signHclcService
.
updateByPrimaryKey
(
iRequest
,
dto
);
}
}
//机构已注销,accountaId为空的情况
//机构已注销,accountaId为空的情况
}
else
if
(
"000012"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
()))
{
}
else
if
(
"000012"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
()))
{
//注销经办人用户
//注销经办人用户
map
=
signHclcService
.
deletePersonAccount
(
iRequest
,
dto
);
map
=
signHclcService
.
deletePersonAccount
(
iRequest
,
dto
);
if
(
"0"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"40051667"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"000003"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
()))
{
if
(
"0"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"40051667"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
())
||
"000003"
.
equalsIgnoreCase
(
map
.
get
(
"code"
).
toString
()))
{
signHclcService
.
deleteByPrimaryKey
(
dto
);
signHclcService
.
deleteByPrimaryKey
(
dto
);
//复制用户信息到历史表
//初始化经办人人脸识别信息
SignUserInfoHclc
agentSignInfo
=
new
SignUserInfoHclc
();
agentSignInfo
.
setOpenId
(
dto
.
getOpenId
()
+
"personHclc"
);
agentSignInfo
=
signHclcService
.
selectByPrimaryKey
(
iRequest
,
agentSignInfo
);
SignUserInfoHclcHis
agentUserInfoHclcHis
=
new
SignUserInfoHclcHis
();
BeanUtils
.
copyProperties
(
agentSignInfo
,
agentUserInfoHclcHis
);
signUserInfoHclcHisService
.
insert
(
iRequest
,
agentUserInfoHclcHis
);
signHclcService
.
deleteByPrimaryKey
(
agentSignInfo
);
map
.
put
(
"code"
,
"0"
);
map
.
put
(
"code"
,
"0"
);
}
}
}
}
...
@@ -409,6 +423,25 @@ public class SignHclcController extends BaseController {
...
@@ -409,6 +423,25 @@ public class SignHclcController extends BaseController {
SignUserInfoHclc
infoHclc
=
new
SignUserInfoHclc
();
SignUserInfoHclc
infoHclc
=
new
SignUserInfoHclc
();
infoHclc
.
setOpenId
(
dto
.
getOpenId
());
infoHclc
.
setOpenId
(
dto
.
getOpenId
());
infoHclc
=
signHclcService
.
selectByPrimaryKey
(
iRequest
,
infoHclc
);
infoHclc
=
signHclcService
.
selectByPrimaryKey
(
iRequest
,
infoHclc
);
if
(
Objects
.
isNull
(
infoHclc
.
getName
())
||
Objects
.
isNull
(
infoHclc
.
getAgentIdNo
()))
{
map
.
put
(
"code"
,
"000004"
);
map
.
put
(
"message"
,
"被转移用户信息异常,org_name:"
+
infoHclc
.
getName
()
+
"agentIdNo:"
+
infoHclc
.
getAgentIdNo
()
+
"请先联系代理店处理!"
);
return
map
;
}
JSONObject
param
=
new
JSONObject
();
param
.
put
(
"org_name"
,
infoHclc
.
getName
());
param
.
put
(
"agentIdNo"
,
infoHclc
.
getAgentIdNo
());
String
isManager
=
organSignHclcService
.
getManagerStatus
(
param
);
if
(
infoHclc
.
getAgentType
().
compareTo
(
1L
)
!=
0
&&
"N"
.
equalsIgnoreCase
(
isManager
))
{
map
.
put
(
"code"
,
"000003"
);
map
.
put
(
"message"
,
"被转移用户未在代理店登记管理信息,请先联系代理店处理!"
);
return
map
;
}
if
(
Objects
.
nonNull
(
infoHclc
)
&&
!
"Y"
.
equalsIgnoreCase
(
infoHclc
.
getAuthFlag
()))
{
if
(
Objects
.
nonNull
(
infoHclc
)
&&
!
"Y"
.
equalsIgnoreCase
(
infoHclc
.
getAuthFlag
()))
{
map
.
put
(
"code"
,
"000002"
);
map
.
put
(
"code"
,
"000002"
);
map
.
put
(
"message"
,
"用户未完成认证,无法授权授权,请先认证!"
);
map
.
put
(
"message"
,
"用户未完成认证,无法授权授权,请先认证!"
);
...
@@ -553,31 +586,44 @@ public class SignHclcController extends BaseController {
...
@@ -553,31 +586,44 @@ public class SignHclcController extends BaseController {
JSONObject
json
=
new
JSONObject
();
JSONObject
json
=
new
JSONObject
();
try
{
try
{
//根据客户名称,证件号码获取对应的openId信息
//根据客户名称,证件号码获取对应的openId信息
String
idNo
=
params
.
getString
(
"idNo"
);
// String idNo = params.getString("idNo");
String
name
=
params
.
getString
(
"name"
);
// String name = params.getString("name");
String
openId
=
null
;
// String openId = null;
SignUserInfoHclc
signInfoHclc
=
new
SignUserInfoHclc
();
// SignUserInfoHclc signInfoHclc = new SignUserInfoHclc();
List
<
SignUserInfoHclc
>
infoHclcs
=
new
ArrayList
<>();
// List<SignUserInfoHclc> infoHclcs = new ArrayList<>();
signInfoHclc
.
setName
(
name
);
// signInfoHclc.setName(name);
signInfoHclc
.
setIdNo
(
idNo
);
// signInfoHclc.setIdNo(idNo);
infoHclcs
=
signInfoHclcMapper
.
select
(
signInfoHclc
);
// infoHclcs = signInfoHclcMapper.select(signInfoHclc);
if
(
infoHclcs
.
size
()
>
0
)
{
// if (infoHclcs.size() > 0) {
openId
=
infoHclcs
.
get
(
0
).
getOpenId
();
// openId = infoHclcs.get(0).getOpenId();
}
else
{
// } else {
//查询历史注册信息
// //查询历史注册信息
SignUserInfoHclcHis
signUserInfoHclcHis
=
new
SignUserInfoHclcHis
();
// SignUserInfoHclcHis signUserInfoHclcHis = new SignUserInfoHclcHis();
List
<
SignUserInfoHclcHis
>
userInfoHclcHisList
=
new
ArrayList
<>();
// List<SignUserInfoHclcHis> userInfoHclcHisList = new ArrayList<>();
signUserInfoHclcHis
.
setName
(
name
);
// signUserInfoHclcHis.setName(name);
signUserInfoHclcHis
.
setIdNo
(
idNo
);
// signUserInfoHclcHis.setIdNo(idNo);
userInfoHclcHisList
=
signUserInfoHclcHisMapper
.
select
(
signUserInfoHclcHis
);
// userInfoHclcHisList = signUserInfoHclcHisMapper.select(signUserInfoHclcHis);
if
(
userInfoHclcHisList
.
size
()
>
0
)
{
// if (userInfoHclcHisList.size() > 0) {
openId
=
userInfoHclcHisList
.
get
(
0
).
getOpenId
();
// openId = userInfoHclcHisList.get(0).getOpenId();
}
// }
}
// }
//
if
(
openId
!=
null
)
{
// if (openId != null) {
params
.
put
(
"openId"
,
openId
);
// params.put("openId", openId);
}
// }
String
id
=
params
.
getString
(
"openId"
);
if
(
id
.
contains
(
"personHclc"
))
{
id
=
id
.
replace
(
"personHclc"
,
""
);
}
params
.
put
(
"openId"
,
id
);
params
.
put
(
"templateId"
,
"lyMDp1r6Jp5r7eSiho0otSby4tY0pXjZg1gbcA1poNI"
);
params
.
put
(
"first"
,
"您好,您申请的融资租赁合同已经通过审核,可以进行签约流程!"
);
params
.
put
(
"keyword1"
,
"承租人:测试"
);
params
.
put
(
"keyword2"
,
"合同号:测试a"
);
params
.
put
(
"keyword3"
,
"机号:测试123456"
);
params
.
put
(
"keyword4"
,
"签约时间:20200827"
);
params
.
put
(
"remark"
,
"请点击互动中心-融资租赁进行签约。谢谢!"
);
params
.
put
(
"url"
,
""
);
json
=
signHclcService
.
sendWxTemplateMsg
(
params
);
json
=
signHclcService
.
sendWxTemplateMsg
(
params
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
core/src/main/java/com/hand/app/esignHclc/service/IOrganSignInfoHclcService.java
View file @
18c9ffa8
package
com
.
hand
.
app
.
esignHclc
.
service
;
package
com
.
hand
.
app
.
esignHclc
.
service
;
import
com.alibaba.fastjson.JSONObject
;
import
com.hand.app.esignHclc.dto.SignUserInfoHclc
;
import
com.hand.app.esignHclc.dto.SignUserInfoHclc
;
import
com.hand.hap.core.IRequest
;
import
com.hand.hap.core.IRequest
;
import
com.hand.hap.core.ProxySelf
;
import
com.hand.hap.core.ProxySelf
;
...
@@ -31,4 +32,6 @@ public interface IOrganSignInfoHclcService extends IBaseService<SignUserInfoHclc
...
@@ -31,4 +32,6 @@ public interface IOrganSignInfoHclcService extends IBaseService<SignUserInfoHclc
Map
<
String
,
Object
>
unBindOrgansAgent
(
SignUserInfoHclc
info
);
Map
<
String
,
Object
>
unBindOrgansAgent
(
SignUserInfoHclc
info
);
void
createOrgPersonInfo
(
String
openId
);
void
createOrgPersonInfo
(
String
openId
);
String
getManagerStatus
(
JSONObject
params
);
}
}
core/src/main/java/com/hand/app/esignHclc/service/impl/OrganSignInfoHclcServiceImpl.java
View file @
18c9ffa8
...
@@ -548,12 +548,13 @@ public class OrganSignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHc
...
@@ -548,12 +548,13 @@ public class OrganSignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHc
//解析返回结果
//解析返回结果
JSONObject
jsonResult
=
JSONObject
.
parseObject
(
stringResult
);
JSONObject
jsonResult
=
JSONObject
.
parseObject
(
stringResult
);
if
(
"true"
.
equalsIgnoreCase
(
jsonResult
.
getString
(
"success"
)))
{
if
(
"true"
.
equalsIgnoreCase
(
jsonResult
.
getString
(
"success"
)))
{
return
jsonResult
.
getString
(
"admin_flag"
);
return
jsonResult
.
get
JSONObject
(
"result"
).
getJSONObject
(
"json"
).
get
String
(
"admin_flag"
);
}
else
{
}
else
{
return
"N"
;
return
"N"
;
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
"N"
;
return
"N"
;
}
}
...
...
core/src/main/java/com/hand/app/esignHclc/service/impl/SignInfoHclcServiceImpl.java
View file @
18c9ffa8
...
@@ -1216,6 +1216,10 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
...
@@ -1216,6 +1216,10 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
signInfoHclc
.
setAgentIdNo
(
agentIdNo
);
signInfoHclc
.
setAgentIdNo
(
agentIdNo
);
}
}
if
(
"HCLC"
.
equalsIgnoreCase
(
role
)
||
"AGENT"
.
equalsIgnoreCase
(
role
))
{
signInfoHclc
.
setIsManagerFlag
(
"Y"
);
}
List
<
SignUserInfoHclc
>
signInfoHclcs
=
signInfoHclcMapper
.
queryUserInfo
(
signInfoHclc
);
List
<
SignUserInfoHclc
>
signInfoHclcs
=
signInfoHclcMapper
.
queryUserInfo
(
signInfoHclc
);
if
(
signInfoHclcs
.
size
()
==
0
)
{
if
(
signInfoHclcs
.
size
()
==
0
)
{
logger
.
error
(
"create sign flows failed, account:{} is not defined in wx"
,
name
+
idNo
);
logger
.
error
(
"create sign flows failed, account:{} is not defined in wx"
,
name
+
idNo
);
...
@@ -1230,7 +1234,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
...
@@ -1230,7 +1234,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
//用户类型是个人时
//用户类型是个人时
if
(
signInfoHclc
.
getCtitype
().
compareTo
(
1L
)
==
0
)
{
if
(
signInfoHclc
.
getCtitype
().
compareTo
(
1L
)
==
0
)
{
json1
.
put
(
"accountId"
,
signInfoHclc
.
getAccountId
());
json1
.
put
(
"accountId"
,
signInfoHclc
.
getAccountId
());
json1
.
put
(
"uniqueId"
,
signInfoHclc
.
getOpenId
());
json1
.
put
(
"uniqueId"
,
signInfoHclc
.
getOpenId
()
.
replace
(
"personHclc"
,
""
)
);
//用户类型是机构时
//用户类型是机构时
}
else
{
}
else
{
json1
.
put
(
"accountId"
,
signInfoHclc
.
getAgentAccountId
());
json1
.
put
(
"accountId"
,
signInfoHclc
.
getAgentAccountId
());
...
@@ -1239,7 +1243,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
...
@@ -1239,7 +1243,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
}
}
//获取需要发送微信通知的签署人
//获取需要发送微信通知的签署人
if
(
!
"HCLC"
.
equalsIgnoreCase
(
role
)
&&
!
"AGENT"
.
equalsIgnoreCase
(
role
))
{
if
(
/*!"HCLC".equalsIgnoreCase(role) && !*/
"TENANT"
.
equalsIgnoreCase
(
role
)
&&
!
wxOpenIds
.
contains
(
signInfoHclc
.
getOpenId
()
))
{
wxOpenIds
.
add
(
signInfoHclc
.
getOpenId
());
wxOpenIds
.
add
(
signInfoHclc
.
getOpenId
());
}
}
...
@@ -1391,8 +1395,17 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
...
@@ -1391,8 +1395,17 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
signInfoHclc
.
setOpenId
(
signUrl
.
getString
(
"uniqueId"
));
signInfoHclc
.
setOpenId
(
signUrl
.
getString
(
"uniqueId"
));
signInfoHclc
=
this
.
selectByPrimaryKey
(
requestContext
,
signInfoHclc
);
signInfoHclc
=
this
.
selectByPrimaryKey
(
requestContext
,
signInfoHclc
);
if
(
signInfoHclc
.
getCtitype
().
compareTo
(
2L
)
==
0
&&
!
signUrl
.
getString
(
"signUrl"
).
contains
(
"organizeId"
))
{
SignUserInfoHclc
signInfoHclcP
=
new
SignUserInfoHclc
();
signInfoHclcP
.
setAccountId
(
signInfoHclc
.
getAgentAccountId
());
signInfoHclcP
=
signInfoHclcMapper
.
select
(
signInfoHclcP
).
get
(
0
);
signUrl
.
put
(
"idNo"
,
signInfoHclcP
.
getIdNo
());
signUrl
.
put
(
"name"
,
signInfoHclcP
.
getName
());
}
else
{
signUrl
.
put
(
"idNo"
,
signInfoHclc
.
getIdNo
());
signUrl
.
put
(
"idNo"
,
signInfoHclc
.
getIdNo
());
signUrl
.
put
(
"name"
,
signInfoHclc
.
getName
());
signUrl
.
put
(
"name"
,
signInfoHclc
.
getName
());
}
// }
// }
...
@@ -1404,6 +1417,9 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
...
@@ -1404,6 +1417,9 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
//发送微信通知
//发送微信通知
if
(
Objects
.
nonNull
(
wxOpenIds
)
&&
wxOpenIds
.
size
()
>
0
)
{
if
(
Objects
.
nonNull
(
wxOpenIds
)
&&
wxOpenIds
.
size
()
>
0
)
{
for
(
String
id
:
wxOpenIds
)
{
for
(
String
id
:
wxOpenIds
)
{
if
(
id
.
contains
(
"personHclc"
))
{
id
=
id
.
replace
(
"personHclc"
,
""
);
}
wxParams
.
put
(
"openId"
,
id
);
wxParams
.
put
(
"openId"
,
id
);
sendWxTemplateMsg
(
wxParams
);
sendWxTemplateMsg
(
wxParams
);
}
}
...
@@ -1462,22 +1478,26 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
...
@@ -1462,22 +1478,26 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
JSONObject
accountInfo
=
params
.
getJSONObject
(
"accountInfo"
);
JSONObject
accountInfo
=
params
.
getJSONObject
(
"accountInfo"
);
SignUserInfoHclc
signUserInfoHclc
=
new
SignUserInfoHclc
();
SignUserInfoHclc
signUserInfoHclc
=
new
SignUserInfoHclc
();
if
(
Objects
.
nonNull
(
accountInfo
.
getString
(
"accountUid"
))){
// if (Objects.nonNull(accountInfo.getString("accountUid"))) {
signUserInfoHclc
.
setOpenId
(
accountInfo
.
getString
(
"accountUid"
));
// signUserInfoHclc.setOpenId(accountInfo.getString("accountUid"));
}
// signUserInfoHclc = signInfoHclcMapper.selectByPrimaryKey(signUserInfoHclc);
// }
//企业经办人个人签署时根据openId获取不到用户信息
// if (Objects.isNull(signUserInfoHclc)) {
//判断是否机构用户
//判断是否机构用户
if
(
Objects
.
isNull
(
accountInfo
.
getString
(
"authOrgId"
))
||
""
.
equalsIgnoreCase
(
accountInfo
.
getString
(
"authOrgId"
)))
{
if
(
Objects
.
isNull
(
accountInfo
.
getString
(
"authOrgId"
))
||
""
.
equalsIgnoreCase
(
accountInfo
.
getString
(
"authOrgId"
)))
{
signUserInfoHclc
.
setAccountId
(
accountInfo
.
getString
(
"accountId"
));
signUserInfoHclc
.
setAccountId
(
accountInfo
.
getString
(
"accountId"
));
}
else
{
}
else
{
signUserInfoHclc
.
setAccountId
(
accountInfo
.
getString
(
"authOrgId"
));
signUserInfoHclc
.
setAccountId
(
accountInfo
.
getString
(
"authOrgId"
));
if
(
Objects
.
nonNull
(
accountInfo
.
getString
(
"accountId"
)))
{
if
(
Objects
.
nonNull
(
accountInfo
.
getString
(
"accountId"
)))
{
signUserInfoHclc
.
setAgentAccountId
(
accountInfo
.
getString
(
"accountId"
));
signUserInfoHclc
.
setAgentAccountId
(
accountInfo
.
getString
(
"accountId"
));
}
}
}
}
JSONObject
accountInfoNew
=
new
JSONObject
();
//获取移动端用户信息
//获取移动端用户信息
signUserInfoHclc
=
signInfoHclcMapper
.
selectOne
(
signUserInfoHclc
);
signUserInfoHclc
=
signInfoHclcMapper
.
selectOne
(
signUserInfoHclc
);
// }
//承租人签署流程 建机自动签完获取下载地址并下载
//承租人签署流程 建机自动签完获取下载地址并下载
// if ("1".equalsIgnoreCase(signUserInfoHclc.getOpenId())) {
// if ("1".equalsIgnoreCase(signUserInfoHclc.getOpenId())) {
...
@@ -1489,6 +1509,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
...
@@ -1489,6 +1509,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
// }
// }
//设置hclc报文用户信息
//设置hclc报文用户信息
JSONObject
accountInfoNew
=
new
JSONObject
();
accountInfoNew
.
put
(
"ctino"
,
signUserInfoHclc
.
getIdNo
());
accountInfoNew
.
put
(
"ctino"
,
signUserInfoHclc
.
getIdNo
());
accountInfoNew
.
put
(
"name"
,
signUserInfoHclc
.
getName
());
accountInfoNew
.
put
(
"name"
,
signUserInfoHclc
.
getName
());
params
.
put
(
"accountInfo"
,
accountInfoNew
);
params
.
put
(
"accountInfo"
,
accountInfoNew
);
...
...
core/src/main/java/com/hand/app/esignHclc/utils/SignHclcUtils.java
View file @
18c9ffa8
...
@@ -97,7 +97,7 @@ public class SignHclcUtils {
...
@@ -97,7 +97,7 @@ public class SignHclcUtils {
}
else
if
(
APPLICATION_FORM_URLENCODED
.
equalsIgnoreCase
(
contentType
))
{
}
else
if
(
APPLICATION_FORM_URLENCODED
.
equalsIgnoreCase
(
contentType
))
{
List
<
NameValuePair
>
nameValuePairList
=
new
ArrayList
<
NameValuePair
>();
List
<
NameValuePair
>
nameValuePairList
=
new
ArrayList
<
NameValuePair
>();
for
(
String
key
:
params
.
keySet
())
{
for
(
String
key
:
params
.
keySet
())
{
nameValuePairList
.
add
(
new
BasicNameValuePair
(
key
,
params
.
get
(
key
).
toString
()
));
nameValuePairList
.
add
(
new
BasicNameValuePair
(
key
,
Objects
.
nonNull
(
params
.
get
(
key
))
?
params
.
get
(
key
).
toString
()
:
""
));
}
}
UrlEncodedFormEntity
formEntity
=
new
UrlEncodedFormEntity
(
nameValuePairList
,
"utf-8"
);
UrlEncodedFormEntity
formEntity
=
new
UrlEncodedFormEntity
(
nameValuePairList
,
"utf-8"
);
formEntity
.
setContentType
(
"application/x-www-form-urlencoded; charset=UTF-8"
);
formEntity
.
setContentType
(
"application/x-www-form-urlencoded; charset=UTF-8"
);
...
...
core/src/main/resources/app/esignHclc/mapper/SignInfoHclcMapper.xml
View file @
18c9ffa8
...
@@ -54,8 +54,11 @@
...
@@ -54,8 +54,11 @@
<if
test=
"authFlag != null"
>
<if
test=
"authFlag != null"
>
and nvl(auth_flag,'N') = #{authFlag,jdbcType=VARCHAR}
and nvl(auth_flag,'N') = #{authFlag,jdbcType=VARCHAR}
</if>
</if>
<if
test=
"isManagerFlag != null"
>
and nvl(is_manager_flag,'Y') = #{isManagerFlag,jdbcType=VARCHAR}
</if>
</where>
</where>
order by
account_id
order by
nvl(is_manager_flag,'N') desc
</select>
</select>
<select
id=
"queryAgentInfo"
resultMap=
"BaseResultMap"
parameterType=
"com.hand.app.esignHclc.dto.SignUserInfoHclc"
>
<select
id=
"queryAgentInfo"
resultMap=
"BaseResultMap"
parameterType=
"com.hand.app.esignHclc.dto.SignUserInfoHclc"
>
...
...
core/src/main/resources/config.properties
View file @
18c9ffa8
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
#esignHclc
#esignHclc
tsign.project.id
=
1000029
tsign.project.id
=
1000029
tsign.project.secret
=
2e66a86bbc6fa9000d4a5f272cbc70e1
tsign.project.secret
=
a4859d3bea99b936826994fe2ac9ae04
#e签宝地址
#e签宝地址
tsign.api.url
=
http://
tsign-test.hitachics.com
tsign.api.url
=
http://
139.196.20.44:8035
#用户认证地址
#用户认证地址
tsign.face.api.url
=
https://
sml
openapi.esign.cn
tsign.face.api.url
=
https://openapi.esign.cn
#用户认证用户
#用户认证用户
tsign.face.api.appId
=
4438798562
tsign.face.api.appId
=
5111596700
#用户认证密码
#用户认证密码
tsign.face.api.secret
=
4024c2b5e503a84da6d126fdc6f0da81
tsign.face.api.secret
=
f112f3acd3ed05263ba4a3fad6e901cd
#认证结果通知地址
#认证结果通知地址
tsign.api.notifyUrl
=
http://
101.133.225.167
/core/api/public/listen/auth/result
tsign.api.notifyUrl
=
http://
lease.hitachics.com
/core/api/public/listen/auth/result
#签署结果通知地址
#签署结果通知地址
tsign.api.listenSignUrl
=
http://
101.133.225.167
/core/api/public/listen/sign/flow
tsign.api.listenSignUrl
=
http://
lease.hitachics.com
/core/api/public/listen/sign/flow
#签署完成跳转地址
#签署完成跳转地址
tsign.api.signRedirectUrl
=
http://
sign
.hitachics.com/www/#/ElectronicContract
tsign.api.signRedirectUrl
=
http://
lease
.hitachics.com/www/#/ElectronicContract
#微信公众号apiKey
#微信公众号apiKey
wx.apiKey
=
handexinxi
wx.apiKey
=
handexinxi
#微信公众号接口地址
#微信公众号接口地址
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
#微信服务器图片保存中台路径
#微信服务器图片保存中台路径
wx.image.path
=
D:
\\
app
_dev
\\
apache-tomcat-app
\\
app_file
wx.image.path
=
D:
\\
app
\\
apache-tomcat-app
\\
app_file
...
...
core/src/main/resources/profiles/dev/config.properties
View file @
18c9ffa8
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
#esignHclc
#esignHclc
tsign.project.id
=
1000029
tsign.project.id
=
1000029
tsign.project.secret
=
2e66a86bbc6fa9000d4a5f272cbc70e1
tsign.project.secret
=
a4859d3bea99b936826994fe2ac9ae04
#e签宝地址
#e签宝地址
tsign.api.url
=
http://
tsign-test.hitachics.com
tsign.api.url
=
http://
139.196.20.44:8035
#用户认证地址
#用户认证地址
tsign.face.api.url
=
https://
sml
openapi.esign.cn
tsign.face.api.url
=
https://openapi.esign.cn
#用户认证用户
#用户认证用户
tsign.face.api.appId
=
4438798562
tsign.face.api.appId
=
5111596700
#用户认证密码
#用户认证密码
tsign.face.api.secret
=
4024c2b5e503a84da6d126fdc6f0da81
tsign.face.api.secret
=
f112f3acd3ed05263ba4a3fad6e901cd
#认证结果通知地址
#认证结果通知地址
tsign.api.notifyUrl
=
http://
101.133.225.167
/core/api/public/listen/auth/result
tsign.api.notifyUrl
=
http://
lease.hitachics.com
/core/api/public/listen/auth/result
#签署结果通知地址
#签署结果通知地址
tsign.api.listenSignUrl
=
http://
101.133.225.167
/core/api/public/listen/sign/flow
tsign.api.listenSignUrl
=
http://
lease.hitachics.com
/core/api/public/listen/sign/flow
#签署完成跳转地址
#签署完成跳转地址
tsign.api.signRedirectUrl
=
http://
sign
.hitachics.com/www/#/ElectronicContract
tsign.api.signRedirectUrl
=
http://
lease
.hitachics.com/www/#/ElectronicContract
#微信公众号apiKey
#微信公众号apiKey
wx.apiKey
=
handexinxi
wx.apiKey
=
handexinxi
#微信公众号接口地址
#微信公众号接口地址
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
#微信服务器图片保存中台路径
#微信服务器图片保存中台路径
wx.image.path
=
D:
\\
app
_dev
\\
apache-tomcat-app
\\
app_file
wx.image.path
=
D:
\\
app
\\
apache-tomcat-app
\\
app_file
...
...
core/src/main/resources/profiles/sit/config.properties
View file @
18c9ffa8
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
#esignHclc
#esignHclc
tsign.project.id
=
1000029
tsign.project.id
=
1000029
tsign.project.secret
=
2e66a86bbc6fa9000d4a5f272cbc70e1
tsign.project.secret
=
a4859d3bea99b936826994fe2ac9ae04
#e签宝地址
#e签宝地址
tsign.api.url
=
http://
tsign-test.hitachics.com
tsign.api.url
=
http://
139.196.20.44:8035
#用户认证地址
#用户认证地址
tsign.face.api.url
=
https://
sml
openapi.esign.cn
tsign.face.api.url
=
https://openapi.esign.cn
#用户认证用户
#用户认证用户
tsign.face.api.appId
=
4438798562
tsign.face.api.appId
=
5111596700
#用户认证密码
#用户认证密码
tsign.face.api.secret
=
4024c2b5e503a84da6d126fdc6f0da81
tsign.face.api.secret
=
f112f3acd3ed05263ba4a3fad6e901cd
#认证结果通知地址
#认证结果通知地址
tsign.api.notifyUrl
=
http://
101.133.225.167
/core/api/public/listen/auth/result
tsign.api.notifyUrl
=
http://
lease.hitachics.com
/core/api/public/listen/auth/result
#签署结果通知地址
#签署结果通知地址
tsign.api.listenSignUrl
=
http://
101.133.225.167
/core/api/public/listen/sign/flow
tsign.api.listenSignUrl
=
http://
lease.hitachics.com
/core/api/public/listen/sign/flow
#签署完成跳转地址
#签署完成跳转地址
tsign.api.signRedirectUrl
=
http://
sign
.hitachics.com/www/#/ElectronicContract
tsign.api.signRedirectUrl
=
http://
lease
.hitachics.com/www/#/ElectronicContract
#微信公众号apiKey
#微信公众号apiKey
wx.apiKey
=
handexinxi
wx.apiKey
=
handexinxi
#微信公众号接口地址
#微信公众号接口地址
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
#微信服务器图片保存中台路径
#微信服务器图片保存中台路径
wx.image.path
=
D:
\\
app
_dev
\\
apache-tomcat-app
\\
app_file
wx.image.path
=
D:
\\
app
\\
apache-tomcat-app
\\
app_file
...
...
core/src/main/resources/profiles/uat/config.properties
View file @
18c9ffa8
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
...
@@ -111,27 +111,27 @@ thread.taskSize = 5
#esignHclc
#esignHclc
tsign.project.id
=
1000029
tsign.project.id
=
1000029
tsign.project.secret
=
2e66a86bbc6fa9000d4a5f272cbc70e1
tsign.project.secret
=
a4859d3bea99b936826994fe2ac9ae04
#e签宝地址
#e签宝地址
tsign.api.url
=
http://
tsign-test.hitachics.com
tsign.api.url
=
http://
139.196.20.44:8035
#用户认证地址
#用户认证地址
tsign.face.api.url
=
https://
sml
openapi.esign.cn
tsign.face.api.url
=
https://openapi.esign.cn
#用户认证用户
#用户认证用户
tsign.face.api.appId
=
4438798562
tsign.face.api.appId
=
5111596700
#用户认证密码
#用户认证密码
tsign.face.api.secret
=
4024c2b5e503a84da6d126fdc6f0da81
tsign.face.api.secret
=
f112f3acd3ed05263ba4a3fad6e901cd
#认证结果通知地址
#认证结果通知地址
tsign.api.notifyUrl
=
http://
101.133.225.167
/core/api/public/listen/auth/result
tsign.api.notifyUrl
=
http://
lease.hitachics.com
/core/api/public/listen/auth/result
#签署结果通知地址
#签署结果通知地址
tsign.api.listenSignUrl
=
http://
101.133.225.167
/core/api/public/listen/sign/flow
tsign.api.listenSignUrl
=
http://
lease.hitachics.com
/core/api/public/listen/sign/flow
#签署完成跳转地址
#签署完成跳转地址
tsign.api.signRedirectUrl
=
http://
sign
.hitachics.com/www/#/ElectronicContract
tsign.api.signRedirectUrl
=
http://
lease
.hitachics.com/www/#/ElectronicContract
#微信公众号apiKey
#微信公众号apiKey
wx.apiKey
=
handexinxi
wx.apiKey
=
handexinxi
#微信公众号接口地址
#微信公众号接口地址
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
wx.apiHttpUrl
=
https://wxgzh.hitachics.com/hcs-public-server/internal/third/
#微信服务器图片保存中台路径
#微信服务器图片保存中台路径
wx.image.path
=
D:
\\
app
_dev
\\
apache-tomcat-app
\\
app_file
wx.image.path
=
D:
\\
app
\\
apache-tomcat-app
\\
app_file
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment