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 52489907f..770224b5d 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 @@ -897,14 +897,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { continue; } - // 设置挡板,8月1号之后的订单按照实际进行分账 - LocalDateTime now = LocalDateTime.now(); - LocalDateTime dateTime = LocalDateTime.of(2023, 8, 2, 0, 0, 0); - if (now.isBefore(dateTime)) { - logger.info("当前时间:{}早于:{}, 此订单不进行分账处理, 订单信息:{}", DateUtils.formatDateTime(now), DateUtils.formatDateTime(dateTime), JSON.toJSONString(orderBasicInfos)); - return; - } - // 清分账单信息 ClearingBillInfo clearingBillInfo = new ClearingBillInfo(); clearingBillInfo.setBillStatus("1"); 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 d08786b07..63d370177 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 @@ -1,5 +1,6 @@ package com.jsowell.quartz.task; +import com.alibaba.fastjson2.JSON; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.redis.RedisCache; @@ -172,6 +173,15 @@ public class JsowellTask { } // 获取日期 LocalDate yesterday = LocalDate.now().plusDays(-1); + + // 设置挡板,8月1号之后的订单按照实际进行分账 + LocalDateTime now = LocalDateTime.now(); + LocalDateTime dateTime = LocalDateTime.of(2023, 8, 2, 0, 0, 0); + if (now.isBefore(dateTime)) { + log.info("当前时间:{}早于:{}, 此订单不进行分账处理, 订单信息:{}", DateUtils.formatDateTime(now), DateUtils.formatDateTime(dateTime), JSON.toJSONString(orderBasicInfos)); + return; + } + // 调分账方法 pileMerchantInfos.parallelStream().forEach(merchant -> { orderBasicInfoService.orderSplittingOperations(merchant.getId()+"", yesterday.toString());