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
423c03eb
Commit
423c03eb
authored
Oct 13, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 运费月卡入机
parent
2ebe9614
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
0 deletions
+9
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+1
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
View file @
423c03eb
...
@@ -154,6 +154,10 @@ public class ActivityCalculationDiscountResponseDto {
...
@@ -154,6 +154,10 @@ public class ActivityCalculationDiscountResponseDto {
private
Integer
type
;
private
Integer
type
;
private
Long
thresholdAmount
;
private
Long
thresholdAmount
;
/**
* 运费月卡入机字段
*/
private
String
tenderId
;
}
}
@Data
@Data
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java
View file @
423c03eb
...
@@ -21,6 +21,10 @@ public class ActivityDiscountsDto {
...
@@ -21,6 +21,10 @@ public class ActivityDiscountsDto {
private
String
activityName
;
private
String
activityName
;
private
Integer
discountAmount
;
private
Integer
discountAmount
;
private
Integer
activityType
;
private
Integer
activityType
;
/**
* 运费月卡入机字段
*/
private
String
tenderId
;
/**
/**
* 实际参与活动商品数量
* 实际参与活动商品数量
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
View file @
423c03eb
...
@@ -193,6 +193,7 @@ public class CalculationServiceImpl {
...
@@ -193,6 +193,7 @@ public class CalculationServiceImpl {
activityDiscountsDto
.
setActivityName
(
discount
.
getActivityName
());
activityDiscountsDto
.
setActivityName
(
discount
.
getActivityName
());
activityDiscountsDto
.
setActivityType
(
discountType
);
activityDiscountsDto
.
setActivityType
(
discountType
);
activityDiscountsDto
.
setDiscountAmount
(
0
-
discountAmount
);
activityDiscountsDto
.
setDiscountAmount
(
0
-
discountAmount
);
activityDiscountsDto
.
setTenderId
(
discount
.
getTenderId
());
activityDiscountsDtos
.
add
(
activityDiscountsDto
);
activityDiscountsDtos
.
add
(
activityDiscountsDto
);
}
}
}
}
...
...
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