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
1a0cb91c
Commit
1a0cb91c
authored
Apr 29, 2020
by
fengjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改逻辑
parent
51be9f9b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
ApplyOrder.java
...n/java/cn/quantgroup/customer/model/order/ApplyOrder.java
+1
-1
UserServiceImpl.java
.../cn/quantgroup/customer/service/impl/UserServiceImpl.java
+3
-4
No files found.
src/main/java/cn/quantgroup/customer/model/order/ApplyOrder.java
View file @
1a0cb91c
...
@@ -14,7 +14,7 @@ import java.util.List;
...
@@ -14,7 +14,7 @@ import java.util.List;
public
class
ApplyOrder
{
public
class
ApplyOrder
{
private
List
<
ActiveApplyOrder
>
activeOrders
=
new
ArrayList
<>();
private
List
<
ActiveApplyOrder
>
activeOrders
=
new
ArrayList
<>();
private
List
<
Invalid
ApplyOrder
>
invalidOrders
=
new
ArrayList
<>();
private
List
<
Active
ApplyOrder
>
invalidOrders
=
new
ArrayList
<>();
/**
/**
* 近期状况
* 近期状况
...
...
src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java
View file @
1a0cb91c
...
@@ -8,7 +8,6 @@ import cn.quantgroup.customer.model.Tuple;
...
@@ -8,7 +8,6 @@ import cn.quantgroup.customer.model.Tuple;
import
cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping
;
import
cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping
;
import
cn.quantgroup.customer.model.order.ActiveApplyOrder
;
import
cn.quantgroup.customer.model.order.ActiveApplyOrder
;
import
cn.quantgroup.customer.model.order.ApplyOrder
;
import
cn.quantgroup.customer.model.order.ApplyOrder
;
import
cn.quantgroup.customer.model.order.InvalidApplyOrder
;
import
cn.quantgroup.customer.model.xyqbuser.UserBasicInfo
;
import
cn.quantgroup.customer.model.xyqbuser.UserBasicInfo
;
import
cn.quantgroup.customer.model.xyqbuser.UserCombination
;
import
cn.quantgroup.customer.model.xyqbuser.UserCombination
;
import
cn.quantgroup.customer.repo.UserRepo
;
import
cn.quantgroup.customer.repo.UserRepo
;
...
@@ -440,7 +439,7 @@ public class UserServiceImpl implements IUserService {
...
@@ -440,7 +439,7 @@ public class UserServiceImpl implements IUserService {
}
}
List
<
ActiveApplyOrder
>
activeApplyOrders
=
applyOrder
.
getData
().
getActiveOrders
();
List
<
ActiveApplyOrder
>
activeApplyOrders
=
applyOrder
.
getData
().
getActiveOrders
();
List
<
Invalid
ApplyOrder
>
invalidApplyOrders
=
applyOrder
.
getData
().
getInvalidOrders
();
List
<
Active
ApplyOrder
>
invalidApplyOrders
=
applyOrder
.
getData
().
getInvalidOrders
();
if
(
CollectionUtils
.
isNotEmpty
(
activeApplyOrders
))
{
if
(
CollectionUtils
.
isNotEmpty
(
activeApplyOrders
))
{
//通过申请订单号获得渠道订单号
//通过申请订单号获得渠道订单号
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
());
...
@@ -454,13 +453,13 @@ public class UserServiceImpl implements IUserService {
...
@@ -454,13 +453,13 @@ public class UserServiceImpl implements IUserService {
if
(
CollectionUtils
.
isNotEmpty
(
invalidApplyOrders
))
{
if
(
CollectionUtils
.
isNotEmpty
(
invalidApplyOrders
))
{
//通过申请订单号获得渠道订单号
//通过申请订单号获得渠道订单号
List
<
String
>
applyOrderNoList
=
active
ApplyOrders
.
stream
().
map
(
e
->
e
.
getApplyOrderNo
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
applyOrderNoList
=
invalid
ApplyOrders
.
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
;
return
mapJsonResult
;
}
}
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
Map
<
String
,
String
>
data
=
mapJsonResult
.
getData
();
active
ApplyOrders
.
forEach
(
e
->
e
.
setChannelNo
(
data
.
get
(
e
.
getApplyOrderNo
())));
invalid
ApplyOrders
.
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