canrd-outside / order-erp · Commits

Commit 008511c95eb96c86fef0edba8832d5c17a5e27a3

Authored by zhongnanhuang
1 parent f45fdb3a
build: skipped

完善订单删除逻辑

Inline Side-by-side
Showing 17 changed files with 163 additions and 0 deletions
src/main/java/com/order/erp/service/order/OrderAuditLogService.java
  View file @008511c
@@ -54,4 +54,5 @@ public interface OrderAuditLogService extends IService<OrderAuditLogDO> { @@ -54,4 +54,5 @@ public interface OrderAuditLogService extends IService<OrderAuditLogDO> {
54 */ 54 */
55 ServerResult deleteById(OrderAuditLogQueryVO orderAuditLogQueryVO); 55 ServerResult deleteById(OrderAuditLogQueryVO orderAuditLogQueryVO);
56 56
  57 + boolean deleteByOrderId(Long getId);
57 } 58 }
src/main/java/com/order/erp/service/order/OrderCompletionReportService.java
  View file @008511c
@@ -54,4 +54,5 @@ public interface OrderCompletionReportService extends IService<OrderCompletionRe @@ -54,4 +54,5 @@ public interface OrderCompletionReportService extends IService<OrderCompletionRe
54 */ 54 */
55 ServerResult deleteById(OrderCompletionReportQueryVO orderCompletionReportQueryVO); 55 ServerResult deleteById(OrderCompletionReportQueryVO orderCompletionReportQueryVO);
56 56
  57 + boolean deleteByOrderId(Long orderId);
57 } 58 }
src/main/java/com/order/erp/service/order/OrderFieldLockApplyService.java
  View file @008511c
@@ -67,4 +67,5 @@ public interface OrderFieldLockApplyService extends IService<OrderFieldLockApply @@ -67,4 +67,5 @@ public interface OrderFieldLockApplyService extends IService<OrderFieldLockApply
67 */ 67 */
68 ServerResult deleteById(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO); 68 ServerResult deleteById(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO);
69 69
  70 + boolean deleteByOrderId(Long orderId);
70 } 71 }
src/main/java/com/order/erp/service/order/OrderFieldLockRecordService.java
  View file @008511c
@@ -54,4 +54,5 @@ public interface OrderFieldLockRecordService extends IService<OrderFieldLockReco @@ -54,4 +54,5 @@ public interface OrderFieldLockRecordService extends IService<OrderFieldLockReco
54 */ 54 */
55 ServerResult deleteById(OrderFieldLockRecordQueryVO orderFieldLockRecordQueryVO); 55 ServerResult deleteById(OrderFieldLockRecordQueryVO orderFieldLockRecordQueryVO);
56 56
  57 + boolean deleteByOrderId(Long orderId);
57 } 58 }
src/main/java/com/order/erp/service/order/OrderInspectionStageService.java
  View file @008511c
@@ -54,4 +54,5 @@ public interface OrderInspectionStageService extends IService<OrderInspectionSta @@ -54,4 +54,5 @@ public interface OrderInspectionStageService extends IService<OrderInspectionSta
54 */ 54 */
55 ServerResult deleteById(OrderInspectionStageQueryVO orderInspectionStageQueryVO); 55 ServerResult deleteById(OrderInspectionStageQueryVO orderInspectionStageQueryVO);
56 56
  57 + boolean deleteByOrderId(Long orderId);
57 } 58 }
src/main/java/com/order/erp/service/order/OrderOptLogService.java
  View file @008511c
@@ -54,4 +54,5 @@ public interface OrderOptLogService extends IService<OrderOptLogDO> { @@ -54,4 +54,5 @@ public interface OrderOptLogService extends IService<OrderOptLogDO> {
54 */ 54 */
55 ServerResult deleteById(OrderOptLogQueryVO orderOptLogQueryVO); 55 ServerResult deleteById(OrderOptLogQueryVO orderOptLogQueryVO);
56 56
  57 + boolean deleteByOrderId(Long orderId);
57 } 58 }
src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java
  View file @008511c
