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
2dab3dc9
Commit
2dab3dc9
authored
Nov 10, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
外卖单入机失败不限制订单必须是下单状态
parent
aa39d0e3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
+2
-1
No files found.
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
View file @
2dab3dc9
...
@@ -19,6 +19,7 @@ import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
...
@@ -19,6 +19,7 @@ import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import
com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant
;
import
com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant
;
import
com.freemud.sdk.api.assortment.message.enums.OrderType
;
import
com.freemud.sdk.api.assortment.message.enums.OrderType
;
import
com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType
;
import
com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType
;
import
com.freemud.sdk.api.assortment.order.enums.OldOrderType
;
import
com.freemud.sdk.api.assortment.order.enums.RefundStatus
;
import
com.freemud.sdk.api.assortment.order.enums.RefundStatus
;
import
com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest
;
import
com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest
;
import
com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse
;
...
@@ -209,7 +210,7 @@ public class OrderVerifyHandle {
...
@@ -209,7 +210,7 @@ public class OrderVerifyHandle {
if
(
OrderStatus
.
COMPLETE
.
getCode
().
equals
(
status
))
{
if
(
OrderStatus
.
COMPLETE
.
getCode
().
equals
(
status
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_FAIL_ORDER_IS_COMPLETE
,
getOrderManagerResponse
(
orderBean
));
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_FAIL_ORDER_IS_COMPLETE
,
getOrderManagerResponse
(
orderBean
));
}
}
if
(!
OrderStatus
.
TAKE_ORDER
.
getCode
().
equals
(
status
))
{
if
(!
OrderStatus
.
TAKE_ORDER
.
getCode
().
equals
(
status
)
&&
!
OldOrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getOrderType
())
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_FAIL_ORDER_IS_NOT_NEW
,
getOrderManagerResponse
(
orderBean
));
return
ResponseUtil
.
error
(
ResponseResult
.
REJECT_FAIL_ORDER_IS_NOT_NEW
,
getOrderManagerResponse
(
orderBean
));
}
}
return
ResponseUtil
.
success
();
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