clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

已取消/已完成的订单不能再取消

This commit is contained in:
HH 2023-04-18 13:26:00 +08:00
parent 4e253e37a6
commit 0f34e80746
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -247,8 +247,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
public void cancel(long orderDetailId) throws BaseAdaPayException { public void cancel(long orderDetailId) throws BaseAdaPayException {
OrderDetail orderDetail = selectById(orderDetailId); OrderDetail orderDetail = selectById(orderDetailId);
Assert.notNull(orderDetail, "找不到对应的子订单"); Assert.notNull(orderDetail, "找不到对应的子订单");
if (OrderStatus.CANCEL.code() == orderDetail.getOrderStatus()) { if (OrderStatus.FINISH.code() == orderDetail.getOrderStatus() || OrderStatus.CANCEL.code() == orderDetail.getOrderStatus()) {
logger.info("子订单[id={}]已经是取消状态了", orderDetailId); logger.info("子订单[id={}]状态不正确，orderStatus={}", orderDetailId, orderDetail.getOrderStatus());
return; return;
} }
// 更新子订单状态 // 更新子订单状态

4
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -332,6 +332,10 @@ public class OrderMasterServiceImpl implements OrderMasterService {
Assert.notNull(orderMaster, "找不到对应的订单"); Assert.notNull(orderMaster, "找不到对应的订单");
if (Integer.valueOf(1).equals(agree)) { if (Integer.valueOf(1).equals(agree)) {
// 师傅同意取消订单 // 师傅同意取消订单
if (OrderStatus.FINISH.code() == orderMaster.getOrderStatus() || OrderStatus.CANCEL.code() == orderMaster.getOrderStatus()) {
logger.info("订单[id={}]状态不正确，orderStatus={}", orderMasterId, orderMaster.getOrderStatus());
return;
}
// 把主订单状态设置为已取消 // 把主订单状态设置为已取消
updateStatus(orderMasterId, OrderStatus.CANCEL.code()); updateStatus(orderMasterId, OrderStatus.CANCEL.code());
// 把所有子订单状态设置为已取消 // 把所有子订单状态设置为已取消