Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
customer-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QG
customer-service
Commits
3da122d3
Commit
3da122d3
authored
Mar 18, 2020
by
王向伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改日志级别
parent
e10e410a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
16 deletions
+11
-16
UserRest.java
src/main/java/cn/quantgroup/customer/rest/UserRest.java
+4
-8
UserServiceImpl.java
.../cn/quantgroup/customer/service/impl/UserServiceImpl.java
+3
-3
XyqbServiceImpl.java
.../cn/quantgroup/customer/service/impl/XyqbServiceImpl.java
+4
-5
No files found.
src/main/java/cn/quantgroup/customer/rest/UserRest.java
View file @
3da122d3
...
...
@@ -12,11 +12,9 @@ import cn.quantgroup.customer.rest.param.phone.ModifyPhoneQuery;
import
cn.quantgroup.customer.rest.param.user.UserCombinationParam
;
import
cn.quantgroup.customer.rest.vo.JsonResult
;
import
cn.quantgroup.customer.service.IUserService
;
import
cn.quantgroup.customer.service.IXyqbService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.security.authentication.AuthenticationManager
;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
...
@@ -36,14 +34,11 @@ import static cn.quantgroup.customer.constant.Constant.GSON;
public
class
UserRest
{
private
final
IUserService
userService
;
private
final
AuthenticationManager
authenticationManager
;
private
final
IXyqbService
xyqbService
;
@Autowired
public
UserRest
(
AuthenticationManager
authenticationManager
,
IUserService
userService
,
IXyqbService
xyqbService
)
{
this
.
authenticationManager
=
authenticationManager
;
public
UserRest
(
IUserService
userService
)
{
this
.
userService
=
userService
;
this
.
xyqbService
=
xyqbService
;
}
@PostMapping
(
value
=
"/login"
)
...
...
@@ -127,11 +122,12 @@ public class UserRest {
/**
* 用户综合查询
*
* @param combinationParam
* @return
*/
@GetMapping
(
value
=
"/info"
)
public
JsonResult
findUserCombination
(
UserCombinationParam
combinationParam
){
public
JsonResult
findUserCombination
(
UserCombinationParam
combinationParam
)
{
return
userService
.
findUserCombination
(
combinationParam
);
}
...
...
src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java
View file @
3da122d3
...
...
@@ -424,9 +424,9 @@ public class UserServiceImpl implements IUserService {
}
List
<
ApplyOrder
>
applyOrderList
=
applyOrders
.
getData
();
if
(
CollectionUtils
.
isEmpty
(
applyOrderList
))
{
log
.
error
(
"{} 不存在对应的申请订单 param={}"
,
logPre
,
userCombinationParam
);
return
JsonResult
.
build
ErrorStateResult
(
"申请订单不存在"
,
null
);
if
(
CollectionUtils
.
isEmpty
(
applyOrderList
))
{
log
.
info
(
"{} 不存在对应的申请订单 param={}"
,
logPre
,
userCombinationParam
);
return
JsonResult
.
build
SuccessResult
(
"申请订单不存在"
,
applyOrderList
);
}
UserBasicInfo
userBasicInfo
=
userInfo
.
getData
();
...
...
src/main/java/cn/quantgroup/customer/service/impl/XyqbServiceImpl.java
View file @
3da122d3
...
...
@@ -40,7 +40,6 @@ public class XyqbServiceImpl implements IXyqbService {
private
final
IHttpService
httpService
;
@Autowired
public
XyqbServiceImpl
(
IHttpService
httpService
)
{
this
.
httpService
=
httpService
;
...
...
@@ -148,7 +147,7 @@ public class XyqbServiceImpl implements IXyqbService {
try
{
result
=
httpService
.
post
(
url
,
header
,
param
);
}
catch
(
Exception
e
)
{
log
.
error
(
"{} 远程调用异常 url={},param={}"
,
logPre
,
url
,
param
,
e
);
log
.
error
(
"{} 远程调用异常 url={},param={}"
,
logPre
,
url
,
param
,
e
);
return
JsonResult
.
buildErrorStateResult
(
"网络异常"
,
null
);
}
...
...
@@ -167,7 +166,7 @@ public class XyqbServiceImpl implements IXyqbService {
@Override
public
JsonResult
<
OrderRepayment
>
repaymentPlanQuery
(
Long
loanId
)
{
String
logPre
=
"XyqbServiceImpl.findLoanOrder"
;
log
.
info
(
"{} 查询还款计划
result
={}"
,
logPre
,
loanId
);
log
.
info
(
"{} 查询还款计划
loanId
={}"
,
logPre
,
loanId
);
String
url
=
xyqbSysUrl
+
"/ex/ka/loan_plan/query"
;
Map
<
String
,
String
>
queryParam
=
new
HashMap
<>(
2
);
queryParam
.
put
(
"loanId"
,
loanId
.
toString
());
...
...
@@ -179,8 +178,8 @@ public class XyqbServiceImpl implements IXyqbService {
TypeReference
<
JsonResult
<
OrderRepayment
>>
typeToken
=
new
TypeReference
<
JsonResult
<
OrderRepayment
>>()
{
};
JsonResult
<
OrderRepayment
>
result1
=
JSONTools
.
deserialize
(
result
,
typeToken
);
if
(
result1
!=
null
)
{
return
result1
;
if
(
result1
!=
null
)
{
return
result1
;
}
else
{
return
JsonResult
.
buildErrorStateResult
(
"还款计划查询失败"
,
null
);
}
...
...
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