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
2d00bd80
Commit
2d00bd80
authored
Sep 01, 2021
by
查志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复生产的npe
parent
cc826ed9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+2
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
View file @
2d00bd80
...
@@ -158,7 +158,8 @@ public class CalculationServiceImpl {
...
@@ -158,7 +158,8 @@ public class CalculationServiceImpl {
discountRequest
.
setDistributionFee
(
deliveryAmount
);
discountRequest
.
setDistributionFee
(
deliveryAmount
);
discountRequest
.
setIsMember
(
isMember
);
discountRequest
.
setIsMember
(
isMember
);
discountRequest
.
setPayCardFee
(
payCardFee
);
discountRequest
.
setPayCardFee
(
payCardFee
);
discountRequest
.
setProductChannel
(
orderType
==
1
?
"saasdelivery"
:
"saas"
);
// fix npe 麦咖啡加车没有orderType,这里判断一下orderType
discountRequest
.
setProductChannel
((
null
!=
orderType
&&
orderType
==
1
)
?
"saasdelivery"
:
"saas"
);
ActivityCalculationDiscountResponseDto
activityCalculationDiscountResponseDto
;
ActivityCalculationDiscountResponseDto
activityCalculationDiscountResponseDto
;
// try {
// try {
activityCalculationDiscountResponseDto
=
activityClient
.
calculationDiscountSharing
(
discountRequest
);
activityCalculationDiscountResponseDto
=
activityClient
.
calculationDiscountSharing
(
discountRequest
);
...
...
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