From db4e658ec175875118b476bb31300c88dd6fc858 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 27 May 2025 18:58:44 +0800
Subject: [PATCH] =?UTF-8?q?demand:TMS-=E7=8E=B0=E9=87=91=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2/=E6=9C=88=E7=BB=93=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2/=E5=8F=91=E7=A5=A8=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=96=B0=E5=A2=9E=E9=99=90=E5=88=B6=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93/=E9=80=80=E6=AC=BE=E6=97=B6=E9=97=B4=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=97=A9=E4=BA=8E=E5=BD=93=E5=A4=A9=20committer:=20he?=
 =?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisSettlePayRecordServiceImpl.java      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
index a5a80ab1a..734000195 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
@@ -154,7 +154,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
         }
 
         // 校验交易日期不能晚于当天
-        checkTradeDate(emisSettlePayRecord);
+        checkDate(emisSettlePayRecord);
 
         emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo()));
         // 多账单合并收款
@@ -238,17 +238,26 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
         return 1;
     }
 
-    private static void checkTradeDate(EmisSettlePayRecord emisSettlePayRecord) throws EmisBizError {
+    private static void checkDate(EmisSettlePayRecord emisSettlePayRecord) throws EmisBizError {
+        LocalDate today = LocalDate.now();
         if (emisSettlePayRecord.getTradeDate() != null) {
             LocalDate tradeDate = emisSettlePayRecord.getTradeDate().toInstant()
                     .atZone(ZoneId.systemDefault())
                     .toLocalDate();
-            LocalDate today = LocalDate.now();
             if (tradeDate.isAfter(today)) {
                 throw new EmisBizError(EmisBizErrorType.FAIL,
                         "交易时间不能晚于当天（" + today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "）");
             }
         }
+        if (emisSettlePayRecord.getRefundDate() != null) {
+            LocalDate refundDate = emisSettlePayRecord.getRefundDate().toInstant()
+                    .atZone(ZoneId.systemDefault())
+                    .toLocalDate();
+            if (refundDate.isAfter(today)) {
+                throw new EmisBizError(EmisBizErrorType.FAIL,
+                        "退款时间不能晚于当天（" + today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "）");
+            }
+        }
     }
 
     /**