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
25d7a4c1
Commit
25d7a4c1
authored
Oct 27, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
a596fad0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-2
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+1
-2
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
25d7a4c1
...
@@ -1173,8 +1173,7 @@ public class OrderAdapter {
...
@@ -1173,8 +1173,7 @@ public class OrderAdapter {
responseVo
.
setRefundCreateTime
(
refundCreateTime
);
responseVo
.
setRefundCreateTime
(
refundCreateTime
);
break
;
break
;
}
else
{
}
else
{
if
(
DateUtil
.
convert2Date
(
refundBean
.
getCreateTime
(),
"yyyy-MM-dd HH:mm:ss"
)
if
(
new
Date
(
Long
.
valueOf
(
refundBean
.
getCreateTime
())).
after
(
new
Date
(
Long
.
valueOf
(
latestRefundBean
.
getCreateTime
()))))
{
.
after
(
DateUtil
.
convert2Date
(
latestRefundBean
.
getCreateTime
(),
"yyyy-MM-dd HH:mm:ss"
)))
{
latestRefundBean
=
refundBean
;
latestRefundBean
=
refundBean
;
}
}
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
25d7a4c1
...
@@ -1083,8 +1083,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1083,8 +1083,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if
(
RefundStatus
.
APPLY_REFUND
.
getCode
().
equals
(
refundBean
.
getStatus
()))
{
if
(
RefundStatus
.
APPLY_REFUND
.
getCode
().
equals
(
refundBean
.
getStatus
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"商家正在处理中,请稍后……"
);
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"商家正在处理中,请稍后……"
);
}
}
if
(
new
Date
().
getTime
()
-
DateUtil
.
convert2Date
(
refundBean
.
getCreateTime
(),
"yyyy-MM-dd HH:mm:ss"
).
getTime
()
if
(
new
Date
().
getTime
()
-
Long
.
valueOf
(
refundBean
.
getCreateTime
())
<
Long
.
valueOf
(
mccafeRefundInterval
))
{
<
Long
.
valueOf
(
mccafeRefundInterval
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"退款请求太频繁,请稍后再试"
);
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"退款请求太频繁,请稍后再试"
);
}
}
}
}
...
...
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