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
241f68b3
Commit
241f68b3
authored
Mar 25, 2020
by
姜海波
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整配送费 逻辑
parent
3bab54d2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+3
-3
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
241f68b3
...
@@ -1041,12 +1041,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -1041,12 +1041,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
ActivityResponseDto
activityResponse
=
activityQueryResponseDto
.
getResult
().
get
(
0
);
ActivityResponseDto
activityResponse
=
activityQueryResponseDto
.
getResult
().
get
(
0
);
BenefitBeanDto
beanDto
=
activityResponse
.
getBenefits
().
get
(
0
);
BenefitBeanDto
beanDto
=
activityResponse
.
getBenefits
().
get
(
0
);
if
(
beanDto
.
getDiscountAmount
()>=(
calculationDiscountResult
.
getDeliveryAmount
()
/
100
)){
if
(
beanDto
.
getDiscountAmount
()>=(
calculationDiscountResult
.
getDeliveryAmount
())){
String
desc
=
DELIVERY_DISCOUNT_DESC2
;
String
desc
=
DELIVERY_DISCOUNT_DESC2
;
shoppingCartGoodsResponseVo
.
setDeliveryDiscountDesc
(
String
.
format
(
desc
,
beanDto
.
getThresholdAmount
()));
shoppingCartGoodsResponseVo
.
setDeliveryDiscountDesc
(
String
.
format
(
desc
,
beanDto
.
getThresholdAmount
()
/
100
));
}
else
{
}
else
{
String
desc
=
DELIVERY_DISCOUNT_DESC1
;
String
desc
=
DELIVERY_DISCOUNT_DESC1
;
shoppingCartGoodsResponseVo
.
setDeliveryDiscountDesc
(
String
.
format
(
desc
,
beanDto
.
getThresholdAmount
(),
calculationDiscountResult
.
getDeliveryAmount
()
/
100
));
shoppingCartGoodsResponseVo
.
setDeliveryDiscountDesc
(
String
.
format
(
desc
,
beanDto
.
getThresholdAmount
()
/
100
,
calculationDiscountResult
.
getDeliveryAmount
()
/
100
));
}
}
shoppingCartGoodsResponseVo
.
setDeliveryAmount
(
calculationDiscountResult
.
getDeliveryAmount
());
shoppingCartGoodsResponseVo
.
setDeliveryAmount
(
calculationDiscountResult
.
getDeliveryAmount
());
...
...
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