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
f23bb513
Commit
f23bb513
authored
Dec 16, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决NPE
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
86790ff5
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/ShoppingCartNewServiceImpl.java
+1
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
f23bb513
...
...
@@ -1689,7 +1689,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
result
.
setValidCouponMap
(
validCouponMap
);
result
.
setSpqIdToCartUuid
(
spqIdToCartUuid
);
// fisherman 配送费原价 + 夜间配送费逻辑 为了划线价展示
result
.
setDeliveryAmount
(
distributionFee
+
nightDistributionFee
);
result
.
setDeliveryAmount
(
(
Objects
.
isNull
(
distributionFee
)
?
0L
:
distributionFee
)
+
nightDistributionFee
);
// fisherman 优惠后配送费,需要加上促销反馈夜间配送费的优惠价格
Long
calculationNightDistributionFee
=
Objects
.
isNull
(
result
.
getNightDistributionFee
())
?
0L
:
result
.
getNightDistributionFee
();
result
.
setDistributionFee
(
result
.
getDistributionFee
()
+
calculationNightDistributionFee
);
...
...
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