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
4b271164
Commit
4b271164
authored
Aug 31, 2020
by
徐康
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-2020/8/6-McCafe-会阳' into qa
parents
18621a56
47c7ca1d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
View file @
4b271164
...
@@ -171,7 +171,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
...
@@ -171,7 +171,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
return
orderManagerAdapter
.
orderAffirm
(
orderManagerRequest
,
null
);
return
orderManagerAdapter
.
orderAffirm
(
orderManagerRequest
,
null
);
}
else
if
(
deliveryStatus
==
DeliveryStatus
.
WATINGORDER
.
getCode
()
||
deliveryStatus
==
DeliveryStatus
.
SYSTEMGETORDER
.
getCode
()
}
else
if
(
deliveryStatus
==
DeliveryStatus
.
WATINGORDER
.
getCode
()
||
deliveryStatus
==
DeliveryStatus
.
SYSTEMGETORDER
.
getCode
()
||
deliveryStatus
==
DeliveryStatus
.
ALLOTRIDER
.
getCode
()||
deliveryStatus
==
DeliveryStatus
.
RIDERARRIVESTORE
.
getCode
())
{
||
deliveryStatus
==
DeliveryStatus
.
ALLOTRIDER
.
getCode
()||
deliveryStatus
==
DeliveryStatus
.
RIDERARRIVESTORE
.
getCode
())
{
ResponseUtil
.
success
();
return
ResponseUtil
.
success
();
}
}
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_DELIVERY_CALL_BACK_FAILED
);
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_DELIVERY_CALL_BACK_FAILED
);
}
}
...
...
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