aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand:TMS-现金核销界面/月结核销界面/发票收款界面新增限制交易/退款时间不能早于当天

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-05-27 18:58:44 +08:00
parent ace2a5034d
commit db4e658ec1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
View File

@ -154,7 +154,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
} }
// 校验交易日期不能晚于当天 // 校验交易日期不能晚于当天
checkTradeDate(emisSettlePayRecord); checkDate(emisSettlePayRecord);
emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo())); emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo()));
// 多账单合并收款 // 多账单合并收款
@ -238,17 +238,26 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
return 1; 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) { if (emisSettlePayRecord.getTradeDate() != null) {
LocalDate tradeDate = emisSettlePayRecord.getTradeDate().toInstant() LocalDate tradeDate = emisSettlePayRecord.getTradeDate().toInstant()
.atZone(ZoneId.systemDefault()) .atZone(ZoneId.systemDefault())
.toLocalDate(); .toLocalDate();
LocalDate today = LocalDate.now();
if (tradeDate.isAfter(today)) { if (tradeDate.isAfter(today)) {
throw new EmisBizError(EmisBizErrorType.FAIL, throw new EmisBizError(EmisBizErrorType.FAIL,
"交易时间不能晚于当天（" + today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "）"); "交易时间不能晚于当天（" + 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")) + "）");
}
}
} }
/** /**