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
fff49463
Commit
fff49463
authored
Dec 07, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退款回调
parent
aaf75412
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+6
-6
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
fff49463
...
@@ -1227,7 +1227,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1227,7 +1227,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
public
String
mcCafeRefundNotifyCallback
(
RefundNotifyCallbackRequestVo
requestVo
)
{
public
String
mcCafeRefundNotifyCallback
(
RefundNotifyCallbackRequestVo
requestVo
)
{
if
(
StringUtils
.
isEmpty
(
requestVo
.
getTransId
()))
{
if
(
StringUtils
.
isEmpty
(
requestVo
.
getTransId
()))
{
//订单号不能为空
//订单号不能为空
return
refundFaileMessage
(
"transId is can not empty"
);
return
refundFaile
d
Message
(
"transId is can not empty"
);
}
}
//混合支付需要从缓存中获取订单号码,正常支付TransId = orderId
//混合支付需要从缓存中获取订单号码,正常支付TransId = orderId
String
orderId
=
redisCache
.
getValue
(
RedisUtil
.
getPaymentTransIdOrderKey
(
requestVo
.
getTransId
()));
String
orderId
=
redisCache
.
getValue
(
RedisUtil
.
getPaymentTransIdOrderKey
(
requestVo
.
getTransId
()));
...
@@ -1238,16 +1238,16 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1238,16 +1238,16 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
Integer
refundStatus
=
requestVo
.
getRefundStatus
();
Integer
refundStatus
=
requestVo
.
getRefundStatus
();
if
(!
Objects
.
equals
(
refundStatus
,
ResponseCodeConstant
.
RESPONSE_SUCCESS
))
{
if
(!
Objects
.
equals
(
refundStatus
,
ResponseCodeConstant
.
RESPONSE_SUCCESS
))
{
//只有退款成功更新状态.其他情况不处理
//只有退款成功更新状态.其他情况不处理
return
refundFaileMessage
(
"pay refundStatus is not 100,refundStatus="
+
refundStatus
);
return
refundFaile
d
Message
(
"pay refundStatus is not 100,refundStatus="
+
refundStatus
);
}
}
// 如果transId为空,返回失败
// 如果transId为空,返回失败
if
(
StringUtils
.
isBlank
(
requestVo
.
getTransId
()))
{
if
(
StringUtils
.
isBlank
(
requestVo
.
getTransId
()))
{
return
refundFaileMessage
(
"transId is empty "
+
requestVo
);
return
refundFaile
d
Message
(
"transId is empty "
+
requestVo
);
}
}
//查询订单详情
//查询订单详情
QueryRelationOrderByIdResponseDto
queryOrderByIdResponseDto
=
getQueryRelationOrderByIdResponseDto
(
requestVo
.
getTransId
());
QueryRelationOrderByIdResponseDto
queryOrderByIdResponseDto
=
getQueryRelationOrderByIdResponseDto
(
requestVo
.
getTransId
());
if
(
queryOrderByIdResponseDto
.
getData
()
==
null
||
!
Objects
.
equals
(
ResponseCodeConstant
.
RESPONSE_SUCCESS
,
queryOrderByIdResponseDto
.
getErrcode
()))
{
if
(
queryOrderByIdResponseDto
.
getData
()
==
null
||
!
Objects
.
equals
(
ResponseCodeConstant
.
RESPONSE_SUCCESS
,
queryOrderByIdResponseDto
.
getErrcode
()))
{
return
refundFaileMessage
(
"order query fail "
+
queryOrderByIdResponseDto
);
return
refundFaile
d
Message
(
"order query fail "
+
queryOrderByIdResponseDto
);
}
}
OrderBean
orderBean
=
new
OrderBean
();
OrderBean
orderBean
=
new
OrderBean
();
...
@@ -1281,7 +1281,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1281,7 +1281,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if
(
baseOrderResponse
==
null
||
baseOrderResponse
.
getData
()
==
null
||
!
ObjectUtils
.
equals
(
ResponseConstant
.
SUCCESS_RESPONSE_CODE
,
baseOrderResponse
.
getErrcode
()))
{
if
(
baseOrderResponse
==
null
||
baseOrderResponse
.
getData
()
==
null
||
!
ObjectUtils
.
equals
(
ResponseConstant
.
SUCCESS_RESPONSE_CODE
,
baseOrderResponse
.
getErrcode
()))
{
LogUtil
.
error
(
"mcCafeRefundNotifyCallback"
,
orderRefundRequest
,
baseOrderResponse
);
LogUtil
.
error
(
"mcCafeRefundNotifyCallback"
,
orderRefundRequest
,
baseOrderResponse
);
return
refundFaileMessage
(
"create after sale order failed"
);
return
refundFaile
d
Message
(
"create after sale order failed"
);
}
}
...
@@ -1355,7 +1355,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1355,7 +1355,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
/**
/**
* 退款中回调失败返回信息
* 退款中回调失败返回信息
*/
*/
public
String
refundFaileMessage
(
String
errorMes
)
{
public
String
refundFaile
d
Message
(
String
errorMes
)
{
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
map
.
put
(
"code"
,
500
);
map
.
put
(
"code"
,
500
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
...
...
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