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
0976ed23
Commit
0976ed23
authored
Mar 11, 2021
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add:订单完成
parent
930b17a4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
+4
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
View file @
0976ed23
...
...
@@ -194,6 +194,10 @@ public class OrderVerifyHandle {
if
(
isWaimai
(
orderBean
)
&&
ObjectUtils
.
notEqual
(
OrderStatus
.
DISTRIBUTION
.
getCode
(),
orderBean
.
getStatus
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_DELIVERY_FAILED
,
getOrderManagerResponse
(
orderBean
));
}
//三方配送正在进行,不允许操作送出 除非是骑手已经取餐
if
(!
macCafePartnerId
.
equals
(
orderBean
.
getCompanyId
())
&&
this
.
checkSaasWm
(
orderBean
)
&&
this
.
verifyThirdFlow
(
orderBean
,
request
.
getHorseman
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_MOVE_FAILED
);
}
return
ResponseUtil
.
success
();
}
...
...
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