From 884e15934a455e851dca5c3c6c68b8ee826afad9 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sat, 10 Oct 2020 18:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E5=AE=9A=E6=97=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/OrderExpiringSchedule.java | 20 +++++++++++++++---- .../com/iformall/mapper/WxOrderMapper.java | 2 ++ .../main/resources/mapper/WxOrderMapper.xml | 16 +++++++++++++++ 3 files changed, 34 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 6e643fa65..e51dca272 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -140,14 +140,26 @@ public class OrderExpiringSchedule { // 拼团取消 WxOrder order = new WxOrder(); - order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); - wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { +// order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); +// wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { +// try { +// proxy.orderGroupExpired((WxOrder) o,true,true,payWay); +// } catch (Exception e) { +// logger.error("拼团取消失败" + e.getMessage()); +// } +// }); + Date groupExpireDate = new Date(curDate.getTime() - NORMAL_TIME_OUT ); + dateMap.put("type", EnumOrderType.COUPON.getCode()); + dateMap.put("endDate", groupExpireDate); + List orderGroups = wxOrderMapper.findListOfUnpaidGroupOrderByDate(dateMap); + orderGroups.stream().forEach( o -> { try { - proxy.orderGroupExpired((WxOrder) o,true,true,payWay); + proxy.orderGroupExpired(o,true,true,payWay); } catch (Exception e) { - logger.error("拼团取消失败" + e.getMessage()); + logger.error("砍价券支付过期失败" + e.getMessage()); } }); + //更新拼团过期状态 wxOrderMapper.updateOrderStatusForGroup(); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index 4dbc72579..224151a8f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -21,6 +21,8 @@ public interface WxOrderMapper extends CommonMapper { List findListOfUnpaidPressOrderByDate(Map dateMap); List findListOfCompleteUnPaidPressOrderByDate(Map dateMap); + List findListOfUnpaidGroupOrderByDate(Map dateMap); + List findListOfCUser(WxOrder wxOrder); List selectDetailOfCUser(WxOrder wxOrder); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index d4ad86213..0507938de 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -218,6 +218,22 @@ AND unix_timestamp(`update_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) + +