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
af5c9060
Commit
af5c9060
authored
Sep 06, 2021
by
胡敬轩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
券码可用券列表查询->购物车->促销新算价
parent
5008358b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java
+3
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
View file @
af5c9060
...
...
@@ -408,6 +408,7 @@ public class ActivityAdapter {
}
CartProduct
.
Discount
cartProductDiscount
=
new
CartProduct
.
Discount
();
BeanUtils
.
copyProperties
(
discount
,
cartProductDiscount
);
cartProductDiscount
.
setActualGoodsNumber
(
discount
.
getAddOnQuantity
());
//是否与代金券互斥
boolean
cashExclusive
=
Objects
.
equals
(
cashExclusiveMap
.
get
(
discount
.
getType
()),
YesOrNoEnum
.
NO
.
getCode
());
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java
View file @
af5c9060
...
...
@@ -357,6 +357,9 @@ public class ActivityCalculationDiscountResponseDto {
* 优惠现单价
*/
private
Long
signleDiscount
;
//活动覆盖商品数量,比如第二件实际优惠一件,但是两件商品都算活动叠加数量
private
Integer
addOnQuantity
=
0
;
}
/**
...
...
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