修改提示语

src/main/java/com/dk/mdm/service/mac/AccountService.java

@@ -467,7 +467,7 @@ public class AccountService extends BaseService<Account> {
 
                             // 可用金额为负数，则不能保存
                             if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-                                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
                             }
                             super.updateByUuid(accountUpdate);
                         }
@@ -570,7 +570,7 @@ public class AccountService extends BaseService<Account> {
                         // 更新前的最后校验
                         // 可用金额为负数，则不能保存
                         if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-                            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
                         }
                         super.updateByUuid(accountUpdate);
 

src/main/java/com/dk/mdm/service/mac/MacTransferService.java

@@ -158,7 +158,7 @@ public class MacTransferService extends BaseService<MacTransfer> {
 				if(!moneyAccountForUpdate.getFlgNegative()){
 					// 如果账户余额比转出金额小，就不允许转出
 					if(moneyAccountForUpdate.getBalance().compareTo(macTransferItem.getAmtTrf()) == -1){
-						throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
+						throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
 					}
 				}
 

src/main/java/com/dk/mdm/service/mac/OtherPayableService.java

@@ -271,7 +271,7 @@ public class OtherPayableService extends BaseService<OtherPayable> {
 //            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getPaymentResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
             /*******************************************  应付付款的处理 end ********************************************/
@@ -342,7 +342,7 @@ public class OtherPayableService extends BaseService<OtherPayable> {
 //            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getPaymentResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
 
@@ -500,7 +500,7 @@ public class OtherPayableService extends BaseService<OtherPayable> {
 //            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getPaymentResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
             /*******************************************  应付付款的处理 end ********************************************/
@@ -610,7 +610,7 @@ public class OtherPayableService extends BaseService<OtherPayable> {
             }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getPaymentResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
 

src/main/java/com/dk/mdm/service/mac/OtherReceivableService.java

@@ -270,7 +270,7 @@ public class OtherReceivableService extends BaseService<OtherReceivable> {
 //            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
             /***********************************  应收收款的处理 end ************************************/
@@ -342,7 +342,7 @@ public class OtherReceivableService extends BaseService<OtherReceivable> {
 //            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
 
@@ -501,7 +501,7 @@ public class OtherReceivableService extends BaseService<OtherReceivable> {
 //            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
             /***********************************  应收收款的处理 end ************************************/
@@ -610,7 +610,7 @@ public class OtherReceivableService extends BaseService<OtherReceivable> {
             }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
 

src/main/java/com/dk/mdm/service/mac/ReceiptService.java

@@ -272,15 +272,16 @@ public class ReceiptService extends BaseService<RecPay> {
 
                 // 更新资金账户
                 MoneyAccount moneyAccountForUpdate = moneyAccountMapper.selectByIdForUpdate(recPayItem.getMacId());
-
-//                // 如果转账之后账户余额小于0，则提示资金账户余额不足，不能退款
-//                if ((moneyAccountForUpdate.getBalance().add(recPayItem.getAmtRec())).compareTo(BigDecimal.ZERO) == -1) {
-//                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
-//                }
-
                 MoneyAccount moneyAccountUpdate = new MoneyAccount();
                 moneyAccountUpdate.setBalance(moneyAccountForUpdate.getBalance().add(recPayItem.getAmtRec()))
                         .setMacId(moneyAccountForUpdate.getMacId());
+                // 如果账户不允许为负数
+                if (!moneyAccountForUpdate.getFlgNegative()) {
+                    // 如果余额小于0 ，则提示余额不足
+                    if (moneyAccountUpdate.getBalance().compareTo(BigDecimal.ZERO) == -1) {
+                        throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                    }
+                }
                 moneyAccountService.updateByUuid(moneyAccountUpdate);
             }
         }
@@ -506,7 +507,7 @@ public class ReceiptService extends BaseService<RecPay> {
 //            }
             // 可用金额为负数，则不能保存
             if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
             }
             accountService.updateByUuid(accountUpdate);
         }
@@ -583,7 +584,7 @@ public class ReceiptService extends BaseService<RecPay> {
 //        }
         // 可用金额为负数，则不能保存
         if (accountUpdate.getReceiptResidue().compareTo(BigDecimal.ZERO) == -1) {
-            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
         }
         accountService.updateByUuid(accountUpdate);