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
0e21508a
Commit
0e21508a
authored
Jul 11, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delivery amount
parent
d7215d30
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
+2
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
View file @
0e21508a
...
@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
import
com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto
;
import
com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType
;
import
com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest
;
import
com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest
;
import
com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto
;
import
com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
...
@@ -142,7 +143,7 @@ public class DeliveryAdapter {
...
@@ -142,7 +143,7 @@ public class DeliveryAdapter {
deliveryOrderRequestDto
.
setDisplayOrderId
(
displayOrderId
);
deliveryOrderRequestDto
.
setDisplayOrderId
(
displayOrderId
);
deliveryOrderRequestDto
.
setTaxFlag
(
1
);
deliveryOrderRequestDto
.
setTaxFlag
(
1
);
if
(
CollectionUtils
.
isNotEmpty
(
order
.
getAccountList
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
order
.
getAccountList
()))
{
List
<
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
>
collect
=
order
.
getAccountList
().
stream
().
filter
(
type
->
type
!=
null
&&
!
type
.
equals
(
1
)).
collect
(
Collectors
.
toList
());
List
<
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
>
collect
=
order
.
getAccountList
().
stream
().
filter
(
type
->
type
!=
null
&&
type
.
equals
(
OldOrderAccountType
.
DELIVERY_AMOUNT
.
getCode
()
)).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
collect
))
{
if
(
CollectionUtils
.
isNotEmpty
(
collect
))
{
//配送费
//配送费
deliveryOrderRequestDto
.
setDeliveryTotal
(
collect
.
get
(
0
).
getPrice
().
intValue
());
deliveryOrderRequestDto
.
setDeliveryTotal
(
collect
.
get
(
0
).
getPrice
().
intValue
());
...
...
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