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
1f797f10
Commit
1f797f10
authored
Aug 07, 2020
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
C端加料
parent
ceab59d5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+5
-0
order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java
+2
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
1f797f10
...
...
@@ -1626,6 +1626,11 @@ public class OrderAdapter {
productBean
.
getComboProduct
().
forEach
(
product
->
setMealProducts
.
add
(
convent2ProductVo
(
product
)));
productVo
.
setSetMealProducts
(
setMealProducts
);
}
if
(
ObjectUtils
.
equals
(
ProductTypeEnum
.
MATERIAL_PRODUCT
.
getCode
(),
productBean
.
getProductType
()))
{
List
<
ProductVo
>
setMaterialProducts
=
new
ArrayList
<>();
productBean
.
getMaterialProduct
().
forEach
(
product
->
setMaterialProducts
.
add
(
convent2ProductVo
(
product
)));
productVo
.
setSetMaterialProducts
(
setMaterialProducts
);
}
productVos
.
add
(
productVo
);
}
productVos
.
sort
(
Comparator
.
comparing
(
ProductVo:
:
getSequence
));
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java
View file @
1f797f10
...
...
@@ -152,4 +152,6 @@ public class ProductVo {
private
List
<
InventedParentActivityVo
>
InventedParentActivitiesVo
;
private
List
<
ProductVo
>
setMaterialProducts
;
}
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