@@ -54,4 +54,5 @@ public interface OrderProfitAnalysisService extends IService<OrderProfitAnalysis @@ -54,4 +54,5 @@ public interface OrderProfitAnalysisService extends IService<OrderProfitAnalysis
54 */ 54 */
55 ServerResult deleteById(OrderProfitAnalysisQueryVO orderProfitAnalysisQueryVO); 55 ServerResult deleteById(OrderProfitAnalysisQueryVO orderProfitAnalysisQueryVO);
56 56
  57 + boolean deleteByOrderId(Long orderId);
57 } 58 }
src/main/java/com/order/erp/service/order/OrderTrackStageService.java
  View file @008511c
@@ -54,4 +54,5 @@ public interface OrderTrackStageService extends IService<OrderTrackStageDO> { @@ -54,4 +54,5 @@ public interface OrderTrackStageService extends IService<OrderTrackStageDO> {
54 */ 54 */
55 ServerResult deleteById(OrderTrackStageQueryVO orderTrackStageQueryVO); 55 ServerResult deleteById(OrderTrackStageQueryVO orderTrackStageQueryVO);
56 56
  57 + boolean deleteByOrderId(Long orderId);
57 } 58 }
src/main/java/com/order/erp/service/order/impl/OrderAuditLogServiceImpl.java
  View file @008511c
@@ -120,4 +120,17 @@ public class OrderAuditLogServiceImpl extends ServiceImpl<OrderAuditLogMapper, O @@ -120,4 +120,17 @@ public class OrderAuditLogServiceImpl extends ServiceImpl<OrderAuditLogMapper, O
120 update(updateWrapper); 120 update(updateWrapper);
121 return ServerResult.success(); 121 return ServerResult.success();
122 } 122 }
  123 +
  124 + /**
  125 + * 逻辑删除，通过订单id删除 用户订单审批日志表(OrderAuditLog)实体类
  126 + * @param orderId
  127 + * @return
  128 + */
  129 + @Override
  130 + public boolean deleteByOrderId(Long orderId) {
  131 + LambdaUpdateWrapper<OrderAuditLogDO> updateWrapper = new LambdaUpdateWrapper<OrderAuditLogDO>()
  132 + .eq(OrderAuditLogDO::getOrderId, orderId)
  133 + .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 + return update(updateWrapper);
  135 + }
123 } 136 }
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @008511c
@@ -72,6 +72,21 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -72,6 +72,21 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
72 private OrderFieldLockApplyService orderFieldLockApplyService; 72 private OrderFieldLockApplyService orderFieldLockApplyService;
73 73
74 @Resource 74 @Resource
  75 + private OrderAuditLogService orderAuditLogService;
  76 +
  77 + @Resource
  78 + private OrderCompletionReportService orderCompletionReportService;
  79 +
  80 + @Resource
  81 + private OrderInspectionStageService orderInspectionStageService;
  82 +
  83 + @Resource
  84 + private OrderOptLogService orderOptLogService;
  85 +
  86 + @Resource
  87 + private OrderFieldLockRecordService orderFieldLockRecordService;
  88 +
  89 + @Resource
