From 1e2f0fea1780636431f38ba52a2c29a6baedcc66 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 29 May 2025 14:22:33 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=20-=20?=
 =?UTF-8?q?=E7=BC=B4=E6=AC=BE=E5=AE=A2=E6=88=B7=E6=98=AF=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E4=BD=86=E6=98=AF=E6=AD=A4=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E7=BC=B4=E6=AC=BE=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=91=A2=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisSettlePayRecordServiceImpl.java  | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 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 734000195..2009df0ae 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
@@ -26,6 +26,7 @@ import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.service.IEmisSettleBillService;
 import com.xdadan.erp.emis.service.IEmisSettleSubBillService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -135,23 +136,8 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
     @Override
     public int insertEmisSettlePayRecord(EmisSettlePayRecord emisSettlePayRecord,String payId) throws EmisBizError {
 
-        if(StringUtils.isEmpty(emisSettlePayRecord.getSettleBillNo())){
-           throw new EmisBizError(EmisBizErrorType.FAIL,"账单编号不能为空");
-        }
-
-//        || BigDecimal.ZERO.compareTo(emisSettlePayRecord.getPayMoney()) == 0
-        if("1".equals(emisSettlePayRecord.getRecType())) {
-            if (emisSettlePayRecord.getPayMoney() == null ) {
-                throw new EmisBizError(EmisBizErrorType.FAIL, "收款金额不能为空");
-            }
-        }
-
-//        || BigDecimal.ZERO.compareTo(emisSettlePayRecord.getRefundMoney()) == 0
-        else if("2".equals(emisSettlePayRecord.getRecType())) {
-            if (emisSettlePayRecord.getRefundMoney()== null ) {
-                throw new EmisBizError(EmisBizErrorType.FAIL, "退款金额不能为空");
-            }
-        }
+        // 非空校验
+        checkParam(emisSettlePayRecord);
 
         // 校验交易日期不能晚于当天
         checkDate(emisSettlePayRecord);
@@ -238,6 +224,43 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
         return 1;
     }
 
+    private static void checkParam(EmisSettlePayRecord emisSettlePayRecord) throws EmisBizError {
+        if(StringUtils.isEmpty(emisSettlePayRecord.getSettleBillNo())){
+           throw new EmisBizError(EmisBizErrorType.FAIL,"账单编号不能为空");
+        }
+
+        if("1".equals(emisSettlePayRecord.getRecType())) {
+            if (emisSettlePayRecord.getPayMoney() == null) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "收款金额不能为空");
+            }
+            if (StringUtil.isBlank(emisSettlePayRecord.getPayType())) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "支付方式不能为空");
+            }
+            if (StringUtil.isBlank(emisSettlePayRecord.getPayMan())) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "收款人不能为空");
+            }
+            if (emisSettlePayRecord.getTradeDate() == null) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "交易日期不能为空");
+            }
+        } else if("2".equals(emisSettlePayRecord.getRecType())) {
+            if (emisSettlePayRecord.getRefundMoney() == null) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "退款金额不能为空");
+            }
+            if (StringUtil.isBlank(emisSettlePayRecord.getPayMan())) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "退款人不能为空");
+            }
+            if (StringUtil.isBlank(emisSettlePayRecord.getRefundMode())) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "退款方式不能为空");
+            }
+            if (StringUtil.isBlank(emisSettlePayRecord.getRefundReason())) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "退款原因不能为空");
+            }
+            if (emisSettlePayRecord.getRefundDate() == null) {
+                throw new EmisBizError(EmisBizErrorType.FAIL, "退款日期不能为空");
+            }
+        }
+    }
+
     private static void checkDate(EmisSettlePayRecord emisSettlePayRecord) throws EmisBizError {
         LocalDate today = LocalDate.now();
         if (emisSettlePayRecord.getTradeDate() != null) {