diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index b8cce2a14..fa89b47e6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -687,26 +687,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (CollectionUtils.isEmpty(orderList)) { return; } - // long currentTimeMillis = System.currentTimeMillis(); - for (OrderBasicInfo orderBasicInfo : orderList) { - // 判断支付成功时间距当前时间是否大于15分钟 - // long time; - // String startType = orderBasicInfo.getStartType(); - // // 立即启动的订单使用支付时间判断,预约充电的订单使用预约时间判断 - // if (StringUtils.equals(StartTypeEnum.NOW.getValue(), startType)) { - // Date payTime = orderBasicInfo.getPayTime(); - // time = payTime == null ? 0L : payTime.getTime(); - // } else { - // Date reservedStartTime = orderBasicInfo.getReservedStartTime(); - // time = reservedStartTime == null ? 0L : reservedStartTime.getTime(); - // } - // - // if (currentTimeMillis - time < 1000 * 60 * 15) { - // logger.info("orderCode:{}, currentTimeMillis:{} - time:{} = {}, 支付成功时间距当前时间小于15分钟, 暂不执行退款", - // orderBasicInfo.getOrderCode(), currentTimeMillis, time, currentTimeMillis - time); - // continue; - // } + for (OrderBasicInfo orderBasicInfo : orderList) { // 判断支付成功时间距当前时间是否大于15分钟 String startType = orderBasicInfo.getStartType(); // 立即启动的订单使用支付时间判断,预约充电的订单使用预约时间判断 diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index 5d7a48221..20b8753eb 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -29,9 +29,6 @@ import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.thirdparty.amap.service.AMapService; import com.jsowell.thirdparty.common.NotificationDTO; import com.jsowell.thirdparty.common.NotificationService; -import com.jsowell.thirdparty.platform.service.impl.GuiZhouPlatformServiceImpl; -import com.jsowell.thirdparty.platform.service.impl.JiLinPlatformServiceImpl; -import com.jsowell.thirdparty.platform.service.impl.SiChuanPlatformServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -94,7 +91,7 @@ public class JsowellTask { String env = SpringUtils.getActiveProfile(); if (StringUtils.equalsIgnoreCase(env, "pre")) { log.debug("PRE环境不执行"); - return; + // return; } }