From 72748b711371f854e4872b72977b80c626a4e5d9 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Fri, 17 Oct 2025 08:52:16 +0800
Subject: [PATCH] no message

---
 .../impl/AfterServiceRecordServiceImpl.java   | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
index a8b591d9..fb71e68d 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
@@ -199,6 +199,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         // 新增：处理客户同意上门重做方案
         if (param.getCustomerAgreeRedo() != null) {
             afterServiceRecord.setCustomerAgreeRedo(param.getCustomerAgreeRedo());
+            if (param.getUpdateBy() != null) {
+                afterServiceRecord.setUpdateBy(param.getUpdateBy());
+            }
             afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
             log.info("客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo());
             return AjaxResult.success("客户同意方案状态已更新");
@@ -214,6 +217,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
             if (param.getRedoCompleteImages() != null) {
                 afterServiceRecord.setRedoCompleteImages(param.getRedoCompleteImages());
             }
+            if (param.getUpdateBy() != null) {
+                afterServiceRecord.setUpdateBy(param.getUpdateBy());
+            }
             afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
             log.info("师傅重做/补做完成，记录ID：{}，完成时间：{}", param.getId(), afterServiceRecord.getRedoCompleteTime());
             return AjaxResult.success("重做/补做完成状态已更新");
@@ -228,7 +234,19 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
             calendar.add(Calendar.HOUR_OF_DAY, 36);
             afterServiceRecord.setRedoCompleteTime(calendar.getTime());
             
-
+            // 处理师傅反馈相关字段
+            if (param.getWorkerFeedbackReasonType() != null) {
+                afterServiceRecord.setWorkerFeedbackReasonType(param.getWorkerFeedbackReasonType());
+            }
+            if (param.getWorkerFeedbackReason() != null) {
+                afterServiceRecord.setWorkerFeedbackReason(param.getWorkerFeedbackReason());
+            }
+            if (param.getWorkerFeedbackImages() != null) {
+                afterServiceRecord.setWorkerFeedbackImages(param.getWorkerFeedbackImages());
+            }
+            if (param.getUpdateBy() != null) {
+                afterServiceRecord.setUpdateBy(param.getUpdateBy());
+            }
             
             afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
             log.info("师傅反馈结果为{}，记录ID：{}，redoCompleteTime设置为：{}", param.getWorkerFeedbackResult(), param.getId(), afterServiceRecord.getRedoCompleteTime());
@@ -407,6 +425,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         // 新增：处理客户同意上门重做方案
         if (param.getCustomerAgreeRedo() != null) {
             afterServiceRecord.setCustomerAgreeRedo(param.getCustomerAgreeRedo());
+            if (param.getUpdateBy() != null) {
+                afterServiceRecord.setUpdateBy(param.getUpdateBy());
+            }
             afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
             log.info("商品售后-客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo());
             return AjaxResult.success("客户同意方案状态已更新");
@@ -422,6 +443,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
             if (param.getRedoCompleteImages() != null) {
                 afterServiceRecord.setRedoCompleteImages(param.getRedoCompleteImages());
             }
+            if (param.getUpdateBy() != null) {
+                afterServiceRecord.setUpdateBy(param.getUpdateBy());
+            }
             afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
             log.info("商品售后-师傅重做/补做完成，记录ID：{}，完成时间：{}", param.getId(), afterServiceRecord.getRedoCompleteTime());
             return AjaxResult.success("重做/补做完成状态已更新");
@@ -447,6 +471,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
             if (param.getWorkerResendImages() != null) {
                 afterServiceRecord.setWorkerResendImages(param.getWorkerResendImages());
             }
+            if (param.getUpdateBy() != null) {
+                afterServiceRecord.setUpdateBy(param.getUpdateBy());
+            }
             
             afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);