From 7f11a6a13f7485bde5ffa914567585680f0a3bf8 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sat, 28 Sep 2019 23:12:26 +0800 Subject: [PATCH] fix[litemall-db, litemall-wx-api]: #271 --- .../java/org/linlinjava/litemall/db/util/OrderUtil.java | 6 ++++++ .../org/linlinjava/litemall/wx/service/WxOrderService.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java index 9abb7cfd..7b31e585 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java @@ -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(); } diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java index 4b10ad12..0d562d2a 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java @@ -613,7 +613,7 @@ public class WxOrderService { } // 检查这个订单是否已经处理过 - if (OrderUtil.isPayStatus(order) && order.getPayId() != null) { + if (OrderUtil.hasPayed(order)) { return WxPayNotifyResponse.success("订单已经处理成功!"); }