75 private DataScope dataScope; 90 private DataScope dataScope;
76 91
77 /** 92 /**
@@ -485,10 +500,48 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -485,10 +500,48 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
485 return ServerResult.success(); 500 return ServerResult.success();
486 } 501 }
487 //todo 校验是否可以逻辑删除 502 //todo 校验是否可以逻辑删除
  503 + //订单基本信息
488 LambdaUpdateWrapper<OrderBaseInfoDO> updateWrapper = new LambdaUpdateWrapper<OrderBaseInfoDO>() 504 LambdaUpdateWrapper<OrderBaseInfoDO> updateWrapper = new LambdaUpdateWrapper<OrderBaseInfoDO>()
489 .in(OrderBaseInfoDO::getId, ids) 505 .in(OrderBaseInfoDO::getId, ids)
490 .set(OrderBaseInfoDO::getEnableFlag, Constant.UNABLE_TWENTY); 506 .set(OrderBaseInfoDO::getEnableFlag, Constant.UNABLE_TWENTY);
491 update(updateWrapper); 507 update(updateWrapper);
  508 +
  509 + Long orderId = orderBaseInfoQueryVO.getId();
  510 +
  511 + //删除订单关联信息
  512 + this.deleteRelationInfoByOrderId(orderId);
  513 +
  514 +
492 return ServerResult.success(); 515 return ServerResult.success();
493 } 516 }
  517 +
  518 + /**
  519 + * 删除订单关联信息
  520 + * @param orderId
  521 + */
  522 + private void deleteRelationInfoByOrderId(Long orderId) {
  523 + //订单审批日志
  524 + orderAuditLogService.deleteByOrderId(orderId);
  525 +
  526 + //订单-项目完成报告书
  527 + orderCompletionReportService.deleteByOrderId(orderId);
  528 +
  529 + //用户订单-字段锁定申请表
  530 + orderFieldLockApplyService.deleteByOrderId(orderId);
  531 +
  532 + //用户订单-字段锁定记录表
  533 + orderFieldLockRecordService.deleteByOrderId(orderId);
  534 +
  535 + //订单-质检环节
  536 + orderInspectionStageService.deleteByOrderId(orderId);
  537 +
  538 + //用户订单操作日志表
  539 + orderOptLogService.deleteByOrderId(orderId);
  540 +
  541 + //订单利润分析表
  542 + profitAnalysisService.deleteByOrderId(orderId);
  543 +
  544 + //订单-跟单环节
  545 + trackStageService.deleteByOrderId(orderId);
  546 + }
494 } 547 }
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
  View file @008511c
@@ -120,4 +120,18 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio @@ -120,4 +120,18 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
120 update(updateWrapper); 120 update(updateWrapper);
121 return ServerResult.success(); 121 return ServerResult.success();
122 } 122 }
  123 +
  124 + /**
  125 + * 通过订单id逻辑删除
  126 + * @param orderId
  127 + * @return
  128 + */
  129 + @Override
  130 + public boolean deleteByOrderId(Long orderId) {
  131 + LambdaUpdateWrapper<OrderCompletionReportDO> updateWrapper = new LambdaUpdateWrapper<OrderCompletionReportDO>()
  132 + .in(OrderCompletionReportDO::getOrderId, orderId)
  133 + .set(OrderCompletionReportDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 +
  135 + return update(updateWrapper);
  136 + }
123 } 137 }
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @008511c
@@ -251,4 +251,18 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp @@ -251,4 +251,18 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
251 update(updateWrapper); 251 update(updateWrapper);
252 return ServerResult.success(); 252 return ServerResult.success();
253 } 253 }
  254 +
  255 + /**
  256 + * 通过订单id逻辑删除
  257 + * @param orderId
  258 + * @return
  259 + */
  260 + @Override
  261 + public boolean deleteByOrderId(Long orderId) {
  262 + LambdaUpdateWrapper<OrderFieldLockApplyDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockApplyDO>()
  263 + .in(OrderFieldLockApplyDO::getOrderId, orderId)
  264 + .set(OrderFieldLockApplyDO::getEnableFlag, Constant.UNABLE_TWENTY);
  265 + update(updateWrapper);
  266 + return false;
  267 + }
254 } 268 }
src/main/java/com/order/erp/service/order/impl/OrderFieldLockRecordServiceImpl.java
  View file @008511c
@@ -120,4 +120,18 @@ public class OrderFieldLockRecordServiceImpl extends ServiceImpl&lt;OrderFieldLockR @@ -120,4 +120,18 @@ public class OrderFieldLockRecordServiceImpl extends ServiceImpl&lt;OrderFieldLockR
120 update(updateWrapper); 120 update(updateWrapper);
121 return ServerResult.success(); 121 return ServerResult.success();
122 } 122 }
  123 +
  124 + /**
  125 + * 通过订单id逻辑删除
  126 + * @param orderId
  127 + * @return
  128 + */
  129 + @Override
  130 + public boolean deleteByOrderId(Long orderId) {
  131 + LambdaUpdateWrapper<OrderFieldLockRecordDO> updateWrapper = new LambdaUpdateWrapper<OrderFieldLockRecordDO>()
  132 + .in(OrderFieldLockRecordDO::getOrderId, orderId)
  133 + .set(OrderFieldLockRecordDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 +
  135 + return update(updateWrapper);
  136 + }
123 } 137 }
src/main/java/com/order/erp/service/order/impl/OrderInspectionStageServiceImpl.java
  View file @008511c
