diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 6371ee6..06b5ae8 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -2018,10 +2018,13 @@ public class OrdersServiceImpl extends ServiceImpl implements return Result.error("项目加钟之后,无法取消!"); } }else if(orders.getStatus() == 10) { - return cancelSupplementOrders(userId,ordersId,0,2); + String remarks = "取消订单将扣除:0元的手续费!"; + return Result.success().put("data",remarks); + }else if(orders.getStatus() == 9) { if(orders.getRefusalContent()!=null && !orders.getRefusalContent().equals("")){ - return cancelSupplementOrders(userId,ordersId,0,3); + String remarks = "取消订单将扣除:0元的手续费!"; + return Result.success().put("data",remarks); } } //按时间扣款,获取扣款金额 @@ -2110,7 +2113,7 @@ public class OrdersServiceImpl extends ServiceImpl implements return Result.success().put("data",remarks); } - @Override + @Override @Transactional public Result cancelOrders(Long userId, Long ordersId) { Orders orders = baseMapper.selectById(ordersId); @@ -2126,6 +2129,12 @@ public class OrdersServiceImpl extends ServiceImpl implements if(orders.getParentId() != null && orders.getParentId() != 0){ return Result.error("项目加钟之后,无法取消!"); } + }else if(orders.getStatus() == 10) { + return cancelSupplementOrders(userId,ordersId,0,2); + }else if(orders.getStatus() == 9) { + if(orders.getRefusalContent()!=null && !orders.getRefusalContent().equals("")){ + return cancelSupplementOrders(userId,ordersId,0,3); + } } switch (orders.getStatus()){ case 1: