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
a8fbcfc9
Commit
a8fbcfc9
authored
Jul 30, 2020
by
chongfu.liang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/1.9.32-加料商品开发' into develop
parents
1dd62814
848c516f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+2
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+1
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
a8fbcfc9
...
@@ -753,10 +753,10 @@ public class OrderSdkAdapter {
...
@@ -753,10 +753,10 @@ public class OrderSdkAdapter {
}
}
if
(
ObjectUtils
.
equals
(
ProductTypeEnum
.
MATERIAL_PRODUCT
.
getCode
(),
orderItem
.
getProductType
()))
{
if
(
ObjectUtils
.
equals
(
ProductTypeEnum
.
MATERIAL_PRODUCT
.
getCode
(),
orderItem
.
getProductType
()))
{
// 获取加料子商品列表
// 获取加料子商品列表
productBean
.
setM
eterai
lProduct
(
new
ArrayList
<>());
productBean
.
setM
ateria
lProduct
(
new
ArrayList
<>());
String
partnerProductId
=
orderItem
.
getProductId
();
String
partnerProductId
=
orderItem
.
getProductId
();
List
<
OrderItemResp
>
materialProducts
=
orderItemList
.
stream
().
filter
(
item
->
ObjectUtils
.
equals
(
partnerProductId
,
item
.
getParentProductId
())).
collect
(
Collectors
.
toList
());
List
<
OrderItemResp
>
materialProducts
=
orderItemList
.
stream
().
filter
(
item
->
ObjectUtils
.
equals
(
partnerProductId
,
item
.
getParentProductId
())).
collect
(
Collectors
.
toList
());
materialProducts
.
forEach
(
material
->
productBean
.
getM
eterai
lProduct
().
add
(
getOldOrderProduct
(
orderSettlementResps
,
material
)));
materialProducts
.
forEach
(
material
->
productBean
.
getM
ateria
lProduct
().
add
(
getOldOrderProduct
(
orderSettlementResps
,
material
)));
}
}
productList
.
add
(
productBean
);
productList
.
add
(
productBean
);
}
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
a8fbcfc9
...
@@ -552,7 +552,7 @@ public class QueryOrdersResponse {
...
@@ -552,7 +552,7 @@ public class QueryOrdersResponse {
/**
/**
* 套餐子商品
* 套餐子商品
*/
*/
public
List
<
ProductBean
>
m
eterai
lProduct
;
public
List
<
ProductBean
>
m
ateria
lProduct
;
@NoArgsConstructor
@NoArgsConstructor
@Data
@Data
...
...
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