diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 38afaebd9..caf5d3ff6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -115,6 +115,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_c_user".equals(tableName)) { return true; } + if ("wx_c_user_basic_info".equals(tableName)) { + return true; + } if ("wx_c_user_car".equals(tableName)) { return true; } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 63891ec68..a232e4d33 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -73,7 +73,11 @@ public class CouponOrderExpiringSchedule { List list = wxCouponOrderMapper.findExpiredCouponOrderByValidDate(); CouponOrderExpiringSchedule proxy = (CouponOrderExpiringSchedule) AopContext.currentProxy(); list.stream().forEach(co -> { - proxy.refund(co); + try { + proxy.refund(co); + }catch(Exception e) { + logger.error(e.getMessage()); + } }); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 36f19672a..a9898dde5 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -158,6 +158,7 @@ public class OrderExpiringSchedule { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { try { + proxy.orderGroupBreak((WxOrder) o); proxy.returnMoney((WxOrder) o); } catch (Exception e) { logger.error("拼团券下架退款失败" + e.getMessage()); @@ -304,6 +305,17 @@ public class OrderExpiringSchedule { wxOrderService.orderClose(updateOrder); logger.info("拼团订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); } + + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void orderGroupBreak(WxOrder order) { + Date curDate = new Date(); + WxOrder updateOrder = new WxOrder(); + updateOrder.setId(order.getId()); + updateOrder.updateTenantInfo(order); + updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); + updateOrder.setUpdateDate(curDate); + wxOrderMapper.updateById(updateOrder); + } /** * 回调会再次扣减库存