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("商品售后-客户不同意处理方案");