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
9338874a
Commit
9338874a
authored
Apr 29, 2020
by
王向伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补充申请订单号
parent
cf93ffec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
UserServiceImpl.java
.../cn/quantgroup/customer/service/impl/UserServiceImpl.java
+12
-1
No files found.
src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java
View file @
9338874a
...
...
@@ -439,7 +439,17 @@ public class UserServiceImpl implements IUserService {
return
applyOrder
;
}
List
<
ActiveApplyOrder
>
activeApplyOrders
=
applyOrder
.
getData
().
getActiveOrders
();
if
(
CollectionUtils
.
isNotEmpty
(
activeApplyOrders
))
{
//通过申请订单号获得渠道订单号
List
<
String
>
applyOrderNoList
=
activeApplyOrders
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
JsonResult
<
Map
<
String
,
String
>>
mapJsonResult
=
kaService
.
findChannelOrderNosByApplyOrderNos
(
applyOrderNoList
);
if
(!
mapJsonResult
.
isSuccess
())
{
return
mapJsonResult
;
}
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
activeApplyOrders
.
forEach
(
e
->
e
.
setChannelNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
}
UserBasicInfo
userBasicInfo
=
userInfo
.
getData
();
UserCombination
userCombination
=
new
UserCombination
();
userCombination
.
setUserInfo
(
userBasicInfo
);
...
...
@@ -471,6 +481,7 @@ public class UserServiceImpl implements IUserService {
applyOrderQuery
.
setOrderNo
(
applyNo
);
//申请订单查询
JsonResult
<
ApplyOrder
>
applyOrders
=
xyqbService
.
findApplyOrders
(
applyOrderQuery
);
return
applyOrders
;
}
...
...
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