Commit 7f11a6a1 authored by Junling Bu's avatar Junling Bu
Browse files

fix[litemall-db, litemall-wx-api]: #271

parent b06349de
...@@ -144,6 +144,12 @@ public class OrderUtil { ...@@ -144,6 +144,12 @@ public class OrderUtil {
return OrderUtil.STATUS_CREATE == litemallOrder.getOrderStatus().shortValue(); 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) { public static boolean isPayStatus(LitemallOrder litemallOrder) {
return OrderUtil.STATUS_PAY == litemallOrder.getOrderStatus().shortValue(); return OrderUtil.STATUS_PAY == litemallOrder.getOrderStatus().shortValue();
} }
......
...@@ -613,7 +613,7 @@ public class WxOrderService { ...@@ -613,7 +613,7 @@ public class WxOrderService {
} }
// 检查这个订单是否已经处理过 // 检查这个订单是否已经处理过
if (OrderUtil.isPayStatus(order) && order.getPayId() != null) { if (OrderUtil.hasPayed(order)) {
return WxPayNotifyResponse.success("订单已经处理成功!"); return WxPayNotifyResponse.success("订单已经处理成功!");
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment