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

Merge branch 'main' into zhangli-test

Browse Source
This commit is contained in:
zhangli
2025-09-18 22:37:56 +08:00
parent 3d91ab0aad 1afa9895b0
commit cdb3985120
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -691,7 +691,7 @@ public class OrderServiceImpl implements OrderService {
@Override @Override
public void rejectRentOrder(RejectOrderReq rejectOrderReq) { public void rejectRentOrder(RejectOrderReq rejectOrderReq) {
OrderMainPO orderMainPO = queryOrderMainPoByOrderNo(rejectOrderReq.getOrderNo(), "0"); 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("订单状态异常,非待取车或待还车状态,无法驳回"); throw new BizException("订单状态异常,非待取车或待还车状态,无法驳回");
} }
SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken(); SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
@ -726,11 +726,12 @@ public class OrderServiceImpl implements OrderService {
fdSubOrder.setPaymentId(orderSubPO.getPaymentId()); fdSubOrder.setPaymentId(orderSubPO.getPaymentId());
fdSubOrder.setRefundId(outRefundNo); fdSubOrder.setRefundId(outRefundNo);
fdSubOrder.setRemark(rejectOrderReq.getRejectReason()); fdSubOrder.setRemark(rejectOrderReq.getRejectReason());
fdSubOrder.setCreatedAt(LocalDateTime.now());
orderSubRepo.save(fdSubOrder); orderSubRepo.save(fdSubOrder);
} }
} }
}); });
} else if(orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){ } else {
LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode()); updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
updateWrapper.set(OrderMainPO::getActEndRentTime, LocalDateTime.now()); updateWrapper.set(OrderMainPO::getActEndRentTime, LocalDateTime.now());