From 2c5d9393cb8eeb43acccf368bd1929b4f02529d7 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 27 Jun 2019 09:51:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E8=BF=87=E6=9C=9F=E6=89=93=E5=8D=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/OrderExpiringSchedule.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 1a0d7a1b9..fbe4a8c8d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -82,7 +82,7 @@ public class OrderExpiringSchedule { List orderPresss = wxOrderMapper.findListOfCompleteUnPaidPressOrderByDate(dateMap); orderPresss.stream().forEach( o -> { try { - orderPressExpired(o); + orderPressExpired(o, true); } catch (Exception e) { logger.error("砍价券支付过期失败" + e.getMessage()); } @@ -93,7 +93,7 @@ public class OrderExpiringSchedule { orderPresss = wxOrderMapper.findListOfUnpaidPressOrderByDate(dateMap); orderPresss.stream().forEach( o -> { try { - orderPressExpired(o); + orderPressExpired(o, false); } catch (Exception e) { logger.error("砍价券过期失败" +e.getMessage()); } @@ -165,7 +165,7 @@ public class OrderExpiringSchedule { } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void orderPressExpired(WxOrder order) { + public void orderPressExpired(WxOrder order, boolean payExpired) { Date curDate = new Date(); WxOrder updateOrder = new WxOrder(); updateOrder.setId(order.getId()); @@ -176,7 +176,11 @@ public class OrderExpiringSchedule { // 库存退回 wxOrderService.stockBack(order); - logger.info("砍价订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); + if(payExpired) { + logger.info("砍价订单: 支付过期" + order.getId() + " create at " + order.getCreateDate() + ", update at " + order.getUpdateDate() + " expired at " + curDate); + } else { + logger.info("砍价订单: 过期" + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); + } }