From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index 7dd0207..199eaf5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -76,7 +76,7 @@
 		Order order = orderService.getById(applyRefundPass.getId());
 		//判断是都已经超过售后时间
 		LocalDateTime afterSaleTime = order.getAfterSaleTime();
-		if(null != afterSaleTime && afterSaleTime.toEpochSecond(ZoneOffset.UTC) < LocalDateTime.now().toEpochSecond(ZoneOffset.UTC)){
+		if(null != afterSaleTime && LocalDateTime.now().isAfter(afterSaleTime)){
 			return R.fail("已超过售后期间");
 		}
 		
@@ -219,6 +219,8 @@
 		refundPassInfo.setRefundReason(refundPass.getRefundReason());
 		refundPassInfo.setUserRemark(refundPass.getUserRemark());
 		refundPassInfo.setPics(refundPass.getPics());
+		refundPassInfo.setPassStatus(refundPass.getPassStatus());
+		refundPassInfo.setPassRemark(refundPass.getPassRemark());
 		return refundPassInfo;
 	}
 }

--
Gitblit v1.7.1