Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
2e3555a4
Commit
2e3555a4
authored
Dec 05, 2020
by
缪晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update CollageOrderServiceImpl.java
parent
e4aa70af
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
View file @
2e3555a4
...
@@ -195,7 +195,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
...
@@ -195,7 +195,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
if
(
order
.
getOrderCostDetailList
()
!=
null
)
{
if
(
order
.
getOrderCostDetailList
()
!=
null
)
{
OrderCostResp
orderCostResp
=
order
.
getOrderCostDetailList
().
stream
().
filter
(
detail
->
(
detail
.
getCostType
().
equals
(
2
)
&&
detail
.
getBillType
().
equals
(
1
))).
findFirst
().
orElse
(
new
OrderCostResp
());
OrderCostResp
orderCostResp
=
order
.
getOrderCostDetailList
().
stream
().
filter
(
detail
->
(
detail
.
getCostType
().
equals
(
2
)
&&
detail
.
getBillType
().
equals
(
1
))).
findFirst
().
orElse
(
new
OrderCostResp
());
BigDecimal
deliveryPrice
=
orderCostResp
.
getActualCostAmount
()
==
null
?
new
BigDecimal
(
0
)
:
orderCostResp
.
getActualCostAmount
();
BigDecimal
deliveryPrice
=
orderCostResp
.
getActualCostAmount
()
==
null
?
new
BigDecimal
(
0
)
:
orderCostResp
.
getActualCostAmount
();
deliveryAmount
=
Math
.
floorDiv
(
deliveryPrice
.
longValue
(),
payerOpenIdList
.
size
());
deliveryAmount
=
Math
.
floorDiv
(
deliveryPrice
.
longValue
(),
payerOpenIdList
.
size
()
+
1
);
}
}
Long
amount
=
itemAmount
+
packAmount
+
deliveryAmount
;
Long
amount
=
itemAmount
+
packAmount
+
deliveryAmount
;
groupBuyUserInfo
=
new
GroupBuyRequest
.
UserInfo
();
groupBuyUserInfo
=
new
GroupBuyRequest
.
UserInfo
();
...
...
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