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
5438af80
Commit
5438af80
authored
Jul 09, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sdk 升级
parent
328e4148
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
assortment-ordercenter-sdk/pom.xml
+1
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+4
-4
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
5438af80
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
2.1.
76
-RELEASE
</version>
<version>
2.1.
80
-RELEASE
</version>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
5438af80
...
@@ -948,17 +948,17 @@ public class OrderSdkAdapter {
...
@@ -948,17 +948,17 @@ public class OrderSdkAdapter {
productList
.
add
(
productBean
);
productList
.
add
(
productBean
);
}
}
if
(
null
!=
productList
&&
productList
.
size
()
>
0
)
{
if
(
null
!=
productList
&&
productList
.
size
()
>
0
)
{
List
<
QueryOrdersResponse
.
DataBean
.
OrderBean
.
ProductBean
>
originalProductLists
=
productList
;
for
(
QueryOrdersResponse
.
DataBean
.
OrderBean
.
ProductBean
sendProductBean
:
productList
)
{
for
(
QueryOrdersResponse
.
DataBean
.
OrderBean
.
ProductBean
sendProductBean
:
productList
)
{
sendProductBean
.
setIsPrint
(
true
);
sendProductBean
.
setIsPrint
(
true
);
if
(
null
!=
sendProductBean
.
getIsSendGoods
()
&&
sendProductBean
.
getIsSendGoods
()
&&
StringUtils
.
isNotEmpty
(
sendProductBean
.
getOriginalGoodsUid
()))
{
if
(
null
!=
sendProductBean
.
getIsSendGoods
()
&&
sendProductBean
.
getIsSendGoods
()
&&
StringUtils
.
isNotEmpty
(
sendProductBean
.
getOriginalGoodsUid
()))
{
sendProductBean
.
setIsPrint
(
false
);
sendProductBean
.
setIsPrint
(
false
);
}
}
if
(
StringUtils
.
isNotEmpty
(
sendProductBean
.
getCartGoodsUid
())
&&
null
!=
sendProductBean
.
getIsSendGoods
()
&&
!
sendProductBean
.
getIsSendGoods
())
{
if
(
StringUtils
.
isNotEmpty
(
sendProductBean
.
getCartGoodsUid
())
&&
null
!=
sendProductBean
.
getIsSendGoods
()
&&
!
sendProductBean
.
getIsSendGoods
())
{
sendProductBean
.
setSendProduct
(
productList
.
stream
()
sendProductBean
.
setSendProduct
(
.
filter
(
productBean
->
productBean
.
getOriginalGoodsUid
().
equalsIgnoreCase
(
sendProductBean
.
getCartGoodsUid
())
originalProductLists
.
stream
().
filter
(
productBean
->
productBean
.
getOriginalGoodsUid
().
equalsIgnoreCase
(
sendProductBean
.
getCartGoodsUid
())
&&
productBean
.
getIsSendGoods
()
==
true
)
&&
productBean
.
getIsSendGoods
()
==
true
)
.
map
(
o
->
JSON
.
parseObject
(
JSON
.
toJSONString
(
o
),
QueryOrdersResponse
.
DataBean
.
OrderBean
.
ProductBean
.
class
))
.
map
(
o
->
JSON
.
parseObject
(
JSON
.
toJSONString
(
o
),
QueryOrdersResponse
.
DataBean
.
OrderBean
.
ProductBean
.
class
))
.
collect
(
Collectors
.
toList
()));
.
collect
(
Collectors
.
toList
()));
}
}
...
...
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