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
5008358b
Commit
5008358b
authored
Sep 06, 2021
by
胡敬轩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
券码可用券列表查询->购物车->促销新算价
parent
5cd53047
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
+4
-4
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
View file @
5008358b
...
@@ -410,7 +410,7 @@ public class ActivityAdapter {
...
@@ -410,7 +410,7 @@ public class ActivityAdapter {
BeanUtils
.
copyProperties
(
discount
,
cartProductDiscount
);
BeanUtils
.
copyProperties
(
discount
,
cartProductDiscount
);
//是否与代金券互斥
//是否与代金券互斥
boolean
cashExclusive
=
Objects
.
equals
(
cashExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
YES
.
getCode
());
boolean
cashExclusive
=
Objects
.
equals
(
cashExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
NO
.
getCode
());
cartProductDiscount
.
setCashExclusive
(
cashExclusive
);
cartProductDiscount
.
setCashExclusive
(
cashExclusive
);
//是否与代金券叠加门槛
//是否与代金券叠加门槛
...
@@ -418,7 +418,7 @@ public class ActivityAdapter {
...
@@ -418,7 +418,7 @@ public class ActivityAdapter {
cartProductDiscount
.
setCashMultiple
(
cashMultiple
);
cartProductDiscount
.
setCashMultiple
(
cashMultiple
);
//是否与折扣券互斥
//是否与折扣券互斥
boolean
discountExclusive
=
Objects
.
equals
(
discountExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
YES
.
getCode
());
boolean
discountExclusive
=
Objects
.
equals
(
discountExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
NO
.
getCode
());
cartProductDiscount
.
setDiscountExclusive
(
discountExclusive
);
cartProductDiscount
.
setDiscountExclusive
(
discountExclusive
);
//是否与折扣券叠加门槛
//是否与折扣券叠加门槛
...
@@ -458,7 +458,7 @@ public class ActivityAdapter {
...
@@ -458,7 +458,7 @@ public class ActivityAdapter {
BeanUtils
.
copyProperties
(
discount
,
cartProductDiscount
);
BeanUtils
.
copyProperties
(
discount
,
cartProductDiscount
);
//是否与代金券互斥
//是否与代金券互斥
boolean
cashExclusive
=
Objects
.
equals
(
cashExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
YES
.
getCode
());
boolean
cashExclusive
=
Objects
.
equals
(
cashExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
NO
.
getCode
());
cartProductDiscount
.
setCashExclusive
(
cashExclusive
);
cartProductDiscount
.
setCashExclusive
(
cashExclusive
);
//是否与代金券叠加门槛
//是否与代金券叠加门槛
...
@@ -466,7 +466,7 @@ public class ActivityAdapter {
...
@@ -466,7 +466,7 @@ public class ActivityAdapter {
cartProductDiscount
.
setCashMultiple
(
cashMultiple
);
cartProductDiscount
.
setCashMultiple
(
cashMultiple
);
//是否与折扣券互斥
//是否与折扣券互斥
boolean
discountExclusive
=
Objects
.
equals
(
discountExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
YES
.
getCode
());
boolean
discountExclusive
=
Objects
.
equals
(
discountExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
NO
.
getCode
());
cartProductDiscount
.
setDiscountExclusive
(
discountExclusive
);
cartProductDiscount
.
setDiscountExclusive
(
discountExclusive
);
//是否与折扣券叠加门槛
//是否与折扣券叠加门槛
...
...
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