From 3ecfc0b9f7978697b6c1bea8ac8b7359601cae58 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Thu, 6 Jun 2024 18:29:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=9E=97?= =?UTF-8?q?=E6=B0=8F=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E7=A1=AC=E5=88=A0=E9=99=A4=E6=9A=82=E5=AD=98=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/TrunklineAdvanceDetailMapper.java | 5 +++++ .../trunkline/mapper/TrunklineAdvanceMapper.java | 4 ++++ .../service/ITrunklineAdvanceDetailService.java | 3 +++ .../impl/TrunklineAdvanceDetailServiceImpl.java | 8 ++++++++ .../service/impl/TrunklineAdvanceServiceImpl.java | 15 ++++++--------- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java index edf27a458..107abedf0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java @@ -6,6 +6,7 @@ import com.logpm.trunkline.dto.AdvanceDetailDTO; import com.logpm.trunkline.dto.OrderDetailsDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.vo.*; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +67,8 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper findListByExistsAndOrderPackageCodes(@Param("orderPackageCodeGroup") List orderPackageCodeGroup); List findAdvanceDetailVoByAdvanceIds(@Param("advanceIds") List advanceIds); + + @Delete("delete from trunkline_advance_detail where order_code = #{orderCode}") + void deletedAdvanceByOrderCode(String orderCode); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java index 5d1b355df..5ec018795 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java @@ -8,6 +8,7 @@ import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.vo.CustomerInfoVO; import com.logpm.trunkline.vo.OpenOrderVO; import com.logpm.trunkline.vo.TrunklineAdvanceVO; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -39,4 +40,7 @@ public interface TrunklineAdvanceMapper extends BaseMapper findListByExistsAndOrderCodeSet(@Param("orderCodeSet") List orderCodeSet); + + @Delete("delete from trunkline_advance where order_code = #{orderCode}") + void deletedAdvanceByOrderCode(String orderCode); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index 0bcfa2e5d..e7aed7758 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -9,6 +9,7 @@ import com.logpm.trunkline.vo.AdvanceDetailGoodsVO; import com.logpm.trunkline.vo.AdvanceDetailStockNumVO; import com.logpm.trunkline.vo.BillladingPackageVO; import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; +import org.apache.ibatis.annotations.Delete; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -80,4 +81,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService findAdvanceDetailVoByAdvanceIds(List advanceIds); + void deletedAdvanceByOrderCode(String orderCode); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index a15d4c36d..4e83d5653 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -2,6 +2,7 @@ package com.logpm.trunkline.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -310,4 +311,11 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findAdvanceDetailVoByAdvanceIds(List advanceIds) { return baseMapper.findAdvanceDetailVoByAdvanceIds(advanceIds); } + + @Override + public void deletedAdvanceByOrderCode(String orderCode) { + if(StrUtil.isNotEmpty(orderCode)){ + baseMapper.deletedAdvanceByOrderCode(orderCode); + } + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index aa333c48d..b1bf48a77 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -2,6 +2,7 @@ package com.logpm.trunkline.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -1264,15 +1265,11 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpllambdaUpdate() - .eq(TrunklineAdvanceDetailEntity::getOrderCode, orderCode) - .set(TrunklineAdvanceDetailEntity::getIsDeleted, "1") - ); - boolean advanceUpdate = this.update(Wrappers.lambdaUpdate() - .eq(TrunklineAdvanceEntity::getOrderCode, orderCode) - .set(TrunklineAdvanceEntity::getIsDeleted, "1") - ); - return detailUpdate && advanceUpdate; + if(StrUtil.isNotEmpty(orderCode)){ + baseMapper.deletedAdvanceByOrderCode(orderCode); + } + advanceDetailService.deletedAdvanceByOrderCode(orderCode); + return Boolean.TRUE; } }