mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-19 18:45:03 +08:00
update 暂时开放pre环境执行定时任务
This commit is contained in:
@@ -687,26 +687,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
|||||||
if (CollectionUtils.isEmpty(orderList)) {
|
if (CollectionUtils.isEmpty(orderList)) {
|
||||||
return;
|
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分钟
|
// 判断支付成功时间距当前时间是否大于15分钟
|
||||||
String startType = orderBasicInfo.getStartType();
|
String startType = orderBasicInfo.getStartType();
|
||||||
// 立即启动的订单使用支付时间判断,预约充电的订单使用预约时间判断
|
// 立即启动的订单使用支付时间判断,预约充电的订单使用预约时间判断
|
||||||
|
|||||||
@@ -29,9 +29,6 @@ import com.jsowell.pile.vo.web.BillingTemplateVO;
|
|||||||
import com.jsowell.thirdparty.amap.service.AMapService;
|
import com.jsowell.thirdparty.amap.service.AMapService;
|
||||||
import com.jsowell.thirdparty.common.NotificationDTO;
|
import com.jsowell.thirdparty.common.NotificationDTO;
|
||||||
import com.jsowell.thirdparty.common.NotificationService;
|
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.apache.commons.collections4.CollectionUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -94,7 +91,7 @@ public class JsowellTask {
|
|||||||
String env = SpringUtils.getActiveProfile();
|
String env = SpringUtils.getActiveProfile();
|
||||||
if (StringUtils.equalsIgnoreCase(env, "pre")) {
|
if (StringUtils.equalsIgnoreCase(env, "pre")) {
|
||||||
log.debug("PRE环境不执行");
|
log.debug("PRE环境不执行");
|
||||||
return;
|
// return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user