Merge branch 'dev' into pre-production

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<TrunklineAdvanc
     List<String> findListByExistsAndOrderPackageCodes(@Param("orderPackageCodeGroup") List<String> orderPackageCodeGroup);
 
     List<TrunklineAdvanceDetailVO> findAdvanceDetailVoByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
+
+    @Delete("delete from trunkline_advance_detail where order_code = #{orderCode}")
+	void deletedAdvanceByOrderCode(String orderCode);
+
 }

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<TrunklineAdvanceEntit
     Integer findAllNumByOrderCode(@Param("orderCode") String orderCode);
 
     List<TrunklineAdvanceEntity> findListByExistsAndOrderCodeSet(@Param("orderCodeSet") List<String> orderCodeSet);
+
+    @Delete("delete from trunkline_advance where order_code = #{orderCode}")
+	void deletedAdvanceByOrderCode(String orderCode);
 }

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<TrunklineAdv
 
 	List<TrunklineAdvanceDetailVO> findAdvanceDetailVoByAdvanceIds(List<Long> advanceIds);
 
+    void deletedAdvanceByOrderCode(String orderCode);
+
 }

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<Trunkline
 	public List<TrunklineAdvanceDetailVO> findAdvanceDetailVoByAdvanceIds(List<Long> advanceIds) {
 		return baseMapper.findAdvanceDetailVoByAdvanceIds(advanceIds);
 	}
+
+	@Override
+	public void deletedAdvanceByOrderCode(String orderCode) {
+		if(StrUtil.isNotEmpty(orderCode)){
+			baseMapper.deletedAdvanceByOrderCode(orderCode);
+		}
+	}
 }

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 BaseServiceImpl<TrunklineAdvanc
 		if (CollUtil.isNotEmpty(list)) {
 			return Boolean.FALSE;
 		}
-		boolean detailUpdate = advanceDetailService.update(Wrappers.<TrunklineAdvanceDetailEntity>lambdaUpdate()
+		if(StrUtil.isNotEmpty(orderCode)){
-			.eq(TrunklineAdvanceDetailEntity::getOrderCode, orderCode)
+			baseMapper.deletedAdvanceByOrderCode(orderCode);
-			.set(TrunklineAdvanceDetailEntity::getIsDeleted, "1")
+		}
-		);
+		advanceDetailService.deletedAdvanceByOrderCode(orderCode);
-		boolean advanceUpdate = this.update(Wrappers.<TrunklineAdvanceEntity>lambdaUpdate()
+		return Boolean.TRUE;
-			.eq(TrunklineAdvanceEntity::getOrderCode, orderCode)
-			.set(TrunklineAdvanceEntity::getIsDeleted, "1")
-		);
-		return detailUpdate && advanceUpdate;
 	}
 
 }