diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java index 6d62f980..fcc9cee0 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java @@ -127,7 +127,6 @@ public class VisaChangeTempCreateReq { /** * 有符号的变更金额 */ - @NotNull(message = "变更金额不能为空") private BigDecimal amountChange; /** diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 2340ab75..aee7360b 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -702,13 +702,17 @@ public class ChangeRecordServiceImpl extends ServiceImpl 0) { - amountDesc = "增加" + req.getAmountChange().toPlainString() + "元"; - } else if (req.getAmountChange().compareTo(BigDecimal.ZERO) < 0) { - amountDesc = "减少" + req.getAmountChange().toPlainString() + "元"; + + // 非必填项 + if (Objects.nonNull(req.getAmountChange())) { + String amountDesc = "不变"; + if (req.getAmountChange().compareTo(BigDecimal.ZERO) > 0) { + amountDesc = "增加" + req.getAmountChange().toPlainString() + "元"; + } else if (req.getAmountChange().compareTo(BigDecimal.ZERO) < 0) { + amountDesc = "减少" + req.getAmountChange().toPlainString() + "元"; + } + formVariables.put(FORM_FIELD_AMOUNT_CHANGE, amountDesc); } - formVariables.put(FORM_FIELD_AMOUNT_CHANGE, amountDesc); // 三种单据 if (MapUtils.isNotEmpty(req.getRelationOrderMap())) {