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
e39bd6a1
Commit
e39bd6a1
authored
Nov 13, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
c17546b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+6
-2
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
View file @
e39bd6a1
...
@@ -181,8 +181,12 @@ public class CalculationServiceImpl {
...
@@ -181,8 +181,12 @@ public class CalculationServiceImpl {
shoppingCartGoodsDto
.
setTotalDiscountAmount
(
shoppingCartGoodsResponseVo
.
getTotalDiscountAmount
());
shoppingCartGoodsDto
.
setTotalDiscountAmount
(
shoppingCartGoodsResponseVo
.
getTotalDiscountAmount
());
//随单购 月卡价格
//随单购 月卡价格
shoppingCartGoodsDto
.
setPayCardFee
(
shoppingCartGoodsResponseVo
.
getPayCardFee
());
shoppingCartGoodsDto
.
setPayCardFee
(
shoppingCartGoodsResponseVo
.
getPayCardFee
());
long
buyThreeGiveOneCouponFee
=
calculationDiscountResult
==
null
?
0
l
:
calculationDiscountResult
.
getDiscounts
().
stream
().
filter
(
t
->
t
.
getExtendType
()
==
7
).
mapToLong
(
apportionGoods
->
apportionGoods
.
getCardAmount
()).
sum
();
if
(
calculationDiscountResult
!=
null
)
{
shoppingCartGoodsDto
.
setBuyThreeGiveOneCouponFee
(
buyThreeGiveOneCouponFee
);
if
(
CollectionUtils
.
isNotEmpty
(
calculationDiscountResult
.
getDiscounts
()))
{
long
buyThreeGiveOneCouponFee
=
calculationDiscountResult
.
getDiscounts
().
stream
().
filter
(
t
->
t
.
getExtendType
()
==
7
).
mapToLong
(
apportionGoods
->
apportionGoods
.
getCardAmount
()).
sum
();
shoppingCartGoodsDto
.
setBuyThreeGiveOneCouponFee
(
buyThreeGiveOneCouponFee
);
}
}
shoppingCartGoodsDto
.
setDeliveryAmount
(
shoppingCartGoodsResponseVo
.
getDeliveryAmount
());
shoppingCartGoodsDto
.
setDeliveryAmount
(
shoppingCartGoodsResponseVo
.
getDeliveryAmount
());
shoppingCartGoodsDto
.
setDiscountDeliveryAmount
(
shoppingCartGoodsResponseVo
.
getDiscountDeliveryAmount
());
shoppingCartGoodsDto
.
setDiscountDeliveryAmount
(
shoppingCartGoodsResponseVo
.
getDiscountDeliveryAmount
());
shoppingCartGoodsDto
.
setThresholdAmount
(
shoppingCartGoodsResponseVo
.
getThresholdAmount
());
shoppingCartGoodsDto
.
setThresholdAmount
(
shoppingCartGoodsResponseVo
.
getThresholdAmount
());
...
...
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