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
492d3737
Commit
492d3737
authored
Apr 22, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix空指针
parent
a003fdeb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
+6
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
+6
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
View file @
492d3737
...
...
@@ -132,6 +132,12 @@ public class CouponPromotionService implements IPromotionService {
List
<
String
>
validCouponCodeLis
=
new
ArrayList
<>();
if
(
couponPromotionVO
!=
null
&&
ObjectUtils
.
equals
(
CouponFlag
.
YES
.
getCode
(),
couponPromotionVO
.
getFlg
())){
validCouponCodeLis
=
shoppingCartGoodsResponseVo
.
getAvailableCoupon
().
getUsableCoupons
().
stream
().
map
(
ActivityCouponBean:
:
getCouponCode
).
collect
(
Collectors
.
toList
());
}
else
{
couponPromotionVO
=
new
CouponPromotionVO
();
couponPromotionVO
.
setUserId
(
userLoginInfoDto
.
getMemberId
());
couponPromotionVO
.
setStoreId
(
shoppingCartInfoRequestVo
.
getShopId
());
couponPromotionVO
.
setPartnerId
(
shoppingCartInfoRequestVo
.
getPartnerId
());
couponPromotionVO
.
setOrderType
(
shoppingCartInfoRequestVo
.
getOrderType
());
}
couponService
.
checkValidCoupon
(
couponPromotionVO
,
validCouponCodeLis
,
spqIdToCartUuid
,
couponCode
,
cartGoodsList
);
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
View file @
492d3737
...
...
@@ -135,6 +135,12 @@ public class CouponSharingService {
List
<
String
>
validCouponCodeLis
=
new
ArrayList
<>();
if
(
couponPromotionVO
!=
null
&&
ObjectUtils
.
equals
(
CouponFlag
.
YES
.
getCode
(),
couponPromotionVO
.
getFlg
())){
validCouponCodeLis
=
shoppingCartGoodsResponseVo
.
getAvailableCoupon
().
getUsableCoupons
().
stream
().
map
(
ActivityCouponBean:
:
getCouponCode
).
collect
(
Collectors
.
toList
());
}
else
{
couponPromotionVO
=
new
CouponPromotionVO
();
couponPromotionVO
.
setUserId
(
userId
);
couponPromotionVO
.
setStoreId
(
shoppingCartInfoRequestVo
.
getShopId
());
couponPromotionVO
.
setPartnerId
(
shoppingCartInfoRequestVo
.
getPartnerId
());
couponPromotionVO
.
setOrderType
(
shoppingCartInfoRequestVo
.
getOrderType
());
}
couponService
.
checkValidCoupon
(
couponPromotionVO
,
validCouponCodeLis
,
spqIdToCartUuid
,
couponCode
,
cartGoodsList
);
...
...
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