完善订单删除逻辑

zhongnanhuang
1 parent 008511c9
Showing 17 changed files with 117 additions and 19 deletions
src/main/java/com/order/erp/service/order/OrderAuditLogService.java
src/main/java/com/order/erp/service/order/OrderCompletionReportService.java
src/main/java/com/order/erp/service/order/OrderFieldLockApplyService.java
src/main/java/com/order/erp/service/order/OrderFieldLockRecordService.java
src/main/java/com/order/erp/service/order/OrderInspectionStageService.java
src/main/java/com/order/erp/service/order/OrderOptLogService.java
src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java
src/main/java/com/order/erp/service/order/OrderTrackStageService.java
src/main/java/com/order/erp/service/order/impl/OrderAuditLogServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockRecordServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderInspectionStageServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderOptLogServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderTrackStageServiceImpl.java
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderAuditLogDO;
 import com.order.erp.domain.vo.order.OrderAuditLogQueryVO;
 import com.order.erp.domain.vo.order.OrderAuditLogVO;
+import java.util.List;
+
 /**
  * 用户订单审批日志表(OrderAuditLog)表服务接口
  *
@@ -55,4 +57,6 @@ public interface OrderAuditLogService extends IService&lt;OrderAuditLogDO&gt; {
     ServerResult deleteById(OrderAuditLogQueryVO orderAuditLogQueryVO);
     boolean deleteByOrderId(Long getId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderCompletionReportDO;
 import com.order.erp.domain.vo.order.OrderCompletionReportQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportVO;
+import java.util.List;
+
 /**
  * 订单-项目完成报告书(OrderCompletionReport)表服务接口
  *
@@ -55,4 +57,6 @@ public interface OrderCompletionReportService extends IService&lt;OrderCompletionRe
     ServerResult deleteById(OrderCompletionReportQueryVO orderCompletionReportQueryVO);
     boolean deleteByOrderId(Long orderId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -7,6 +7,8 @@ import com.order.erp.domain.vo.order.AuditVO;
 import com.order.erp.domain.vo.order.OrderFieldLockApplyQueryVO;
 import com.order.erp.domain.vo.order.OrderFieldLockApplyVO;
+import java.util.List;
+
 /**
  * 用户订单-字段锁定申请表(OrderFieldLockApply)表服务接口
  *
@@ -68,4 +70,6 @@ public interface OrderFieldLockApplyService extends IService&lt;OrderFieldLockApply
     ServerResult deleteById(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO);
     boolean deleteByOrderId(Long orderId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderFieldLockRecordDO;
 import com.order.erp.domain.vo.order.OrderFieldLockRecordQueryVO;
 import com.order.erp.domain.vo.order.OrderFieldLockRecordVO;
+import java.util.List;
+
 /**
  * 用户订单-字段锁定记录表(OrderFieldLockRecord)表服务接口
  *
@@ -55,4 +57,6 @@ public interface OrderFieldLockRecordService extends IService&lt;OrderFieldLockReco
     ServerResult deleteById(OrderFieldLockRecordQueryVO orderFieldLockRecordQueryVO);
     boolean deleteByOrderId(Long orderId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderInspectionStageDO;
 import com.order.erp.domain.vo.order.OrderInspectionStageQueryVO;
 import com.order.erp.domain.vo.order.OrderInspectionStageVO;
+import java.util.List;
+
 /**
  * 订单-质检环节(OrderInspectionStage)表服务接口
  *
@@ -55,4 +57,6 @@ public interface OrderInspectionStageService extends IService&lt;OrderInspectionSta
     ServerResult deleteById(OrderInspectionStageQueryVO orderInspectionStageQueryVO);
     boolean deleteByOrderId(Long orderId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderOptLogDO;
 import com.order.erp.domain.vo.order.OrderOptLogQueryVO;
 import com.order.erp.domain.vo.order.OrderOptLogVO;
+import java.util.List;
+
 /**
  * 用户订单操作日志表(OrderOptLog)表服务接口
  *
@@ -55,4 +57,6 @@ public interface OrderOptLogService extends IService&lt;OrderOptLogDO&gt; {
     ServerResult deleteById(OrderOptLogQueryVO orderOptLogQueryVO);
     boolean deleteByOrderId(Long orderId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
+import java.util.List;
+
 /**
  * 订单利润分析表(OrderProfitAnalysis)表服务接口
  *
@@ -55,4 +57,6 @@ public interface OrderProfitAnalysisService extends IService&lt;OrderProfitAnalysis
     ServerResult deleteById(OrderProfitAnalysisQueryVO orderProfitAnalysisQueryVO);
     boolean deleteByOrderId(Long orderId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderTrackStageDO;
 import com.order.erp.domain.vo.order.OrderTrackStageQueryVO;
 import com.order.erp.domain.vo.order.OrderTrackStageVO;
+import java.util.List;
+
 /**
  * 订单-跟单环节(OrderTrackStage)表服务接口
  *
@@ -55,4 +57,6 @@ public interface OrderTrackStageService extends IService&lt;OrderTrackStageDO&gt; {
     ServerResult deleteById(OrderTrackStageQueryVO orderTrackStageQueryVO);
     boolean deleteByOrderId(Long orderId);
+
+    boolean deleteByOrderIds(List<Long> orderIds);
 }
@@ -133,4 +133,12 @@ public class OrderAuditLogServiceImpl extends ServiceImpl&lt;OrderAuditLogMapper, O
                 .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
         return update(updateWrapper);
     }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderAuditLogDO> updateWrapper = new LambdaUpdateWrapper<OrderAuditLogDO>()
+                .in(OrderAuditLogDO::getOrderId, orderIds)
+                .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        return update(updateWrapper);
+    }
 }
@@ -506,10 +506,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .set(OrderBaseInfoDO::getEnableFlag, Constant.UNABLE_TWENTY);
         update(updateWrapper);
-        Long orderId = orderBaseInfoQueryVO.getId();
         //删除订单关联信息
-        this.deleteRelationInfoByOrderId(orderId);
+        this.deleteRelationInfoByOrderId(ids);
         return ServerResult.success();
@@ -519,29 +518,29 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
      * 删除订单关联信息
      * @param orderId
      */
