Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
7f11a6a1
Commit
7f11a6a1
authored
Sep 28, 2019
by
Junling Bu
Browse files
fix[litemall-db, litemall-wx-api]: #271
parent
b06349de
Changes
2
Hide whitespace changes
Inline
Side-by-side
litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java
View file @
7f11a6a1
...
...
@@ -144,6 +144,12 @@ public class OrderUtil {
return
OrderUtil
.
STATUS_CREATE
==
litemallOrder
.
getOrderStatus
().
shortValue
();
}
public
static
boolean
hasPayed
(
Order
order
)
{
return
OrderUtil
.
STATUS_CREATE
!=
order
.
getOrderStatus
()
&&
OrderUtil
.
STATUS_CANCEL
!=
order
.
getOrderStatus
()
&&
OrderUtil
.
STATUS_AUTO_CANCEL
!=
order
.
getOrderStatus
();
}
public
static
boolean
isPayStatus
(
LitemallOrder
litemallOrder
)
{
return
OrderUtil
.
STATUS_PAY
==
litemallOrder
.
getOrderStatus
().
shortValue
();
}
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java
View file @
7f11a6a1
...
...
@@ -613,7 +613,7 @@ public class WxOrderService {
}
// 检查这个订单是否已经处理过
if
(
OrderUtil
.
i
sPay
Status
(
order
)
&&
order
.
getPayId
()
!=
null
)
{
if
(
OrderUtil
.
ha
sPay
ed
(
order
))
{
return
WxPayNotifyResponse
.
success
(
"订单已经处理成功!"
);
}
...
...
Write
Preview
Supports
Markdown
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