From e6778264342fc354cc855c09db4fcf919830089d Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Wed, 29 May 2024 21:02:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E5=BC=82=E5=B8=B8=E5=B7=A5=E5=8D=95=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AftersalesWorkOrderController.java  |  2 ++
 .../AftersalesProcessingResultsServiceImpl.java    | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
index a3556288d..c7344dd02 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
@@ -440,8 +440,10 @@ public class AftersalesWorkOrderController extends BladeController {
 		try {
 			return R.status(aftersalesWorkOrderService.updateCompletionEnd(aftersalesWorkOrder));
 		} catch (ServiceException s){
+			s.printStackTrace();
 			return R.fail(s.getMessage());
 		} catch (Exception e){
+			e.printStackTrace();
 			log.error("修改完结处理》》》{}",e.getMessage());
 			return R.fail("系统异常！！！");
 		}
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java
index c30d7c640..f759dec87 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java
@@ -17,8 +17,10 @@
 package com.logpm.aftersales.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO;
+import com.logpm.aftersales.entity.AftersalesCompletionRecipientEntity;
 import com.logpm.aftersales.entity.AftersalesProcessingMoneyEntity;
 import com.logpm.aftersales.entity.AftersalesProcessingResultsEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
@@ -106,6 +108,10 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 		}else{
 			//修改
 			baseMapper.updateById(aftersalesProcessingResults);
+			LambdaUpdateWrapper<AftersalesProcessingMoneyEntity> completionRecipientEntityLambdaUpdateWrapper = Wrappers.<AftersalesProcessingMoneyEntity>lambdaUpdate()
+				.set(AftersalesProcessingMoneyEntity::getIsDeleted, 1)
+				.eq(AftersalesProcessingMoneyEntity::getProcessingResultsId, aftersalesProcessingResults.getId());
+			aftersalesProcessingMoneyService.update(completionRecipientEntityLambdaUpdateWrapper);
 			if(ObjectUtil.isNotNull(aftersalesProcessingResults.getProcessingMoneyEntityList())){
 				aftersalesProcessingResults.getProcessingMoneyEntityList().forEach(i ->{
 					if(ObjectUtil.isNotNull(i.getId()) ){
@@ -122,10 +128,10 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 					}
 				});
 			}
-			if(ObjectUtil.isNotNull(aftersalesProcessingResults.getAssignList()) &&   ObjectUtil.isNotNull( aftersalesProcessingResults.getAssignList().get(0)) ){
-				//删除
-				aftersalesProcessingMoneyService.deleteLogic(aftersalesProcessingResults.getAssignList());
-			}
+//			if(ObjectUtil.isNotNull(aftersalesProcessingResults.getAssignList()) &&   ObjectUtil.isNotNull( aftersalesProcessingResults.getAssignList().get(0)) ){
+//				//删除
+//				aftersalesProcessingMoneyService.deleteLogic(aftersalesProcessingResults.getAssignList());
+//			}
 
 		}
 		return true;