Browse Source

支出凭证为负数时不做判断

hu 1 month ago
parent
commit
83c9f1e67e

+ 2 - 2
src/custom/beans/accountbalance/Accountbalance.java

@@ -242,7 +242,7 @@ public class Accountbalance extends BaseClass {
                 throw new YosException(false, "该营销账户不存在,支出凭证无法审核");
             } else {
                 BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1) {
+                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1 && cashbillEntity.getAmount().compareTo(BigDecimal.ZERO)>=0) {
                     throw new YosException(false, "该营销账户可用余额不足,支出凭证无法审核");
                 }
                 BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(cashbillEntity.getAmount());
@@ -387,7 +387,7 @@ public class Accountbalance extends BaseClass {
                 throw new YosException(false, "该营销账户不存在,支出凭证无法审核");
             } else {
                 BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1 ) {
+                if (cashbillEntity.getAmount().compareTo(canuseamount) == 1  && cashbillEntity.getAmount().compareTo(BigDecimal.ZERO)>=0) {
                     throw new YosException(false, "该营销账户可用余额不足,支出凭证无法审核");
                 }
                 BigDecimal newbalance = rowsaccountbalance.get(0).getBigDecimal("balance").subtract(cashbillEntity.getAmount());

+ 1 - 1
src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -789,7 +789,7 @@ public class cashbill extends Controller {
                     }
                 } else {
                     BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                    if (rows.get(0).getBigDecimal("amount").compareTo(canuseamount) == 1 ) {
+                    if (rows.get(0).getBigDecimal("amount").compareTo(canuseamount) == 1  && rows.get(0).getBigDecimal("amount").compareTo(BigDecimal.ZERO)>=0) {
                         return getErrReturnObject().setErrMsg("该营销账户可用余额不足,支出凭证无法审核")
                                 .toString();
                     }