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
e8ee51d6
Commit
e8ee51d6
authored
Nov 11, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
e04de3ad
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
+1
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
View file @
e8ee51d6
...
@@ -633,7 +633,7 @@ public class CouponDiscountCalculation {
...
@@ -633,7 +633,7 @@ public class CouponDiscountCalculation {
ShoppingCartGoodsResponseVo
shoppingCartGoodsResponseVo
)
{
ShoppingCartGoodsResponseVo
shoppingCartGoodsResponseVo
)
{
List
<
CartGoods
>
cartGoodsListNew
=
new
ArrayList
<>();
List
<
CartGoods
>
cartGoodsListNew
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
calculationDiscount
.
getDiscounts
()))
{
if
(
calculationDiscount
!=
null
&&
CollectionUtils
.
isNotEmpty
(
calculationDiscount
.
getDiscounts
()))
{
// 对促销返回的数据进行拆分
// 对促销返回的数据进行拆分
List
<
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Discount
>
discounts
=
calculationDiscount
.
getDiscounts
().
stream
().
filter
(
discount
->
ActivityTypeEnum
.
TYPE_35
.
getCode
().
equals
(
discount
.
getType
())).
collect
(
Collectors
.
toList
());
List
<
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Discount
>
discounts
=
calculationDiscount
.
getDiscounts
().
stream
().
filter
(
discount
->
ActivityTypeEnum
.
TYPE_35
.
getCode
().
equals
(
discount
.
getType
())).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
discounts
)
){
if
(
CollectionUtils
.
isNotEmpty
(
discounts
)
){
...
...
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