From cb3e5d98a8c333ecd6b176aad59730184e17e7ee Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Mon, 8 Sep 2025 17:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=BA=9B=E6=9C=AA=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AfterServiceRecordServiceImpl.java   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

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 453305fc..cefbe02f 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
@@ -416,6 +416,26 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
             afterServiceRecord.setWorkerReceiveStatus(param.getWorkerReceiveStatus());
             afterServiceRecord.setWorkerAgreeType(param.getWorkerAgreeType());
             
+            // 处理师傅反馈相关字段
+            if (param.getWorkerFeedbackReasonType() != null) {
+                afterServiceRecord.setWorkerFeedbackReasonType(param.getWorkerFeedbackReasonType());
+            }
+            if (param.getWorkerFeedbackReason() != null) {
+                afterServiceRecord.setWorkerFeedbackReason(param.getWorkerFeedbackReason());
+            }
+            if (param.getWorkerFeedbackResult() != null) {
+                afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult());
+            }
+            if (param.getAgreedRefund() != null) {
+                afterServiceRecord.setAgreedRefund(param.getAgreedRefund());
+            }
+            if (param.getUpdateBy() != null) {
+                afterServiceRecord.setUpdateBy(param.getUpdateBy());
+            }
+            if (param.getRefund() != null) {
+                afterServiceRecord.setRefund(param.getRefund());
+            }
+
             // 根据不同的状态和方式执行不同的业务逻辑
            // handleWorkerProcessLogic(afterServiceRecord, orderDetail);
             
@@ -436,6 +456,13 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
             // 商品售后的处理逻辑
             if (one.equals(param.getCustomerFinalCheck())) {
                 afterServiceRecord.setCustomerFinalCheck(1L);
+                // 保存操作者和退款金额
+                if (param.getUpdateBy() != null) {
+                    afterServiceRecord.setUpdateBy(param.getUpdateBy());
+                }
+                if (param.getRefund() != null) {
+                    afterServiceRecord.setRefund(param.getRefund());
+                }
                 log.info("商品售后-客户同意处理方案");
                 
                 // 商品售后特殊处理：客户同意且师傅选择即时退单退款时立即执行退款
@@ -467,6 +494,13 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
                 if (param.getCustomerDisagreeReason() != null) {
                     afterServiceRecord.setCustomerDisagreeReason(param.getCustomerDisagreeReason());
                 }
+                // 保存操作者和退款金额
+                if (param.getUpdateBy() != null) {
+                    afterServiceRecord.setUpdateBy(param.getUpdateBy());
+                }
+                if (param.getRefund() != null) {
+                    afterServiceRecord.setRefund(param.getRefund());
+                }
                 // 更新子单和主单的售后状态为售后纠纷
                 updateAfterServiceStatus(afterServiceRecord.getOrderDetailId(), 1);
                 log.info("商品售后-客户不同意处理方案");