sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zhangli-test #1

Merged
zhangli merged 2 commits from zhangli-test into main 2025-09-07 21:57:17 +08:00
Conversation 0 Commits 2 Files Changed 2 +3 -1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -745,6 +745,7 @@ public class OrderServiceImpl implements OrderService {
fdSubOrder.setAmount(orderMainPO.getOrderAmount());
fdSubOrder.setPaymentMethod(orderSubPO.getPaymentMethod());
fdSubOrder.setPayStatus(PayStatusEnum.REFUNDING.getCode());
fdSubOrder.setPaymentId(orderSubPO.getPaymentId());
fdSubOrder.setRefundId(outRefundNo);
fdSubOrder.setRemark(rejectOrderReq.getRejectReason());
orderSubRepo.save(fdSubOrder);
@ -1022,6 +1023,7 @@ public class OrderServiceImpl implements OrderService {
fdSubOrder.setPaymentMethod(orderSubPO.getPaymentMethod());
fdSubOrder.setPayStatus(PayStatusEnum.REFUNDING.getCode());
fdSubOrder.setRefundId(outRefundNo);
fdSubOrder.setPaymentId(orderSubPO.getPaymentId());
fdSubOrder.setCreatedAt(LocalDateTime.now());
orderSubRepo.save(fdSubOrder);
}

2
src/main/java/com/sczx/order/task/NoPayOrderProcessTask.java
View File

@ -64,7 +64,7 @@ public class NoPayOrderProcessTask {
try {
// 查询所有进行中的订单且当前时间已超过预计还车时间
LambdaQueryWrapper<OrderMainPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(OrderMainPO::getOrderStatus,
queryWrapper.eq(OrderMainPO::getDelFlag, "0").in(OrderMainPO::getOrderStatus,
Arrays.asList(OrderStatusEnum.WAIT_PAY.getCode(), OrderStatusEnum.RERENT_WAIT_PAY.getCode()))
.lt(OrderMainPO::getUpdateTime, LocalDateTime.now().minusHours(1));