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
a06dc669
Commit
a06dc669
authored
Aug 30, 2021
by
胡博文
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复account空指针问题
parent
c081eb38
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
0 deletions
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+1
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
a06dc669
...
@@ -1535,6 +1535,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -1535,6 +1535,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
String
finalCouponCode
=
couponCode
;
String
finalCouponCode
=
couponCode
;
List
<
ActivityCalculationDiscountRequestDto
.
CalculationDiscountCoupon
>
collect
=
coupons
.
stream
().
filter
(
calculationDiscountCoupon
->
Objects
.
equals
(
calculationDiscountCoupon
.
getCode
(),
finalCouponCode
)).
collect
(
toList
());
List
<
ActivityCalculationDiscountRequestDto
.
CalculationDiscountCoupon
>
collect
=
coupons
.
stream
().
filter
(
calculationDiscountCoupon
->
Objects
.
equals
(
calculationDiscountCoupon
.
getCode
(),
finalCouponCode
)).
collect
(
toList
());
// canUseCoupon 0 表示可用
// canUseCoupon 0 表示可用
accountFlag
=
accountFlag
==
null
?
0
:
accountFlag
;
if
(
CollectionUtils
.
isEmpty
(
collect
))
{
if
(
CollectionUtils
.
isEmpty
(
collect
))
{
if
(
GoodsTypeEnum
.
BUY_M_SEND_N_COUPON
.
getGoodsType
().
equals
(
cartGoods
.
getGoodsType
())
&&
accountFlag
==
1
)
if
(
GoodsTypeEnum
.
BUY_M_SEND_N_COUPON
.
getGoodsType
().
equals
(
cartGoods
.
getGoodsType
())
&&
accountFlag
==
1
)
{
{
...
...
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