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
a182841d
Commit
a182841d
authored
Dec 10, 2020
by
徐康
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into qa
parents
c575b6b2
ed0a8901
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+2
-3
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
a182841d
...
...
@@ -1241,10 +1241,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
requestVo
.
setTransId
(
orderId
);
}
String
trackingNo
=
LogTreadLocal
.
getTrackingNo
();
Integer
refundStatus
=
requestVo
.
getRefundStatus
();
if
(!
Objects
.
equals
(
refundStatus
,
ResponseCodeConstant
.
RESPONSE_SUCCESS
))
{
if
(!
Objects
.
equals
(
requestVo
.
getRefundStatus
(),
RefundStatus
.
COMPLETE_REFUND
.
getCode
()))
{
//只有退款成功更新状态.其他情况不处理
return
refundFailedMessage
(
"pay refundStatus is not
100,refundStatus="
+
refundStatus
);
return
refundFailedMessage
(
"pay refundStatus is not
4,refundStatus="
+
requestVo
.
getRefundStatus
()
);
}
// 如果transId为空,返回失败
if
(
StringUtils
.
isBlank
(
requestVo
.
getTransId
()))
{
...
...
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