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 16811a5f..58296c43 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 @@ -1688,8 +1688,9 @@ public class OrderMasterController extends BaseController { } // 设置退款金额和处理原因 - record.setRefund(request.getRefundAmount()); - record.setAgreedRefund(request.getRefundAmount()); + // record.setRefund(request.getRefundAmount()); + // record.setAgreedRefund(request.getRefundAmount()); + record.setPlatformRefund(request.getRefundAmount()); record.setRefundApplyTime(new Date()); record.setPlatformHandleReason(request.getPlatformHandleReason()); diff --git a/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java b/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java index 4a8f9949..15bb9983 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java @@ -77,6 +77,10 @@ public class AfterServiceRecord extends BaseEntity @Excel(name = "协商后的退款金额") private BigDecimal agreedRefund; + /** 平台退款金额 */ + @Excel(name = "平台退款金额") + private BigDecimal platformRefund; + /** 客户最终确认:0为不同意,1为同意 */ @Excel(name = "客户最终确认:0为不同意,1为同意") private Long customerFinalCheck; diff --git a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml index fbc6c4c9..55ffd771 100644 --- a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml @@ -16,6 +16,7 @@ + @@ -58,7 +59,7 @@ select id, customer_reason_type, customer_reason, order_detail_id, oper_type, worker_feedback_result, - worker_feedback_reason_type, worker_feedback_reason, worker_feedback_images, refund, agreed_refund, original_refund, + worker_feedback_reason_type, worker_feedback_reason, worker_feedback_images, refund, agreed_refund, platform_refund, original_refund, customer_final_check, create_by, create_time, update_by, update_time, remark, refund_apply_time, customer_agree_redo, redo_complete_time, redo_complete_remark, redo_complete_images, is_auto_processed, after_service_category, after_service_type, return_status, return_address, return_contact, return_phone, return_type, return_remark, return_images, return_tracking_number, return_ship_time, merchant_receive_time, worker_resend_plan, worker_resend_time, worker_resend_type, worker_resend_tracking_number, worker_receive_status, worker_agree_type, worker_receive_confirm, worker_resend_remark, worker_resend_images, @@ -109,6 +110,7 @@ worker_feedback_images, refund, agreed_refund, + platform_refund, customer_final_check, customer_agree_redo, redo_complete_time, @@ -156,6 +158,7 @@ #{workerFeedbackImages}, #{refund}, #{agreedRefund}, + #{platformRefund}, #{customerFinalCheck}, #{customerAgreeRedo}, #{redoCompleteTime}, @@ -209,6 +212,7 @@ worker_feedback_images = #{workerFeedbackImages}, refund = #{refund}, agreed_refund = #{agreedRefund}, + platform_refund = #{platformRefund}, customer_final_check = #{customerFinalCheck}, customer_agree_redo = #{customerAgreeRedo}, redo_complete_time = #{redoCompleteTime},