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
4d659a3e
Commit
4d659a3e
authored
Apr 21, 2020
by
杨钧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改逻辑判断错误
parent
1068f8c1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
EarlySettleUpOrderQueryParam.java
...rest/param/ordermapping/EarlySettleUpOrderQueryParam.java
+1
-1
OrderServiceImpl.java
...cn/quantgroup/customer/service/impl/OrderServiceImpl.java
+1
-1
XyqbServiceImpl.java
.../cn/quantgroup/customer/service/impl/XyqbServiceImpl.java
+3
-3
No files found.
src/main/java/cn/quantgroup/customer/rest/param/ordermapping/EarlySettleUpOrderQueryParam.java
View file @
4d659a3e
...
@@ -13,7 +13,7 @@ public class EarlySettleUpOrderQueryParam {
...
@@ -13,7 +13,7 @@ public class EarlySettleUpOrderQueryParam {
private
String
phoneNo
;
private
String
phoneNo
;
private
Long
userId
;
private
Long
userId
;
private
Long
loanId
;
private
Long
loanId
;
private
String
fundOrder
No
;
private
String
fundOrder
;
private
String
channelOrderNo
;
private
String
channelOrderNo
;
private
Long
channelId
;
private
Long
channelId
;
}
}
src/main/java/cn/quantgroup/customer/service/impl/OrderServiceImpl.java
View file @
4d659a3e
...
@@ -316,7 +316,7 @@ public class OrderServiceImpl implements IOrderService {
...
@@ -316,7 +316,7 @@ public class OrderServiceImpl implements IOrderService {
}
}
private
boolean
existAtLestOneParam
(
EarlySettleUpOrderQueryParam
orderQuery
)
{
private
boolean
existAtLestOneParam
(
EarlySettleUpOrderQueryParam
orderQuery
)
{
return
existOrderParam
(
orderQuery
)
||
existUserParam
(
orderQuery
);
return
existOrderParam
(
orderQuery
)
||
existUserParam
(
orderQuery
)
||
StringUtils
.
isNotBlank
(
orderQuery
.
getFundOrder
())
;
}
}
@Override
@Override
...
...
src/main/java/cn/quantgroup/customer/service/impl/XyqbServiceImpl.java
View file @
4d659a3e
...
@@ -365,7 +365,7 @@ public class XyqbServiceImpl implements IXyqbService {
...
@@ -365,7 +365,7 @@ public class XyqbServiceImpl implements IXyqbService {
Map
<
String
,
Object
>
queryParam
=
new
HashMap
<>(
8
);
Map
<
String
,
Object
>
queryParam
=
new
HashMap
<>(
8
);
if
(
Objects
.
isNull
(
orderQuery
.
getUserId
())
&&
if
(
Objects
.
isNull
(
orderQuery
.
getUserId
())
&&
Objects
.
isNull
(
orderQuery
.
getLoanId
())
&&
Objects
.
isNull
(
orderQuery
.
getLoanId
())
&&
StringUtils
.
isBlank
(
orderQuery
.
getFundOrder
No
()))
{
StringUtils
.
isBlank
(
orderQuery
.
getFundOrder
()))
{
log
.
error
(
"{} 请求参数都为空,不允许查询 orderQuery={}"
,
logPre
,
orderQuery
);
log
.
error
(
"{} 请求参数都为空,不允许查询 orderQuery={}"
,
logPre
,
orderQuery
);
return
JsonResult
.
buildErrorStateResult
(
"查询参数都为空,不允许查询"
,
null
);
return
JsonResult
.
buildErrorStateResult
(
"查询参数都为空,不允许查询"
,
null
);
}
}
...
@@ -378,8 +378,8 @@ public class XyqbServiceImpl implements IXyqbService {
...
@@ -378,8 +378,8 @@ public class XyqbServiceImpl implements IXyqbService {
queryParam
.
put
(
"user_id"
,
String
.
valueOf
(
orderQuery
.
getUserId
()));
queryParam
.
put
(
"user_id"
,
String
.
valueOf
(
orderQuery
.
getUserId
()));
}
}
if
(
StringUtils
.
isNotBlank
(
orderQuery
.
getFundOrder
No
())){
if
(
StringUtils
.
isNotBlank
(
orderQuery
.
getFundOrder
())){
queryParam
.
put
(
"fund_order_no"
,
orderQuery
.
getFundOrder
No
());
queryParam
.
put
(
"fund_order_no"
,
orderQuery
.
getFundOrder
());
}
}
...
...
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