canrd-outside / order-erp · Commits

Commit 517e96aaffaac4623bfb4aefba47582549dc9a64

Authored by zhongnanhuang
1 parent 008511c9
build: skipped

完善订单删除逻辑

Inline Side-by-side
Showing 17 changed files with 117 additions and 19 deletions
src/main/java/com/order/erp/service/order/OrderAuditLogService.java
  View file @517e96a
... ... @@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderAuditLogDO;
6 6 import com.order.erp.domain.vo.order.OrderAuditLogQueryVO;
7 7 import com.order.erp.domain.vo.order.OrderAuditLogVO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 用户订单审批日志表(OrderAuditLog)表服务接口
11 13 *
... ... @@ -55,4 +57,6 @@ public interface OrderAuditLogService extends IService<OrderAuditLogDO> {
55 57 ServerResult deleteById(OrderAuditLogQueryVO orderAuditLogQueryVO);
56 58  
57 59 boolean deleteByOrderId(Long getId);
  60 +
  61 + boolean deleteByOrderIds(List<Long> orderIds);
58 62 }
... ...
src/main/java/com/order/erp/service/order/OrderCompletionReportService.java
  View file @517e96a
... ... @@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderCompletionReportDO;
6 6 import com.order.erp.domain.vo.order.OrderCompletionReportQueryVO;
7 7 import com.order.erp.domain.vo.order.OrderCompletionReportVO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 订单-项目完成报告书(OrderCompletionReport)表服务接口
11 13 *
... ... @@ -55,4 +57,6 @@ public interface OrderCompletionReportService extends IService&lt;OrderCompletionRe
55 57 ServerResult deleteById(OrderCompletionReportQueryVO orderCompletionReportQueryVO);
56 58  
57 59 boolean deleteByOrderId(Long orderId);
  60 +
  61 + boolean deleteByOrderIds(List<Long> orderIds);
58 62 }
... ...
src/main/java/com/order/erp/service/order/OrderFieldLockApplyService.java
  View file @517e96a
... ... @@ -7,6 +7,8 @@ import com.order.erp.domain.vo.order.AuditVO;
7 7 import com.order.erp.domain.vo.order.OrderFieldLockApplyQueryVO;
8 8 import com.order.erp.domain.vo.order.OrderFieldLockApplyVO;
9 9  
  10 +import java.util.List;
  11 +
