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
jenkins
order-group
Commits
d5b60d47
Commit
d5b60d47
authored
Jan 10, 2020
by
姜海波
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加对象判空
parent
25855208
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/BuyAndGiftsPromotionService.java
+1
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java
View file @
d5b60d47
...
@@ -55,7 +55,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
...
@@ -55,7 +55,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
}
}
List
<
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
>
sendGoodsList
=
new
ArrayList
<>();
List
<
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
>
sendGoodsList
=
new
ArrayList
<>();
sendActivities
.
forEach
(
sendActivity
->
sendGoodsList
.
addAll
(
sendActivity
.
getSendGoods
()));
sendActivities
.
forEach
(
sendActivity
->
sendGoodsList
.
addAll
(
sendActivity
.
getSendGoods
()));
List
<
ProductBeanDTO
>
productBeanDTOS
=
buildActivityProduct
(
activityQueryDto
,
sendGoodsList
,
shoppingCartInfoRequestVo
.
getBusinessType
());
List
<
ProductBeanDTO
>
productBeanDTOS
=
buildActivityProduct
(
activityQueryDto
,
sendGoodsList
,
shoppingCartInfoRequestVo
==
null
?
null
:
shoppingCartInfoRequestVo
.
getBusinessType
());
if
(
CollectionUtils
.
isEmpty
(
productBeanDTOS
))
{
if
(
CollectionUtils
.
isEmpty
(
productBeanDTOS
))
{
return
;
return
;
}
}
...
...
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