From bc9d50bf0c8a1ebdaabb86c02a4503576b75db64 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Thu, 6 Nov 2025 11:01:46 +0800 Subject: [PATCH] no message --- .../controller/order/OrderDetailController.java | 6 +++--- .../controller/order/OrderMasterController.java | 1 + .../com/ghy/web/pojo/vo/OrderStandardDetail.java | 2 ++ .../impl/AfterServiceRecordServiceImpl.java | 15 ++++++++++----- .../mapper/order/AfterServiceRecordMapper.xml | 8 ++++---- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 88063eb2..eb1e7f9b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -503,10 +503,10 @@ public class OrderDetailController extends BaseController { } } // 从detailPayMoney中减去平台退款金额 - if (totalPlatformRefund.compareTo(BigDecimal.ZERO) > 0) { - orderListResponse.setPayAddMoney(detailPayMoney.subtract(totalPlatformRefund)); + // if (totalPlatformRefund.compareTo(BigDecimal.ZERO) > 0) { + // orderListResponse.setPayAddMoney(detailPayMoney.subtract(totalPlatformRefund)); - } + // } } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index c6993397..e3fbe633 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -1855,6 +1855,7 @@ public class OrderMasterController extends BaseController { } OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); + orderStandardDetail.setPayStatus(orderMaster.getPayStatus()); orderStandardDetail.setAfterPlatformServiceStatus(orderDetail.getAfterServiceStatus()); orderStandardDetail.setOrderImages(orderDetail.getOrderImages()); orderStandardDetail.setHandoverImages(orderDetail.getHandoverImages()); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java index 448ca78f..d4aed708 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java @@ -130,4 +130,6 @@ public class OrderStandardDetail { private String orderImages; //= "售后状态：0-无售后，1-售后纠纷,2-售后已完成,3-售后已取消" private Integer afterPlatformServiceStatus; + + private Integer payStatus; } 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 53f35293..e32f3b11 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 @@ -294,6 +294,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService if (param.getUpdateBy() != null) { afterServiceRecord.setUpdateBy(param.getUpdateBy()); } + afterServiceRecord.setRedoCompleteTime(null); afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); log.info("客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo()); return AjaxResult.success("客户同意方案状态已更新"); @@ -321,10 +322,10 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService if (param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) { afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult()); // 设置当前时间推后36小时 - Calendar calendar = Calendar.getInstance(); - calendar.setTime(new Date()); - calendar.add(Calendar.HOUR_OF_DAY, 36); - afterServiceRecord.setRedoCompleteTime(calendar.getTime()); + // Calendar calendar = Calendar.getInstance(); + // calendar.setTime(new Date()); + // // calendar.add(Calendar.HOUR_OF_DAY, 36); + afterServiceRecord.setRedoCompleteTime(new Date()); // 处理师傅反馈相关字段 if (param.getWorkerFeedbackReasonType() != null) { @@ -349,6 +350,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService } if (param.getCustomerFinalCheck()!=null ) { + afterServiceRecord.setRedoCompleteTime(null); // 检查是否已经被自动处理过，防止重复退款 if (afterServiceRecord.getIsAutoProcessed() != null && afterServiceRecord.getIsAutoProcessed() == 1) { log.warn("售后记录[{}]已被自动处理，不允许手动重复操作", afterServiceRecord.getId()); @@ -586,8 +588,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService if (param.getUpdateBy() != null) { afterServiceRecord.setUpdateBy(param.getUpdateBy()); } + afterServiceRecord.setRedoCompleteTime(null); // 设置客户操作时间 - afterServiceRecord.setCustomerOperationTime(new Date()); + afterServiceRecord.setCustomerOperationTime(new Date()); afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); log.info("商品售后-客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo()); return AjaxResult.success("客户同意方案状态已更新"); @@ -733,6 +736,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService } if (param.getCustomerFinalCheck()!=null ) { + afterServiceRecord.setRedoCompleteTime(null); // 检查是否已经被自动处理过，防止重复退款 if (afterServiceRecord.getIsAutoProcessed() != null && afterServiceRecord.getIsAutoProcessed() == 1) { log.warn("商品售后记录[{}]已被自动处理，不允许手动重复操作", afterServiceRecord.getId()); @@ -1268,6 +1272,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService param.getId(), param.getReturnTrackingNumber()); } + afterServiceRecord.setWorkerResendPlanTime(null); afterServiceRecord.setUpdateBy(param.getUpdateBy()); afterServiceRecord.setRedoCompleteTime(null); // 设置客户操作时间 diff --git a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml index 43ff151f..f19110c3 100644 --- a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml @@ -84,7 +84,7 @@ and agreed_refund = #{agreedRefund} and customer_final_check = #{customerFinalCheck} - and ( customer_final_check = '0' or customer_final_check is null ) + and ((customer_final_check = '0' and (after_service_status != '2'and after_service_status != '1')) or customer_final_check is null ) @@ -221,8 +221,8 @@ platform_refund = #{platformRefund}, customer_final_check = #{customerFinalCheck}, customer_agree_redo = #{customerAgreeRedo}, - customer_operation_time = #{customerOperationTime}, - redo_complete_time = #{redoCompleteTime}, + customer_operation_time = #{customerOperationTime}, + redo_complete_time = #{redoCompleteTime}, redo_complete_remark = #{redoCompleteRemark}, redo_complete_images = #{redoCompleteImages}, is_auto_processed = #{isAutoProcessed}, @@ -239,7 +239,7 @@ return_ship_time = #{returnShipTime}, merchant_receive_time = #{merchantReceiveTime}, worker_resend_plan = #{workerResendPlan}, - worker_resend_plan_time = #{workerResendPlanTime}, + worker_resend_plan_time = #{workerResendPlanTime}, worker_resend_time = #{workerResendTime}, worker_resend_type = #{workerResendType}, worker_resend_tracking_number = #{workerResendTrackingNumber},