diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index c736bb667..58b247d93 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -224,7 +224,8 @@ public class ContractSchedule { * 凌晨5分,联营扣点和面积联营取高的需要根据接单数据来更新账单,取高的那一个 */ @Async - @Scheduled(cron = "0 5 0 * * ?") + //@Scheduled(cron = "0 5 0 * * ?") + @Scheduled(cron = "0 */5 * * * *?") public void updateRentBill() { //查询记租中的联营扣点或者取高的合同,每天更新账单截止时间为前一天的账单。 List wxMalls = wxMallMapper.findList(null); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index a381006b3..d5e9dbfe1 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -227,18 +227,18 @@ public class OrderExpiringSchedule { }); } -// //无需查询付款状态的订单-退款,回滚库存 -// order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_SCHEDU_REFUND.getCode()); -// _orderList = wxOrderMapper.selectList(new QueryWrapper(order)); -// if (null != _orderList && _orderList.size() > 0) { -// _orderList.stream().forEach(o -> { -// try { -// proxy.expiredAndReturnMoney((WxOrder) o,false,payWay); -// } catch (Exception e) { -// logger.error("参团失败退款失败" + e.getMessage()); -// } -// }); -// } + //无需查询付款状态的订单-退款,回滚库存 + order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_SCHEDU_REFUND.getCode()); + _orderList = wxOrderMapper.selectList(new QueryWrapper(order)); + if (null != _orderList && _orderList.size() > 0) { + _orderList.stream().forEach(o -> { + try { + proxy.expiredAndReturnMoney((WxOrder) o,false,payWay); + } catch (Exception e) { + logger.error("参团失败退款失败" + e.getMessage()); + } + }); + } //此处是拼团完成后,会将其他失效的订单置成该状态。需要查询是否已经付款,如果已经付款,则退款,退款回回滚库存。如果没付款,则主动回滚库存 order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode());