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();