diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index 4e08452..d486b27 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -691,7 +691,7 @@ public class OrderServiceImpl implements OrderService { @Override public void rejectRentOrder(RejectOrderReq rejectOrderReq) { OrderMainPO orderMainPO = queryOrderMainPoByOrderNo(rejectOrderReq.getOrderNo(), "0"); - if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode())||!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){ + if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode()) && !orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){ throw new BizException("订单状态异常,非待取车或待还车状态,无法驳回"); } SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken(); @@ -726,11 +726,12 @@ public class OrderServiceImpl implements OrderService { fdSubOrder.setPaymentId(orderSubPO.getPaymentId()); fdSubOrder.setRefundId(outRefundNo); fdSubOrder.setRemark(rejectOrderReq.getRejectReason()); + fdSubOrder.setCreatedAt(LocalDateTime.now()); orderSubRepo.save(fdSubOrder); } } }); - } else if(orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){ + } else { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode()); updateWrapper.set(OrderMainPO::getActEndRentTime, LocalDateTime.now());