mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-12 19:29:52 +08:00
设置挡板,8月1号之后的订单按照实际进行分账
This commit is contained in:
@@ -897,6 +897,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
|||||||
if (CollectionUtils.isEmpty(orderBasicInfos)) {
|
if (CollectionUtils.isEmpty(orderBasicInfos)) {
|
||||||
continue;
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 执行分账
|
||||||
orderBasicInfos.parallelStream().forEach(x -> {
|
orderBasicInfos.parallelStream().forEach(x -> {
|
||||||
try {
|
try {
|
||||||
doPaymentConfirm(x, adapayMemberAccount);
|
doPaymentConfirm(x, adapayMemberAccount);
|
||||||
@@ -915,13 +925,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void doPaymentConfirm(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount) throws BaseAdaPayException {
|
public void doPaymentConfirm(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount) throws BaseAdaPayException {
|
||||||
LocalDateTime now = LocalDateTime.now();
|
|
||||||
LocalDateTime dateTime = LocalDateTime.of(2023, 8, 1, 0, 0, 0);
|
|
||||||
if (now.isBefore(dateTime)) {
|
|
||||||
logger.info("当前时间:{}早于:{}, 此订单不进行分账处理, 订单信息:{}", DateUtils.formatDateTime(now), DateUtils.formatDateTime(dateTime), JSON.toJSONString(orderBasicInfo));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 查询订单的交易id
|
// 查询订单的交易id
|
||||||
AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderBasicInfo.getOrderCode());
|
AdapayCallbackRecord adapayCallbackRecord = adapayCallbackRecordService.selectByOrderCode(orderBasicInfo.getOrderCode());
|
||||||
if (adapayCallbackRecord == null) {
|
if (adapayCallbackRecord == null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user