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
26b1cadc
Commit
26b1cadc
authored
Apr 29, 2020
by
fengjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改查询逻辑
parent
1a0cb91c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
UserServiceImpl.java
.../cn/quantgroup/customer/service/impl/UserServiceImpl.java
+6
-8
No files found.
src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java
View file @
26b1cadc
...
@@ -444,22 +444,20 @@ public class UserServiceImpl implements IUserService {
...
@@ -444,22 +444,20 @@ public class UserServiceImpl implements IUserService {
//通过申请订单号获得渠道订单号
//通过申请订单号获得渠道订单号
List
<
String
>
applyOrderNoList
=
activeApplyOrders
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
applyOrderNoList
=
activeApplyOrders
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
JsonResult
<
Map
<
String
,
String
>>
mapJsonResult
=
kaService
.
findChannelOrderNosByApplyOrderNos
(
applyOrderNoList
);
JsonResult
<
Map
<
String
,
String
>>
mapJsonResult
=
kaService
.
findChannelOrderNosByApplyOrderNos
(
applyOrderNoList
);
if
(!
mapJsonResult
.
isSuccess
())
{
if
(
mapJsonResult
.
isSuccess
())
{
return
mapJsonResult
;
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
activeApplyOrders
.
forEach
(
e
->
e
.
setChannelNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
}
}
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
activeApplyOrders
.
forEach
(
e
->
e
.
setChannelNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
}
}
if
(
CollectionUtils
.
isNotEmpty
(
invalidApplyOrders
))
{
if
(
CollectionUtils
.
isNotEmpty
(
invalidApplyOrders
))
{
//通过申请订单号获得渠道订单号
//通过申请订单号获得渠道订单号
List
<
String
>
applyOrderNoList
=
invalidApplyOrders
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
applyOrderNoList
=
invalidApplyOrders
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
JsonResult
<
Map
<
String
,
String
>>
mapJsonResult
=
kaService
.
findChannelOrderNosByApplyOrderNos
(
applyOrderNoList
);
JsonResult
<
Map
<
String
,
String
>>
mapJsonResult
=
kaService
.
findChannelOrderNosByApplyOrderNos
(
applyOrderNoList
);
if
(!
mapJsonResult
.
isSuccess
())
{
if
(
mapJsonResult
.
isSuccess
())
{
return
mapJsonResult
;
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
invalidApplyOrders
.
forEach
(
e
->
e
.
setChannelNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
}
}
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
invalidApplyOrders
.
forEach
(
e
->
e
.
setChannelNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
}
}
UserBasicInfo
userBasicInfo
=
userInfo
.
getData
();
UserBasicInfo
userBasicInfo
=
userInfo
.
getData
();
UserCombination
userCombination
=
new
UserCombination
();
UserCombination
userCombination
=
new
UserCombination
();
...
...
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