From b9e8d5e724a5c60d0be1d8d1abe91c2491a287f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 17 Jul 2024 11:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E5=BE=85=E8=A1=A5=E5=8D=95=E8=B5=B0?= =?UTF-8?q?=E5=BE=85=E8=A1=A5=E5=8D=95=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artificer/service/impl/OrdersServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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: