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
61e555bf
Commit
61e555bf
authored
Feb 04, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
35718d61
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractApportionService.java
+2
-0
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractListCartGoodsService.java
+4
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractApportionService.java
View file @
61e555bf
...
@@ -1335,6 +1335,8 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
...
@@ -1335,6 +1335,8 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
activityTypeEnums
.
add
(
ActivityTypeEnum
.
TYPE_31
);
activityTypeEnums
.
add
(
ActivityTypeEnum
.
TYPE_31
);
GetActivityBO
getActivityBO
=
new
GetActivityBO
();
GetActivityBO
getActivityBO
=
new
GetActivityBO
();
getActivityBO
.
setActivityQueryDto
(
activityQueryDto
);
getActivityBO
.
setActivityTypeEnums
(
activityTypeEnums
);
ActivityBO
activityBO
=
promotionManager
.
queryActivityByType
(
getActivityBO
,
baseRequestDTO
.
getManagerService
().
getPromotionService
());
ActivityBO
activityBO
=
promotionManager
.
queryActivityByType
(
getActivityBO
,
baseRequestDTO
.
getManagerService
().
getPromotionService
());
fullReduction
.
setActivityBO
(
activityBO
);
fullReduction
.
setActivityBO
(
activityBO
);
if
(
activityBO
==
null
){
if
(
activityBO
==
null
){
...
...
shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractListCartGoodsService.java
View file @
61e555bf
...
@@ -1193,6 +1193,10 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
...
@@ -1193,6 +1193,10 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
activityTypeEnums
.
add
(
ActivityTypeEnum
.
TYPE_31
);
activityTypeEnums
.
add
(
ActivityTypeEnum
.
TYPE_31
);
GetActivityBO
getActivityBO
=
new
GetActivityBO
();
GetActivityBO
getActivityBO
=
new
GetActivityBO
();
getActivityBO
.
setActivityQueryDto
(
activityQueryDto
);
getActivityBO
.
setActivityTypeEnums
(
activityTypeEnums
);
ActivityBO
activityBO
=
promotionManager
.
queryActivityByType
(
getActivityBO
,
baseRequestDTO
.
getManagerService
().
getPromotionService
());
ActivityBO
activityBO
=
promotionManager
.
queryActivityByType
(
getActivityBO
,
baseRequestDTO
.
getManagerService
().
getPromotionService
());
fullReduction
.
setActivityBO
(
activityBO
);
fullReduction
.
setActivityBO
(
activityBO
);
...
...
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