Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
youjj
cloud-platform
Commits
5d803073
Commit
5d803073
authored
Nov 11, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改核销验收人bug
parent
444ecee1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
OrderVehicleCrosstownBiz.java
...com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
+8
-4
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
View file @
5d803073
...
@@ -293,10 +293,14 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
...
@@ -293,10 +293,14 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
if
(
orderVehicleCrosstownDto
.
getRestDeposit
().
compareTo
(
getAmount
())
==
-
1
)
{
//剩余金额小于保证金
if
(
orderVehicleCrosstownDto
.
getRestDeposit
().
compareTo
(
getAmount
())
==
-
1
)
{
//剩余金额小于保证金
return
ObjectRestResponse
.
createFailedResult
(
500
,
"押金不足,不能交车,请联系客服!"
);
return
ObjectRestResponse
.
createFailedResult
(
500
,
"押金不足,不能交车,请联系客服!"
);
}
}
JSONArray
jsonArray
=
JSONArray
.
parseArray
(
oldValue
.
get
(
0
).
getCheckUserInfo
());
if
(
StringUtils
.
isNotBlank
(
oldValue
.
get
(
0
).
getCheckUserInfo
()))
{
if
(
jsonArray
!=
null
&&
checkUserInfoDto
!=
null
)
{
JSONArray
jsonArray
=
JSONArray
.
parseArray
(
oldValue
.
get
(
0
).
getCheckUserInfo
());
jsonArray
.
add
(
checkUserInfoDto
);
if
(
jsonArray
!=
null
&&
checkUserInfoDto
!=
null
)
{
orderVehicleCrosstownDto
.
setCheckUserInfo
(
jsonArray
.
toJSONString
());
jsonArray
.
add
(
checkUserInfoDto
);
orderVehicleCrosstownDto
.
setCheckUserInfo
(
jsonArray
.
toJSONString
());
}
}
else
{
orderVehicleCrosstownDto
.
setCheckUserInfo
(
list
.
toJSONString
());
}
}
BeanUtil
.
copyProperties
(
orderVehicleCrosstownDto
,
oldValue
.
get
(
0
),
CopyOptions
.
create
().
setIgnoreNullValue
(
true
).
setIgnoreError
(
true
));
BeanUtil
.
copyProperties
(
orderVehicleCrosstownDto
,
oldValue
.
get
(
0
),
CopyOptions
.
create
().
setIgnoreNullValue
(
true
).
setIgnoreError
(
true
));
getOrderLicense
(
orderVehicleCrosstownDto
);
getOrderLicense
(
orderVehicleCrosstownDto
);
...
...
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