save

getmoneynote · Mar 20, 2024 · 692bec3 · 692bec3
1 parent a49a5c9
commit 692bec3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/cn/biq/mn/account/AccountService.java b/src/main/java/cn/biq/mn/account/AccountService.java
@@ -241,8 +241,8 @@ public boolean adjustBalance(Integer id, AdjustBalanceAddForm form) {
     public boolean updateAdjustBalance(Integer id, AdjustBalanceUpdateForm form) {
         BalanceFlow balanceFlow = baseService.findFlowById(id);
         BalanceFlowMapper.updateEntity(form, balanceFlow);
-        if (form.getBookId() != null) {
-            balanceFlow.setBook(baseService.getBookInGroup(form.getBookId()));
+        if (form.getBook() != null) {
+            balanceFlow.setBook(baseService.getBookInGroup(form.getBook()));
         }
         balanceFlowRepository.save(balanceFlow);
         return true;

diff --git a/src/main/java/cn/biq/mn/account/AdjustBalanceUpdateForm.java b/src/main/java/cn/biq/mn/account/AdjustBalanceUpdateForm.java
@@ -10,7 +10,7 @@
 @Getter @Setter
 public class AdjustBalanceUpdateForm {
 
-    private Integer bookId;
+    private Integer book;
 
     @NotNull
     @TimeField

diff --git a/src/main/java/cn/biq/mn/balanceflow/BalanceFlowService.java b/src/main/java/cn/biq/mn/balanceflow/BalanceFlowService.java
@@ -132,9 +132,11 @@ public boolean add(BalanceFlowAddForm form) {
         if (form.getTags() != null) {
             tagRelationService.addRelation(form.getTags(), entity, book, entity.getAccount());
         }
-        if (form.getPayee() != null) {
-            Payee payee = payeeRepository.findOneByBookAndId(book, form.getPayee()).orElseThrow(ItemNotFoundException::new);
-            entity.setPayee(payee);
+        if (form.getType() == FlowType.EXPENSE || form.getType() == FlowType.INCOME) {
+            if (form.getPayee() != null) {
+                Payee payee = payeeRepository.findOneByBookAndId(book, form.getPayee()).orElseThrow(ItemNotFoundException::new);
+                entity.setPayee(payee);
+            }
         }
         balanceFlowRepository.save(entity);
         if (form.getConfirm()) {

diff --git a/src/main/java/cn/biq/mn/exception/GlobalExceptionHandler.java b/src/main/java/cn/biq/mn/exception/GlobalExceptionHandler.java
@@ -30,6 +30,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(MethodArgumentNotValidException.class)
     @ResponseBody
     public BaseResponse exceptionHandler(MethodArgumentNotValidException e) {
+        e.printStackTrace();
         ValidationErrorResponse response = new ValidationErrorResponse(HttpStatus.UNPROCESSABLE_ENTITY.value(), messageSourceUtil.getMessage("valid.fail"));
         for (FieldError fieldError : e.getBindingResult().getFieldErrors()) {
             response.getViolations().add(new Violation(fieldError.getField(), fieldError.getDefaultMessage()));
@@ -42,6 +43,7 @@ public BaseResponse exceptionHandler(MethodArgumentNotValidException e) {
     @ExceptionHandler(ConstraintViolationException.class)
     @ResponseBody
     ValidationErrorResponse exceptionHandler(ConstraintViolationException e) {
+        e.printStackTrace();
         ValidationErrorResponse response = new ValidationErrorResponse(4221, messageSourceUtil.getMessage("valid.fail"));
         for (ConstraintViolation<?> violation : e.getConstraintViolations()) {
             response.getViolations().add(new Violation(violation.getPropertyPath().toString(), violation.getMessage()));
@@ -53,6 +55,7 @@ ValidationErrorResponse exceptionHandler(ConstraintViolationException e) {
     @ExceptionHandler(BindException.class)
     @ResponseBody
     ValidationErrorResponse exceptionHandler(BindException e) {
+        e.printStackTrace();
         ValidationErrorResponse response = new ValidationErrorResponse(4223, messageSourceUtil.getMessage("valid.fail"));
         for (FieldError error : e.getBindingResult().getFieldErrors()) {
             response.getViolations().add(new Violation(error.getField(), error.getDefaultMessage()));
@@ -66,6 +69,7 @@ ValidationErrorResponse exceptionHandler(BindException e) {
 //    @ExceptionHandler(TransactionSystemException.class)
     @ResponseStatus(HttpStatus.UNPROCESSABLE_ENTITY)
     public BaseResponse exceptionHandler(TransactionSystemException e) {
+        e.printStackTrace();
         if (e.getRootCause() instanceof ConstraintViolationException) {
             ConstraintViolationException constraintViolationException = (ConstraintViolationException) e.getRootCause();
             ValidationErrorResponse response = new ValidationErrorResponse(4222, messageSourceUtil.getMessage("valid.fail"));
@@ -85,6 +89,7 @@ public BaseResponse exceptionHandler(TransactionSystemException e) {
     @ExceptionHandler(DataIntegrityViolationException.class)
     @ResponseBody
     public BaseResponse exceptionHandler(DataIntegrityViolationException e) {
+        e.printStackTrace();
         String rootMsg = "";
         if (e.getRootCause() != null) {
             rootMsg = e.getRootCause().getMessage();
@@ -95,6 +100,7 @@ public BaseResponse exceptionHandler(DataIntegrityViolationException e) {
     @ExceptionHandler(ItemExistsException.class)
     @ResponseBody
     public BaseResponse exceptionHandler(ItemExistsException e) {
+        e.printStackTrace();
         String errMsg;
         if (StringUtils.hasText(e.getMessage())) {
             errMsg = messageSourceUtil.getMessage(e.getMessage());
@@ -107,6 +113,7 @@ public BaseResponse exceptionHandler(ItemExistsException e) {
     @ExceptionHandler(ItemNotFoundException.class)
     @ResponseBody  // 404
     public BaseResponse exceptionHandler(ItemNotFoundException e) {
+        e.printStackTrace();
         String errMsg;
         if (StringUtils.hasText(e.getMessage())) {
             errMsg = messageSourceUtil.getMessage(e.getMessage());
@@ -119,6 +126,7 @@ public BaseResponse exceptionHandler(ItemNotFoundException e) {
     @ExceptionHandler(FailureMessageException.class)
     @ResponseBody
     public BaseResponse exceptionHandler(FailureMessageException e) {
+        e.printStackTrace();
         return new SimpleResponse(false, messageSourceUtil.getMessage(e.getMessage()), e.getShowType());
     }