From 779f1838f9d6008ea206f1ab9e14f599fb7c004b Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 21 Jun 2020 16:03:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/OrderExpiringSchedule.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 6955385a4..b92d7edd1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -147,8 +147,7 @@ public class OrderExpiringSchedule { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()); wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { - proxy.orderGroupExpired((WxOrder) o,false); - proxy.returnMoney((WxOrder) o); + proxy.expiredAndReturnMoney((WxOrder) o,false); } catch (Exception e) { logger.error("拼团过期退款失败" + e.getMessage()); } @@ -169,8 +168,7 @@ public class OrderExpiringSchedule { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { - proxy.orderGroupExpired((WxOrder) o,true); - proxy.returnMoney((WxOrder) o); + proxy.expiredAndReturnMoney((WxOrder) o,true); } catch (Exception e) { logger.error("参团失败退款失败" + e.getMessage()); } @@ -180,8 +178,7 @@ public class OrderExpiringSchedule { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_SCHEDU_REFUND.getCode()); wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { - proxy.orderGroupExpired((WxOrder) o,false); - proxy.returnMoney((WxOrder) o); + proxy.expiredAndReturnMoney((WxOrder) o,false); } catch (Exception e) { logger.error("参团失败退款失败" + e.getMessage()); } @@ -189,7 +186,12 @@ public class OrderExpiringSchedule { } - + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void expiredAndReturnMoney(WxOrder wxOrder,boolean checkRealPay) { + orderGroupExpired(wxOrder,checkRealPay); + returnMoney(wxOrder); + } + public boolean wxPaySuccess(WxOrder order) { WxPayOrder payOrderq = new WxPayOrder();