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 adfb86b01..83418d923 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 @@ -109,14 +109,17 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I throw new EmisBizError(EmisBizErrorType.FAIL,"账单编号不能为空"); } +// || BigDecimal.ZERO.compareTo(emisSettlePayRecord.getPayMoney()) == 0 if("1".equals(emisSettlePayRecord.getRecType())) { - if (emisSettlePayRecord.getPayMoney() == null || BigDecimal.ZERO.compareTo(emisSettlePayRecord.getPayMoney()) == 0) { - throw new EmisBizError(EmisBizErrorType.FAIL, "收款金额不能为0"); + 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 || BigDecimal.ZERO.compareTo(emisSettlePayRecord.getRefundMoney()) == 0) { - throw new EmisBizError(EmisBizErrorType.FAIL, "退款金额不能为0"); + if (emisSettlePayRecord.getRefundMoney()== null ) { + throw new EmisBizError(EmisBizErrorType.FAIL, "退款金额不能为空"); } }