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
36172dce
Commit
36172dce
authored
Dec 04, 2020
by
周健威
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/feature_chw_zjw' into feature_chw_zjw
parents
62604c13
dd9571ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
0 deletions
+1
-0
OrderDetailBiz.java
...main/java/com/xxfc/platform/order/biz/OrderDetailBiz.java
+1
-0
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDetailBiz.java
View file @
36172dce
...
...
@@ -96,6 +96,7 @@ public class OrderDetailBiz{
if
((
insureStatus
==
1
&&
baseOrder
.
getStatus
()
.
equals
(
OrderStatusEnum
.
ORDER_TOSTART
.
getCode
()))
||
insureStatus
==
2
)
insureAmount
=
orderItems
.
stream
().
filter
(
x
->
x
.
getType
()==
104
).
map
(
OrderItem:
:
getRealAmount
).
reduce
(
BigDecimal
.
ZERO
,
(
x
,
y
)
->
x
.
add
(
y
));
goodsAmount
=
goodsAmount
.
subtract
(
insureAmount
);
OrderRentVehicleDetail
vehicleDetail
=
orderRentVehicleDetails
.
get
(
0
);
//获取营收明细dto
OrderDetailDTO
orderDetailDTO
=
new
OrderDetailDTO
();
...
...
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