Merge branch 'dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -2008,7 +2008,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				throw new ServiceException("已处理！");
 			}
 		}
-
+		LambdaUpdateWrapper<AftersalesCompletionRecordEntity> completionRecordEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecordEntity>lambdaUpdate()
+			.set(AftersalesCompletionRecordEntity::getIsDeleted, 1)
+			.eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId());
+		completionRecordService.update(completionRecordEntityLambdaUpdateWrapper);
 		//异常工单完结处理结果赔款方
 		if (!aftersalesWorkOrder.getCompletionRecordEntities().isEmpty()) {
 			aftersalesWorkOrder.getCompletionRecordEntities().forEach(r -> {
@@ -2021,11 +2024,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 //			if (ObjectUtils.isNotNull(aftersalesWorkOrder.getAssignListRecord())) {
 //				completionRecordService.deleteLogic(aftersalesWorkOrder.getAssignListRecord());
 //			}
-			LambdaUpdateWrapper<AftersalesCompletionRecordEntity> completionRecipientEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecordEntity>lambdaUpdate()
-				.set(AftersalesCompletionRecordEntity::getIsDeleted, 1)
-				.eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId());
-			completionRecordService.update(completionRecipientEntityLambdaUpdateWrapper);
+
 		}
+		LambdaUpdateWrapper<AftersalesCompletionRecipientEntity> completionRecipientEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecipientEntity>lambdaUpdate()
+			.set(AftersalesCompletionRecipientEntity::getIsDeleted, 1)
+			.eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId());
+		completionRecipientService.update(completionRecipientEntityLambdaUpdateWrapper);
 		//异常工单完结处理结果受款方
 		if (!aftersalesWorkOrder.getCompletionRecipientEntities().isEmpty()) {
 			aftersalesWorkOrder.getCompletionRecipientEntities().forEach(r -> {
@@ -2041,10 +2045,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 //				//删除
 //				completionRecipientService.deleteLogic(aftersalesWorkOrder.getAssignListRecipient());
 //			}
-			LambdaUpdateWrapper<AftersalesCompletionRecipientEntity> completionRecipientEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecipientEntity>lambdaUpdate()
-				.set(AftersalesCompletionRecipientEntity::getIsDeleted, 1)
-				.eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId());
-			completionRecipientService.update(completionRecipientEntityLambdaUpdateWrapper);
+
 
 		}
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();