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
d4c883dc
Commit
d4c883dc
authored
Feb 02, 2021
by
yu.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sunyu::update::remove conpon-product about is not match threshold
parent
85452509
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
+12
-8
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
View file @
d4c883dc
...
@@ -80,12 +80,11 @@ public class CouponDiscountCalculation {
...
@@ -80,12 +80,11 @@ public class CouponDiscountCalculation {
||
!
calculationDiscountResult
.
getDiscounts
().
stream
().
anyMatch
(
discount
->
(
ActivityTypeEnum
.
TYPE_3
.
getCode
().
equals
(
discount
.
getType
())
||
!
calculationDiscountResult
.
getDiscounts
().
stream
().
anyMatch
(
discount
->
(
ActivityTypeEnum
.
TYPE_3
.
getCode
().
equals
(
discount
.
getType
())
||(
ActivityTypeEnum
.
TYPE_31
.
getCode
().
equals
(
discount
.
getType
()))
||
(
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
discount
.
getType
()))))){
||(
ActivityTypeEnum
.
TYPE_31
.
getCode
().
equals
(
discount
.
getType
()))
||
(
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
discount
.
getType
()))))){
if
(
null
!=
calculationDiscountResult
&&
CollectionUtils
.
isEmpty
(
calculationDiscountResult
.
getDiscounts
())){
if
(
null
!=
calculationDiscountResult
&&
CollectionUtils
.
isEmpty
(
calculationDiscountResult
.
getDiscounts
())){
for
(
int
i
=
0
;
i
<
cartGoodsList
.
size
();
i
++)
{
Iterator
<
CartGoods
>
cartGoodsIterator
=
cartGoodsList
.
iterator
();
CartGoods
cartGoods
=
cartGoodsList
.
get
(
i
);
while
(
cartGoodsIterator
.
hasNext
()){
if
(
StringUtils
.
isNotEmpty
(
cartGoods
.
getCouponCode
()))
{
if
(
StringUtils
.
isNotEmpty
(
cartGoodsIterator
.
next
().
getCouponCode
()))
{
cartGoods
.
setCouponCode
(
""
);
cartGoodsIterator
.
remove
();
cartGoods
.
setCouponName
(
""
);
break
;
cartGoodsList
.
set
(
i
,
cartGoods
);
}
}
}
}
}
}
...
@@ -147,8 +146,13 @@ public class CouponDiscountCalculation {
...
@@ -147,8 +146,13 @@ public class CouponDiscountCalculation {
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
goodsDiscount
=
discountsNew
.
stream
().
filter
(
t
->
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
t
.
getType
())).
findFirst
().
get
();
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
goodsDiscount
=
discountsNew
.
stream
().
filter
(
t
->
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
t
.
getType
())).
findFirst
().
get
();
cartGoods
.
setCouponName
(
goodsDiscount
.
getActivityName
());
cartGoods
.
setCouponName
(
goodsDiscount
.
getActivityName
());
}
else
{
}
else
{
cartGoods
.
setCouponCode
(
""
);
Iterator
<
CartGoods
>
cartGoodsIterator
=
cartGoodsList
.
iterator
();
cartGoods
.
setCouponName
(
""
);
while
(
cartGoodsIterator
.
hasNext
()){
if
(
StringUtils
.
isNotEmpty
(
cartGoodsIterator
.
next
().
getCouponCode
()))
{
cartGoodsIterator
.
remove
();
break
;
}
}
}
}
}
}
}
}
...
...
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