10 12 /**
11 13 * 用户订单-字段锁定申请表(OrderFieldLockApply)表服务接口
12 14 *
... ... @@ -68,4 +70,6 @@ public interface OrderFieldLockApplyService extends IService&lt;OrderFieldLockApply
68 70 ServerResult deleteById(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO);
69 71  
70 72 boolean deleteByOrderId(Long orderId);
  73 +
  74 + boolean deleteByOrderIds(List<Long> orderIds);
71 75 }
... ...
src/main/java/com/order/erp/service/order/OrderFieldLockRecordService.java
  View file @517e96a
... ... @@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderFieldLockRecordDO;
6 6 import com.order.erp.domain.vo.order.OrderFieldLockRecordQueryVO;
7 7 import com.order.erp.domain.vo.order.OrderFieldLockRecordVO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 用户订单-字段锁定记录表(OrderFieldLockRecord)表服务接口
11 13 *
... ... @@ -55,4 +57,6 @@ public interface OrderFieldLockRecordService extends IService&lt;OrderFieldLockReco
55 57 ServerResult deleteById(OrderFieldLockRecordQueryVO orderFieldLockRecordQueryVO);
56 58  
57 59 boolean deleteByOrderId(Long orderId);
  60 +
  61 + boolean deleteByOrderIds(List<Long> orderIds);
58 62 }
... ...
src/main/java/com/order/erp/service/order/OrderInspectionStageService.java
  View file @517e96a
... ... @@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderInspectionStageDO;
6 6 import com.order.erp.domain.vo.order.OrderInspectionStageQueryVO;
7 7 import com.order.erp.domain.vo.order.OrderInspectionStageVO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 订单-质检环节(OrderInspectionStage)表服务接口
11 13 *
... ... @@ -55,4 +57,6 @@ public interface OrderInspectionStageService extends IService&lt;OrderInspectionSta
55 57 ServerResult deleteById(OrderInspectionStageQueryVO orderInspectionStageQueryVO);
56 58  
57 59 boolean deleteByOrderId(Long orderId);
  60 +
  61 + boolean deleteByOrderIds(List<Long> orderIds);
58 62 }
... ...
src/main/java/com/order/erp/service/order/OrderOptLogService.java
  View file @517e96a
... ... @@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderOptLogDO;
6 6 import com.order.erp.domain.vo.order.OrderOptLogQueryVO;
7 7 import com.order.erp.domain.vo.order.OrderOptLogVO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 用户订单操作日志表(OrderOptLog)表服务接口
11 13 *
... ... @@ -55,4 +57,6 @@ public interface OrderOptLogService extends IService&lt;OrderOptLogDO&gt; {
55 57 ServerResult deleteById(OrderOptLogQueryVO orderOptLogQueryVO);
56 58  
57 59 boolean deleteByOrderId(Long orderId);
  60 +
  61 + boolean deleteByOrderIds(List<Long> orderIds);
58 62 }
... ...
src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java
  View file @517e96a
... ... @@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
6 6 import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
7 7 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 订单利润分析表(OrderProfitAnalysis)表服务接口
11 13 *
... ... @@ -55,4 +57,6 @@ public interface OrderProfitAnalysisService extends IService&lt;OrderProfitAnalysis
55 57 ServerResult deleteById(OrderProfitAnalysisQueryVO orderProfitAnalysisQueryVO);
56 58  
57 59 boolean deleteByOrderId(Long orderId);
  60 +
  61 + boolean deleteByOrderIds(List<Long> orderIds);
58 62 }
... ...
src/main/java/com/order/erp/service/order/OrderTrackStageService.java
  View file @517e96a
... ... @@ -6,6 +6,8 @@ import com.order.erp.domain.dto.order.OrderTrackStageDO;
6 6 import com.order.erp.domain.vo.order.OrderTrackStageQueryVO;
7 7 import com.order.erp.domain.vo.order.OrderTrackStageVO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 订单-跟单环节(OrderTrackStage)表服务接口
11 13 *
... ... @@ -55,4 +57,6 @@ public interface OrderTrackStageService extends IService&lt;OrderTrackStageDO&gt; {
55 57 ServerResult deleteById(OrderTrackStageQueryVO orderTrackStageQueryVO);
56 58  
57 59 boolean deleteByOrderId(Long orderId);
  60 +
  61 + boolean deleteByOrderIds(List<Long> orderIds);
58 62 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderAuditLogServiceImpl.java
  View file @517e96a
... ... @@ -133,4 +133,12 @@ public class OrderAuditLogServiceImpl extends ServiceImpl&lt;OrderAuditLogMapper, O
133 133 .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
134 134 return update(updateWrapper);
135 135 }
  136 +
  137 + @Override
  138 + public boolean deleteByOrderIds(List<Long> orderIds) {
  139 + LambdaUpdateWrapper<OrderAuditLogDO> updateWrapper = new LambdaUpdateWrapper<OrderAuditLogDO>()
  140 + .in(OrderAuditLogDO::getOrderId, orderIds)
  141 + .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
  142 + return update(updateWrapper);
  143 + }
136 144 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @517e96a
... ... @@ -506,10 +506,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
506 506 .set(OrderBaseInfoDO::getEnableFlag, Constant.UNABLE_TWENTY);
507 507 update(updateWrapper);
508 508  
509   - Long orderId = orderBaseInfoQueryVO.getId();
510 509  
511 510 //删除订单关联信息
512   - this.deleteRelationInfoByOrderId(orderId);
  511 + this.deleteRelationInfoByOrderId(ids);
513 512  
514 513  
515 514 return ServerResult.success();
... ... @@ -519,29 +518,29 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
519 518 * 删除订单关联信息
520 519 * @param orderId
521 520 */
522   - private void deleteRelationInfoByOrderId(Long orderId) {
  521 + private void deleteRelationInfoByOrderId(List<Long> orderIds) {
523 522 //订单审批日志
524   - orderAuditLogService.deleteByOrderId(orderId);
  523 + orderAuditLogService.deleteByOrderIds(orderIds);
525 524  
526 525 //订单-项目完成报告书
527   - orderCompletionReportService.deleteByOrderId(orderId);
  526 + orderCompletionReportService.deleteByOrderIds(orderIds);
528 527  
529 528 //用户订单-字段锁定申请表
530   - orderFieldLockApplyService.deleteByOrderId(orderId);
  529 + orderFieldLockApplyService.deleteByOrderIds(orderIds);
531 530  
532 531 //用户订单-字段锁定记录表
533   - orderFieldLockRecordService.deleteByOrderId(orderId);
  532 + orderFieldLockRecordService.deleteByOrderIds(orderIds);
534 533  
535 534 //订单-质检环节
536   - orderInspectionStageService.deleteByOrderId(orderId);
  535 + orderInspectionStageService.deleteByOrderIds(orderIds);
537 536  
538 537 //用户订单操作日志表
539   - orderOptLogService.deleteByOrderId(orderId);
  538 + orderOptLogService.deleteByOrderIds(orderIds);
540 539  
541 540 //订单利润分析表
542   - profitAnalysisService.deleteByOrderId(orderId);
  541 + profitAnalysisService.deleteByOrderIds(orderIds);
543 542  
544 543 //订单-跟单环节
545   - trackStageService.deleteByOrderId(orderId);
  544 + trackStageService.deleteByOrderIds(orderIds);
546 545 }
547 546 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
  View file @517e96a
... ... @@ -129,7 +129,16 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
129 129 @Override
130 130 public boolean deleteByOrderId(Long orderId) {
131 131 LambdaUpdateWrapper<OrderCompletionReportDO> updateWrapper = new LambdaUpdateWrapper<OrderCompletionReportDO>()
132   - .in(OrderCompletionReportDO::getOrderId, orderId)
  132 + .eq(OrderCompletionReportDO::getOrderId, orderId)
  133 + .set(OrderCompletionReportDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 +
  135 + return update(updateWrapper);
  136 + }
  137 +
  138 + @Override
  139 + public boolean deleteByOrderIds(List<Long> orderIds) {
  140 + LambdaUpdateWrapper<OrderCompletionReportDO> updateWrapper = new LambdaUpdateWrapper<OrderCompletionReportDO>()
  141 + .in(OrderCompletionReportDO::getOrderId, orderIds)
133 142 .set(OrderCompletionReportDO::getEnableFlag, Constant.UNABLE_TWENTY);
134 143  
135 144 return update(updateWrapper);
... ...
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @517e96a
... ... @@ -262,7 +262,16 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
262 262 LambdaUpdateWrapper<OrderFieldLockApplyDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockApplyDO>()
263 263 .in(OrderFieldLockApplyDO::getOrderId, orderId)
264 264 .set(OrderFieldLockApplyDO::getEnableFlag, Constant.UNABLE_TWENTY);
265   - update(updateWrapper);
266   - return false;
  265 +
  266 + return update(updateWrapper);
  267 + }
  268 +
  269 + @Override
  270 + public boolean deleteByOrderIds(List<Long> orderIds) {
  271 + LambdaUpdateWrapper<OrderFieldLockApplyDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockApplyDO>()
  272 + .eq(OrderFieldLockApplyDO::getOrderId, orderIds)
  273 + .set(OrderFieldLockApplyDO::getEnableFlag, Constant.UNABLE_TWENTY);
  274 +
  275 + return update(updateWrapper);
267 276 }
268 277 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderFieldLockRecordServiceImpl.java
  View file @517e96a
... ... @@ -129,7 +129,16 @@ public class OrderFieldLockRecordServiceImpl extends ServiceImpl&lt;OrderFieldLockR
129 129 @Override
130 130 public boolean deleteByOrderId(Long orderId) {
131 131 LambdaUpdateWrapper<OrderFieldLockRecordDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockRecordDO>()
132   - .in(OrderFieldLockRecordDO::getOrderId, orderId)
  132 + .eq(OrderFieldLockRecordDO::getOrderId, orderId)
  133 + .set(OrderFieldLockRecordDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 +
  135 + return update(updateWrapper);
  136 + }
  137 +
  138 + @Override
  139 + public boolean deleteByOrderIds(List<Long> orderIds) {
  140 + LambdaUpdateWrapper<OrderFieldLockRecordDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockRecordDO>()
  141 + .in(OrderFieldLockRecordDO::getOrderId, orderIds)
133 142 .set(OrderFieldLockRecordDO::getEnableFlag, Constant.UNABLE_TWENTY);
134 143  
135 144 return update(updateWrapper);
... ...
src/main/java/com/order/erp/service/order/impl/OrderInspectionStageServiceImpl.java
  View file @517e96a
... ... @@ -124,7 +124,15 @@ public class OrderInspectionStageServiceImpl extends ServiceImpl&lt;OrderInspection
124 124 @Override
125 125 public boolean deleteByOrderId(Long orderId) {
126 126 LambdaUpdateWrapper<OrderInspectionStageDO> updateWrapper = new LambdaUpdateWrapper<OrderInspectionStageDO>()
127   - .in(OrderInspectionStageDO::getOrderId, orderId)
  127 + .eq(OrderInspectionStageDO::getOrderId, orderId)
  128 + .set(OrderInspectionStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
  129 + return update(updateWrapper);
  130 + }
  131 +
  132 + @Override
  133 + public boolean deleteByOrderIds(List<Long> orderIds) {
  134 + LambdaUpdateWrapper<OrderInspectionStageDO> updateWrapper = new LambdaUpdateWrapper<OrderInspectionStageDO>()
  135 + .in(OrderInspectionStageDO::getOrderId, orderIds)
128 136 .set(OrderInspectionStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
129 137 return update(updateWrapper);
130 138 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderOptLogServiceImpl.java
  View file @517e96a
... ... @@ -129,7 +129,15 @@ public class OrderOptLogServiceImpl extends ServiceImpl&lt;OrderOptLogMapper, Order
129 129 @Override
130 130 public boolean deleteByOrderId(Long orderId) {
131 131 LambdaUpdateWrapper<OrderOptLogDO> updateWrapper = new LambdaUpdateWrapper<OrderOptLogDO>()
132   - .in(OrderOptLogDO::getOrderId, orderId)
  132 + .eq(OrderOptLogDO::getOrderId, orderId)
  133 + .set(OrderOptLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 + return update(updateWrapper);
  135 + }
  136 +
  137 + @Override
  138 + public boolean deleteByOrderIds(List<Long> orderIds) {
  139 + LambdaUpdateWrapper<OrderOptLogDO> updateWrapper = new LambdaUpdateWrapper<OrderOptLogDO>()
  140 + .in(OrderOptLogDO::getOrderId, orderIds)
133 141 .set(OrderOptLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
134 142 return update(updateWrapper);
135 143 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
  View file @517e96a
... ... @@ -129,7 +129,15 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
129 129 @Override
130 130 public boolean deleteByOrderId(Long orderId) {
131 131 LambdaUpdateWrapper<OrderProfitAnalysisDO> updateWrapper = new LambdaUpdateWrapper<OrderProfitAnalysisDO>()
132   - .in(OrderProfitAnalysisDO::getOrderId, orderId)
  132 + .eq(OrderProfitAnalysisDO::getOrderId, orderId)
  133 + .set(OrderProfitAnalysisDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 + return update(updateWrapper);
  135 + }
  136 +
  137 + @Override
  138 + public boolean deleteByOrderIds(List<Long> orderIds) {
  139 + LambdaUpdateWrapper<OrderProfitAnalysisDO> updateWrapper = new LambdaUpdateWrapper<OrderProfitAnalysisDO>()
  140 + .in(OrderProfitAnalysisDO::getOrderId, orderIds)
133 141 .set(OrderProfitAnalysisDO::getEnableFlag, Constant.UNABLE_TWENTY);
134 142 return update(updateWrapper);
135 143 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderTrackStageServiceImpl.java
  View file @517e96a
... ... @@ -129,7 +129,15 @@ public class OrderTrackStageServiceImpl extends ServiceImpl&lt;OrderTrackStageMappe
129 129 @Override
130 130 public boolean deleteByOrderId(Long orderId) {
131 131 LambdaUpdateWrapper<OrderTrackStageDO> updateWrapper = new LambdaUpdateWrapper<OrderTrackStageDO>()
132   - .in(OrderTrackStageDO::getOrderId, orderId)
  132 + .eq(OrderTrackStageDO::getOrderId, orderId)
  133 + .set(OrderTrackStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 + return update(updateWrapper);
  135 + }
  136 +
  137 + @Override
  138 + public boolean deleteByOrderIds(List<Long> orderIds) {
  139 + LambdaUpdateWrapper<OrderTrackStageDO> updateWrapper = new LambdaUpdateWrapper<OrderTrackStageDO>()
  140 + .eq(OrderTrackStageDO::getOrderId, orderIds)
133 141 .set(OrderTrackStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
134 142 return update(updateWrapper);
135 143 }
... ...