From 358ae466f65f9a311d9d63a7d3c42ba0544b9d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 12 Jul 2024 15:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E8=A1=A5=E5=8D=95=E6=8B=92=E5=8D=95?= =?UTF-8?q?=E5=86=8D=E7=94=9F=E6=88=90=E5=BE=85=E8=A1=A5=E5=8D=95=E8=BF=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/artificer/service/impl/OrdersServiceImpl.java | 7 +++++-- src/main/resources/mapper/artificer/OrdersDao.xml | 3 ++- 2 files changed, 7 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 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 @@