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
e1601f3c
Commit
e1601f3c
authored
Jun 17, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复生产bug-> 门店未有任何配置 导致购物车计算配送费NPE
parent
f10d0997
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/FixDeliveryServiceImpl.java
+9
-2
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/FixDeliveryServiceImpl.java
View file @
e1601f3c
...
...
@@ -27,6 +27,7 @@ import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Objects
;
...
...
@@ -50,9 +51,15 @@ public class FixDeliveryServiceImpl extends AbstractDeliveryServiceImpl implemen
.
build
();
ConsoleResponseDTO
<
BizDTO
>
responseDto
=
consoleApiClient
.
getStoreMix
(
query
);
DeliveryInfoDTO
deliveryInfo
=
responseDto
.
getBizVO
().
getDeliveryInfo
();
long
amount
=
0L
;
List
<
ExtraDeliveryDto
>
deliveryAmountList
=
new
ArrayList
<>();
if
(
Objects
.
isNull
(
deliveryInfo
))
{
}
else
{
amount
=
Objects
.
isNull
(
deliveryInfo
.
getFinalDeliveryAmount
())
?
0L
:
deliveryInfo
.
getFinalDeliveryAmount
();
deliveryAmountList
=
super
.
nightDeliveryAmountHandle
(
amount
,
deliveryInfo
.
getExpandFields
());
}
// fisherman 处理 额外配送费
long
amount
=
Objects
.
isNull
(
deliveryInfo
)
||
Objects
.
isNull
(
deliveryInfo
.
getFinalDeliveryAmount
())
?
0L
:
deliveryInfo
.
getFinalDeliveryAmount
();
List
<
ExtraDeliveryDto
>
deliveryAmountList
=
super
.
nightDeliveryAmountHandle
(
amount
,
deliveryInfo
.
getExpandFields
());
if
(
Objects
.
nonNull
(
shoppingCartGoodsResponseVo
))
{
shoppingCartGoodsResponseVo
.
setDeliveryFeeZeroReason
(
0
);
shoppingCartGoodsResponseVo
.
setDeliveryAmountList
(
deliveryAmountList
);
...
...
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