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 e2307a7..e09523f 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 @@ -3162,8 +3162,11 @@ public class OrdersServiceImpl extends ServiceImpl implements public Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type) { Orders orders = baseMapper.selectById(ordersId); //状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单 - if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){ - return Result.error("补差价的单据无法生成待补单!"); + if(!orders.getRefusalContent().equals("")){ + }else{ + if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){ + return Result.error("补差价的单据无法生成待补单!"); + } } if (orders.getStatus() == 8 || orders.getStatus() == 9 || orders.getStatus() == 10 || orders.getStatus() == 11) { if(orders.getUserPackageDetailId() !=null){ diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index e545a27..c6384b9 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -1711,7 +1711,8 @@