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
3f91901e
Commit
3f91901e
authored
Mar 23, 2020
by
王向伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户信息查询修改逻辑
parent
9e29dde6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
UserServiceImpl.java
.../cn/quantgroup/customer/service/impl/UserServiceImpl.java
+11
-12
No files found.
src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java
View file @
3f91901e
...
...
@@ -432,21 +432,20 @@ public class UserServiceImpl implements IUserService {
}
List
<
ApplyOrder
>
applyOrderList
=
applyOrders
.
getData
();
if
(
CollectionUtils
.
isEmpty
(
applyOrderList
))
{
log
.
info
(
"{} 不存在对应的申请订单 param={}"
,
logPre
,
userCombinationParam
);
return
JsonResult
.
buildSuccessResult
(
"申请订单不存在"
,
applyOrderList
);
if
(
CollectionUtils
.
isNotEmpty
(
applyOrderList
))
{
//通过申请订单号获得渠道订单号
List
<
String
>
applyOrderNoList
=
applyOrderList
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
JsonResult
<
Map
<
String
,
String
>>
mapJsonResult
=
kaService
.
findMap
(
applyOrderNoList
);
if
(!
mapJsonResult
.
isSuccess
())
{
return
mapJsonResult
;
}
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
applyOrderList
.
forEach
(
e
->
e
.
setChannelOrderNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
}
UserBasicInfo
userBasicInfo
=
userInfo
.
getData
();
//通过申请订单号获得渠道订单号
List
<
String
>
applyOrderNoList
=
applyOrderList
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
JsonResult
<
Map
<
String
,
String
>>
mapJsonResult
=
kaService
.
findMap
(
applyOrderNoList
);
if
(!
mapJsonResult
.
isSuccess
())
{
return
mapJsonResult
;
}
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
applyOrderList
.
forEach
(
e
->
e
.
setChannelOrderNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
UserBasicInfo
userBasicInfo
=
userInfo
.
getData
();
UserCombination
userCombination
=
new
UserCombination
();
userCombination
.
setUserInfo
(
userBasicInfo
);
userCombination
.
setApplyOrderList
(
applyOrderList
);
...
...
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