-    private void deleteRelationInfoByOrderId(Long orderId) {
+    private void deleteRelationInfoByOrderId(List<Long> orderIds) {
         //订单审批日志
-        orderAuditLogService.deleteByOrderId(orderId);
+        orderAuditLogService.deleteByOrderIds(orderIds);
         //订单-项目完成报告书
-        orderCompletionReportService.deleteByOrderId(orderId);
+        orderCompletionReportService.deleteByOrderIds(orderIds);
         //用户订单-字段锁定申请表
-        orderFieldLockApplyService.deleteByOrderId(orderId);
+        orderFieldLockApplyService.deleteByOrderIds(orderIds);
         //用户订单-字段锁定记录表
-        orderFieldLockRecordService.deleteByOrderId(orderId);
+        orderFieldLockRecordService.deleteByOrderIds(orderIds);
         //订单-质检环节
-        orderInspectionStageService.deleteByOrderId(orderId);
+        orderInspectionStageService.deleteByOrderIds(orderIds);
         //用户订单操作日志表
-        orderOptLogService.deleteByOrderId(orderId);
+        orderOptLogService.deleteByOrderIds(orderIds);
         //订单利润分析表
-        profitAnalysisService.deleteByOrderId(orderId);
+        profitAnalysisService.deleteByOrderIds(orderIds);
         //订单-跟单环节
-        trackStageService.deleteByOrderId(orderId);
+        trackStageService.deleteByOrderIds(orderIds);
     }
 }
@@ -129,7 +129,16 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
     @Override
     public boolean deleteByOrderId(Long orderId) {
         LambdaUpdateWrapper<OrderCompletionReportDO> updateWrapper = new LambdaUpdateWrapper<OrderCompletionReportDO>()
-                .in(OrderCompletionReportDO::getOrderId, orderId)
+                .eq(OrderCompletionReportDO::getOrderId, orderId)
+                .set(OrderCompletionReportDO::getEnableFlag, Constant.UNABLE_TWENTY);
+
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderCompletionReportDO> updateWrapper = new LambdaUpdateWrapper<OrderCompletionReportDO>()
+                .in(OrderCompletionReportDO::getOrderId, orderIds)
                 .set(OrderCompletionReportDO::getEnableFlag, Constant.UNABLE_TWENTY);
         return update(updateWrapper);
@@ -262,7 +262,16 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         LambdaUpdateWrapper<OrderFieldLockApplyDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockApplyDO>()
                 .in(OrderFieldLockApplyDO::getOrderId, orderId)
                 .set(OrderFieldLockApplyDO::getEnableFlag, Constant.UNABLE_TWENTY);
-        update(updateWrapper);
-        return false;
+
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderFieldLockApplyDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockApplyDO>()
+                .eq(OrderFieldLockApplyDO::getOrderId, orderIds)
+                .set(OrderFieldLockApplyDO::getEnableFlag, Constant.UNABLE_TWENTY);
+
+        return update(updateWrapper);
     }
 }
