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
8984c024
Commit
8984c024
authored
Mar 29, 2021
by
孙昱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sunyu::update::修复回填月享卡2.0数据bug
parent
b3f7784a
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 @
8984c024
...
...
@@ -143,7 +143,7 @@ public class CouponDiscountCalculation {
if
(
null
!=
monthCardDiscount
){
for
(
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Goods
goods
:
goodsList
)
{
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
card2Discount
=
goods
.
getDiscounts
().
stream
().
filter
(
goodsDiscount
->
ActivityTypeEnum
.
TYPE_38
.
getCode
()
==
goodsDiscount
.
getType
()).
findFirst
().
get
(
);
goods
.
getDiscounts
().
stream
().
filter
(
goodsDiscount
->
ActivityTypeEnum
.
TYPE_38
.
getCode
()
==
goodsDiscount
.
getType
()).
findFirst
().
orElse
(
null
);
if
(
CollectionUtils
.
isNotEmpty
(
goods
.
getDiscounts
())
&&
null
!=
card2Discount
){
for
(
CartGoods
cartGoods
:
cartGoodsList
)
{
if
(
StringUtils
.
equals
(
cartGoods
.
getCartGoodsUid
(),
goods
.
getCartGoodsUid
())){
...
...
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