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

Compare commits

base: sczx_group:3d91ab0aad90efb9b0d2ece3e1999f1206df0d95
Branches Tags
sczx_group:main sczx_group:zhangli-test
...
compare: sczx_group:cdb398512080c2ff5bbaca9099ab4136208fc771
Branches Tags
sczx_group:main sczx_group:zhangli-test

7 Commits
3d91ab0aad ... cdb3985120

Author SHA1 Message Date
zhangli
cdb3985120 Merge branch 'main' into zhangli-test 2025-09-18 22:37:56 +08:00
zhangli
1afa9895b0 解决驳回添加子订单缺时间 2025-09-16 16:22:58 +08:00
zhangli
b2ea7e7a02 驳回修改 2025-09-16 16:11:59 +08:00
zhangli
711f7c5954 Merge pull request '测试合并' (#10) from zhangli-test into main 
Reviewed-on: #10
 2025-09-14 11:44:59 +08:00
zhangli
859fcdc118 Merge pull request '未提车和未还车没处理的订单处理' (#9) from zhangli-test into main 
Reviewed-on: #9
 2025-09-14 11:42:44 +08:00
zhangli
6ce070ffc7 Merge pull request '111' (#8) from zhangli-test into main 
Reviewed-on: #8
 2025-09-13 22:26:04 +08:00
zhangli
6b0a8ce008 Merge pull request 'zhangli-test' (#7) from zhangli-test into main 
Reviewed-on: #7
 2025-09-13 20:36:27 +08:00
1 changed files with 3 additions and 2 deletions
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
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<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
updateWrapper.set(OrderMainPO::getActEndRentTime, LocalDateTime.now());