@@ -120,4 +120,12 @@ public class OrderInspectionStageServiceImpl extends ServiceImpl&lt;OrderInspection @@ -120,4 +120,12 @@ public class OrderInspectionStageServiceImpl extends ServiceImpl&lt;OrderInspection
120 update(updateWrapper); 120 update(updateWrapper);
121 return ServerResult.success(); 121 return ServerResult.success();
122 } 122 }
  123 +
  124 + @Override
  125 + public boolean deleteByOrderId(Long orderId) {
  126 + LambdaUpdateWrapper<OrderInspectionStageDO> updateWrapper = new LambdaUpdateWrapper<OrderInspectionStageDO>()
  127 + .in(OrderInspectionStageDO::getOrderId, orderId)
  128 + .set(OrderInspectionStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
  129 + return update(updateWrapper);
  130 + }
123 } 131 }
src/main/java/com/order/erp/service/order/impl/OrderOptLogServiceImpl.java
  View file @008511c
@@ -120,4 +120,17 @@ public class OrderOptLogServiceImpl extends ServiceImpl&lt;OrderOptLogMapper, Order @@ -120,4 +120,17 @@ public class OrderOptLogServiceImpl extends ServiceImpl&lt;OrderOptLogMapper, Order
120 update(updateWrapper); 120 update(updateWrapper);
121 return ServerResult.success(); 121 return ServerResult.success();
122 } 122 }
  123 +
  124 + /**
  125 + * 通过订单id逻辑删除
  126 + * @param orderId
  127 + * @return
  128 + */
  129 + @Override
  130 + public boolean deleteByOrderId(Long orderId) {
  131 + LambdaUpdateWrapper<OrderOptLogDO> updateWrapper = new LambdaUpdateWrapper<OrderOptLogDO>()
  132 + .in(OrderOptLogDO::getOrderId, orderId)
  133 + .set(OrderOptLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 + return update(updateWrapper);
  135 + }
123 } 136 }
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
  View file @008511c
@@ -120,4 +120,17 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly @@ -120,4 +120,17 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
120 update(updateWrapper); 120 update(updateWrapper);
121 return ServerResult.success(); 121 return ServerResult.success();
122 } 122 }
  123 +
  124 + /**
  125 + * 通过订单id逻辑删除
  126 + * @param orderId
  127 + * @return
  128 + */
  129 + @Override
  130 + public boolean deleteByOrderId(Long orderId) {
  131 + LambdaUpdateWrapper<OrderProfitAnalysisDO> updateWrapper = new LambdaUpdateWrapper<OrderProfitAnalysisDO>()
  132 + .in(OrderProfitAnalysisDO::getOrderId, orderId)
  133 + .set(OrderProfitAnalysisDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 + return update(updateWrapper);
  135 + }
123 } 136 }
src/main/java/com/order/erp/service/order/impl/OrderTrackStageServiceImpl.java
  View file @008511c
@@ -120,4 +120,17 @@ public class OrderTrackStageServiceImpl extends ServiceImpl&lt;OrderTrackStageMappe @@ -120,4 +120,17 @@ public class OrderTrackStageServiceImpl extends ServiceImpl&lt;OrderTrackStageMappe
120 update(updateWrapper); 120 update(updateWrapper);
121 return ServerResult.success(); 121 return ServerResult.success();
122 } 122 }
  123 +
  124 + /**
  125 + * 通过订单id逻辑删除
  126 + * @param orderId
  127 + * @return
  128 + */
  129 + @Override
  130 + public boolean deleteByOrderId(Long orderId) {
  131 + LambdaUpdateWrapper<OrderTrackStageDO> updateWrapper = new LambdaUpdateWrapper<OrderTrackStageDO>()
  132 + .in(OrderTrackStageDO::getOrderId, orderId)
  133 + .set(OrderTrackStageDO::getEnableFlag, Constant.UNABLE_TWENTY);
  134 + return update(updateWrapper);
  135 + }
123 } 136 }