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
ffe7f0e9
Commit
ffe7f0e9
authored
Oct 17, 2020
by
xiaoer.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:多选
parent
e4943e27
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java
+8
-4
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java
View file @
ffe7f0e9
...
...
@@ -236,13 +236,13 @@ public class AdditionSharingService {
if
(
discountResult
==
null
||
CollectionUtils
.
isEmpty
(
discountResult
.
getGoods
())
||
premiumExchangeActivity
==
null
||
CollectionUtils
.
isEmpty
(
premiumExchangeActivity
.
getProducts
()))
{
return
;
}
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
hgGood
=
discountResult
.
getGoods
()
List
<
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
>
manyHgs
=
discountResult
.
getGoods
()
.
stream
()
.
filter
(
d
->
CalculationGoodsType
.
TYPE_2
.
getType
().
equals
(
d
.
getCartGoodType
()))
.
findFirst
()
.
orElse
(
null
);
.
collect
(
Collectors
.
toList
());
if
(
hgGood
==
null
)
{
if
(
CollectionUtils
.
isEmpty
(
manyHgs
)
)
{
throw
new
ServiceException
(
ResponseResult
.
PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST
);
}
...
...
@@ -265,6 +265,10 @@ public class AdditionSharingService {
if
(
null
==
getProductsVo
)
{
continue
;
}
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
hgGood
=
manyHgs
.
stream
().
filter
(
d
->
goodsId
.
equals
(
d
.
getGoodsId
())).
findFirst
().
orElse
(
null
);
if
(
hgGood
==
null
)
{
continue
;
}
ShoppingCartGoodsDto
.
CartGoodsDetailDto
cartGoodsDetailDto
=
this
.
getCartGoodsDetailDto
(
product
,
getProductsVo
,
goodsId
,
hgGood
);
shoppingCartGoodsDto
.
getProducts
().
add
(
cartGoodsDetailDto
);
//2.计算优惠价格
...
...
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