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
dca91832
Commit
dca91832
authored
Dec 28, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加价购活动优惠为0,不记录订单级别优惠
parent
b9b87053
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingEquallyService.java
+5
-4
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingEquallyService.java
View file @
dca91832
...
...
@@ -16,10 +16,7 @@ import org.apache.commons.collections4.CollectionUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -220,6 +217,10 @@ public class CalculationSharingEquallyService {
int
discountAmount
=
(
discount
.
getDiscount
()
==
null
)
?
0
:
discount
.
getDiscount
();
Integer
discountType
=
discount
.
getType
();
if
(
discountType
!=
null
&&
discountAmount
>=
0
)
{
//加价购金额为0不记录
if
(
Objects
.
equals
(
ActivityTypeEnum
.
TYPE_81
.
getCode
(),
discountType
)
&&
discountAmount
==
0
){
continue
;
}
ActivityDiscountsDto
activityDiscountsDto
=
new
ActivityDiscountsDto
();
activityDiscountsDto
.
setActivityCode
(
discount
.
getActivityCode
());
activityDiscountsDto
.
setActivityName
(
discount
.
getActivityName
());
...
...
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