@@ -129,7 +129,16 @@ public class OrderFieldLockRecordServiceImpl extends ServiceImpl&lt;OrderFieldLockR
     @Override
     public boolean deleteByOrderId(Long orderId) {
         LambdaUpdateWrapper<OrderFieldLockRecordDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockRecordDO>()
-                .in(OrderFieldLockRecordDO::getOrderId, orderId)
+                .eq(OrderFieldLockRecordDO::getOrderId, orderId)
+                .set(OrderFieldLockRecordDO::getEnableFlag, Constant.UNABLE_TWENTY);
+
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderFieldLockRecordDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockRecordDO>()
+                .in(OrderFieldLockRecordDO::getOrderId, orderIds)
                 .set(OrderFieldLockRecordDO::getEnableFlag, Constant.UNABLE_TWENTY);
         return update(updateWrapper);
@@ -124,7 +124,15 @@ public class OrderInspectionStageServiceImpl extends ServiceImpl&lt;OrderInspection
     @Override
     public boolean deleteByOrderId(Long orderId) {
         LambdaUpdateWrapper<OrderInspectionStageDO> updateWrapper = new LambdaUpdateWrapper<OrderInspectionStageDO>()
-                .in(OrderInspectionStageDO::getOrderId, orderId)
+                .eq(OrderInspectionStageDO::getOrderId, orderId)
+                .set(OrderInspectionStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderInspectionStageDO> updateWrapper = new LambdaUpdateWrapper<OrderInspectionStageDO>()
+                .in(OrderInspectionStageDO::getOrderId, orderIds)
                 .set(OrderInspectionStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
         return update(updateWrapper);
     }
@@ -129,7 +129,15 @@ public class OrderOptLogServiceImpl extends ServiceImpl&lt;OrderOptLogMapper, Order
     @Override
     public boolean deleteByOrderId(Long orderId) {
         LambdaUpdateWrapper<OrderOptLogDO> updateWrapper = new LambdaUpdateWrapper<OrderOptLogDO>()
-                .in(OrderOptLogDO::getOrderId, orderId)
+                .eq(OrderOptLogDO::getOrderId, orderId)
+                .set(OrderOptLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderOptLogDO> updateWrapper = new LambdaUpdateWrapper<OrderOptLogDO>()
+                .in(OrderOptLogDO::getOrderId, orderIds)
                 .set(OrderOptLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
         return update(updateWrapper);
     }
@@ -129,7 +129,15 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
     @Override
     public boolean deleteByOrderId(Long orderId) {
         LambdaUpdateWrapper<OrderProfitAnalysisDO> updateWrapper = new LambdaUpdateWrapper<OrderProfitAnalysisDO>()
-                .in(OrderProfitAnalysisDO::getOrderId, orderId)
+                .eq(OrderProfitAnalysisDO::getOrderId, orderId)
+                .set(OrderProfitAnalysisDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderProfitAnalysisDO> updateWrapper = new LambdaUpdateWrapper<OrderProfitAnalysisDO>()
+                .in(OrderProfitAnalysisDO::getOrderId, orderIds)
                 .set(OrderProfitAnalysisDO::getEnableFlag, Constant.UNABLE_TWENTY);
         return update(updateWrapper);
     }
@@ -129,7 +129,15 @@ public class OrderTrackStageServiceImpl extends ServiceImpl&lt;OrderTrackStageMappe
     @Override
     public boolean deleteByOrderId(Long orderId) {
         LambdaUpdateWrapper<OrderTrackStageDO> updateWrapper = new LambdaUpdateWrapper<OrderTrackStageDO>()
-                .in(OrderTrackStageDO::getOrderId, orderId)
+                .eq(OrderTrackStageDO::getOrderId, orderId)
+                .set(OrderTrackStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        return update(updateWrapper);
+    }
+
+    @Override
+    public boolean deleteByOrderIds(List<Long> orderIds) {
+        LambdaUpdateWrapper<OrderTrackStageDO> updateWrapper = new LambdaUpdateWrapper<OrderTrackStageDO>()
+                .eq(OrderTrackStageDO::getOrderId, orderIds)
                 .set(OrderTrackStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
         return update(updateWrapper);
     }