From 47fabd4fcaf57676ed58a2e664186dc05fb0c227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 31 May 2023 14:58:55 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 3 ++- .../java/com/glxp/api/service/inout/IoCodeTempService.java | 2 ++ .../glxp/api/service/inout/impl/IoCodeTempServiceImpl.java | 6 ++++++ src/main/java/com/glxp/api/task/SyncHeartTask.java | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 8d87f11a7..d5d305ed6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1185,7 +1185,8 @@ public class IoCodeTempController extends BaseController { public void deleteEmptyBillNo(IoOrderEntity orderEntity) { boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo()); boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo()); - if (!r1 && !r2) { + boolean r3 = codeTempService.isExit(orderEntity.getBillNo()); + if (!r1 && !r2 && !r3) { orderService.deleteByBillNo(orderEntity.getBillNo()); } } diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index 9510573b7..e1c3137c5 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -38,4 +38,6 @@ public interface IoCodeTempService { * @return */ List findCodeList(FilterCodeRequest filterCodeRequest); + + boolean isExit(String orderId); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index bb1b5fee4..ca44942ee 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.inout.IoCodeTempResponse; import com.glxp.api.service.inout.IoCodeTempService; @@ -86,4 +87,9 @@ public class IoCodeTempServiceImpl implements IoCodeTempService { return ioCodeTempDao.selectCodeList(filterCodeRequest); } + @Override + public boolean isExit(String orderId) { + return ioCodeTempDao.exists(new QueryWrapper().eq("orderId", orderId)); + } + } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 3c288962a..221619653 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -20,8 +20,8 @@ import javax.annotation.Resource; import java.util.Arrays; -@Component -@EnableScheduling +//@Component +//@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);