From 2a1f11bfcde65f2e2f8ad8e610d9e5485cf09f3a Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Fri, 16 Jan 2026 10:18:11 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=A0=E9=99=A4=E7=9F=BF=E6=9C=BA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LeaseMachineServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java index 6b7c119..0c96933 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseMachineServiceImpl.java @@ -7,10 +7,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.m2pool.lease.dto.*; import com.m2pool.lease.dto.v2.*; -import com.m2pool.lease.entity.LeaseMachine; -import com.m2pool.lease.entity.LeaseMachineConfig; -import com.m2pool.lease.entity.LeaseMachinePrice; -import com.m2pool.lease.entity.LeaseShop; +import com.m2pool.lease.entity.*; import com.m2pool.lease.exception.MachineException; import com.m2pool.lease.mapper.*; import com.m2pool.lease.service.LeaseMachineConfigService; @@ -61,6 +58,9 @@ public class LeaseMachineServiceImpl extends ServiceImpl().eq(LeaseShop::getUserEmail, SecurityUtils.getUsername()) .eq(LeaseShop::getDel, false)); @@ -443,7 +443,12 @@ public class LeaseMachineServiceImpl extends ServiceImpl deleteMachine(BaseVo baseVo) { - //TODO 删除之前需要判断是否存在订单 + //删除之前需要判断是否存在订单 + Long l = leaseOrderItemMapper.selectCount(new LambdaQueryWrapper() + .eq(LeaseOrderItem::getProductMachineId, baseVo.getId()).eq(LeaseOrderItem::getStatus, 1)); + if (l > 0){ + return Result.fail("删除失败,该矿机有订单正进行中"); + } leaseMachineMapper.updateById(LeaseMachine.builder().id(baseVo.getId()).del(true).build()); //删除售价 leaseMachinePriceMapper.update(LeaseMachinePrice.builder().del(true).build(),new LambdaQueryWrapper()