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
d6b4f2ab
Commit
d6b4f2ab
authored
Jul 15, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产bug NPE修复
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
734a510a
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/calculate/promotion/DeliverySharingService.java
+1
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/DeliverySharingService.java
View file @
d6b4f2ab
...
@@ -66,7 +66,7 @@ public class DeliverySharingService {
...
@@ -66,7 +66,7 @@ public class DeliverySharingService {
discount
=
discountResult
.
getDiscounts
().
stream
().
filter
((
d
)
->
ActivityTypeEnum
.
TYPE_14
.
getCode
().
equals
(
d
.
getType
())).
findFirst
().
orElse
(
null
);
discount
=
discountResult
.
getDiscounts
().
stream
().
filter
((
d
)
->
ActivityTypeEnum
.
TYPE_14
.
getCode
().
equals
(
d
.
getType
())).
findFirst
().
orElse
(
null
);
}
}
if
(
discount
!=
null
)
{
if
(
discount
!=
null
)
{
if
(
beanDto
.
getBenefitType
()
==
1
)
{
if
(
beanDto
!=
null
&&
beanDto
.
getBenefitType
()
==
1
)
{
String
desc
=
DELIVERY_DISCOUNT_DESC2
;
String
desc
=
DELIVERY_DISCOUNT_DESC2
;
shoppingCartGoodsResponseVo
.
setDeliveryDiscountDesc
(
String
.
format
(
desc
,
df
.
format
(
beanDto
.
getThresholdAmount
().
doubleValue
()
/
100
)
));
shoppingCartGoodsResponseVo
.
setDeliveryDiscountDesc
(
String
.
format
(
desc
,
df
.
format
(
beanDto
.
getThresholdAmount
().
doubleValue
()
/
100
)
));
}
}
...
...
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