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
6451ddd8
Commit
6451ddd8
authored
May 07, 2020
by
shuhu.hou@freemud.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
忽略门店商户校验,兼容爱马哥
parent
f2324e84
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
+6
-6
No files found.
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
View file @
6451ddd8
...
@@ -64,7 +64,7 @@ public class OrderVerifyHandle {
...
@@ -64,7 +64,7 @@ public class OrderVerifyHandle {
if
(!
OrderStatus
.
TAKE_ORDER
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
if
(!
OrderStatus
.
TAKE_ORDER
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_CANNOT_CONFIRM
,
getOrderManagerResponse
(
orderBean
));
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_CANNOT_CONFIRM
,
getOrderManagerResponse
(
orderBean
));
}
}
return
commonVerify
(
orderBean
,
request
);
return
ResponseUtil
.
success
(
);
}
}
/**
/**
...
@@ -97,7 +97,7 @@ public class OrderVerifyHandle {
...
@@ -97,7 +97,7 @@ public class OrderVerifyHandle {
if
(!
OrderStatus
.
RECEIPT
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
if
(!
OrderStatus
.
RECEIPT
.
getCode
().
equals
(
orderBean
.
getStatus
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_SEND_STATUS_NOTAKE
,
getOrderManagerResponse
(
orderBean
));
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_SEND_STATUS_NOTAKE
,
getOrderManagerResponse
(
orderBean
));
}
}
return
commonVerify
(
orderBean
,
request
);
return
ResponseUtil
.
success
(
);
}
}
...
@@ -160,7 +160,7 @@ public class OrderVerifyHandle {
...
@@ -160,7 +160,7 @@ public class OrderVerifyHandle {
if
(
isWaimai
(
orderBean
)
&&
ObjectUtils
.
notEqual
(
OrderStatus
.
DISTRIBUTION
.
getCode
(),
orderBean
.
getStatus
()))
{
if
(
isWaimai
(
orderBean
)
&&
ObjectUtils
.
notEqual
(
OrderStatus
.
DISTRIBUTION
.
getCode
(),
orderBean
.
getStatus
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_DELIVERY_FAILED
,
getOrderManagerResponse
(
orderBean
));
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_DELIVERY_FAILED
,
getOrderManagerResponse
(
orderBean
));
}
}
return
commonVerify
(
orderBean
,
request
);
return
ResponseUtil
.
success
(
);
}
}
/**
/**
...
@@ -194,7 +194,7 @@ public class OrderVerifyHandle {
...
@@ -194,7 +194,7 @@ public class OrderVerifyHandle {
if
(!
OrderStatus
.
TAKE_ORDER
.
getCode
().
equals
(
status
))
{
if
(!
OrderStatus
.
TAKE_ORDER
.
getCode
().
equals
(
status
))
{
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
commonVerify
(
orderBean
,
request
);
return
ResponseUtil
.
success
(
);
}
}
/**
/**
...
@@ -226,7 +226,7 @@ public class OrderVerifyHandle {
...
@@ -226,7 +226,7 @@ public class OrderVerifyHandle {
if
(
isCanRefund
)
{
if
(
isCanRefund
)
{
orderBean
.
setAmount
(
getRefundAmount
(
orderBean
).
longValue
());
orderBean
.
setAmount
(
getRefundAmount
(
orderBean
).
longValue
());
}
}
return
commonVerify
(
orderBean
,
request
);
return
ResponseUtil
.
success
(
);
}
}
/**
/**
...
@@ -255,7 +255,7 @@ public class OrderVerifyHandle {
...
@@ -255,7 +255,7 @@ public class OrderVerifyHandle {
||
OrderStatus
.
CANCEL
.
getCode
().
equals
(
orderBean
.
getStatus
())))
{
||
OrderStatus
.
CANCEL
.
getCode
().
equals
(
orderBean
.
getStatus
())))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_REJECT_REFUND_STATUS_END
);
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_REJECT_REFUND_STATUS_END
);
}
}
return
commonVerify
(
orderBean
,
request
);
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