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
df5ada88
Commit
df5ada88
authored
Aug 20, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
超值加购类型返回
parent
74400eeb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java
+5
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java
View file @
df5ada88
...
@@ -129,7 +129,11 @@ public class TimeSaleCalculation {
...
@@ -129,7 +129,11 @@ public class TimeSaleCalculation {
activityDiscountsDto
.
setActivityCode
(
goodsDiscount
.
getActivityCode
());
activityDiscountsDto
.
setActivityCode
(
goodsDiscount
.
getActivityCode
());
activityDiscountsDto
.
setActualActivityGoodsNumber
(
goodsDiscount
.
getActualGoodsNumber
());
activityDiscountsDto
.
setActualActivityGoodsNumber
(
goodsDiscount
.
getActualGoodsNumber
());
activityDiscountsDto
.
setActivityName
(
goodsDiscount
.
getActivityName
());
activityDiscountsDto
.
setActivityName
(
goodsDiscount
.
getActivityName
());
activityDiscountsDto
.
setActivityType
(
ActivityTypeEnum
.
TYPE_2
.
getCode
());
if
(
ActivityTypeEnum
.
TYPE_23
.
getCode
()
==
goodsDiscount
.
getType
()){
activityDiscountsDto
.
setActivityType
(
ActivityTypeEnum
.
TYPE_23
.
getCode
());
}
else
{
activityDiscountsDto
.
setActivityType
(
ActivityTypeEnum
.
TYPE_2
.
getCode
());
}
activityDiscountsDto
.
setDiscountAmount
(
totalDiscountAmount
.
intValue
());
activityDiscountsDto
.
setDiscountAmount
(
totalDiscountAmount
.
intValue
());
cartGoods
.
getActivityDiscountsDtos
().
add
(
activityDiscountsDto
);
cartGoods
.
getActivityDiscountsDtos
().
add
(
activityDiscountsDto
);
cartGoods
.
setTotalDiscountAmount
(
cartGoods
.
getTotalDiscountAmount
()
+
totalDiscountAmount
.
intValue
());
cartGoods
.
setTotalDiscountAmount
(
cartGoods
.
getTotalDiscountAmount
()
+
totalDiscountAmount
.
intValue
());
...
...
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