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
7e9f0b40
Commit
7e9f0b40
authored
Aug 05, 2021
by
王世昌
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20210720-富有对接折扣券新增折扣参数-wsc'
parents
13c65a89
f1eaab7a
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 @
7e9f0b40
...
@@ -1298,7 +1298,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -1298,7 +1298,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
}
coupon
.
setDiscount
(
discount
);
coupon
.
setDiscount
(
discount
);
// 暂时先不上
// 暂时先不上
coupon
.
setDiscountAmount
(
Integer
.
valueOf
(
each
.
getDiscountAmount
())
);
coupon
.
setDiscountAmount
(
0
);
}
else
{
}
else
{
coupon
.
setDiscount
(
BigDecimal
.
ZERO
);
coupon
.
setDiscount
(
BigDecimal
.
ZERO
);
coupon
.
setDiscountAmount
(
Integer
.
valueOf
(
each
.
getDiscountAmount
()));
coupon
.
setDiscountAmount
(
Integer
.
valueOf
(
each
.
getDiscountAmount
()));
...
...
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