Merge branch 'develop' into develop-green

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -761,6 +761,11 @@ public class cashbill extends Controller {
                     sqlFactory.addParameter("username", username);
                     sqlList.add(sqlFactory.getSQL());
                 } else {
+                    BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
+                    if ((rows.get(0).getBigDecimal("amount").add(canuseamount)).compareTo(BigDecimal.ZERO) == -1) {
+                        return getErrReturnObject().setErrMsg("该营销账户可用余额不足，收入凭证无法审核")
+                                .toString();
+                    }
                     balance = rows.get(0).getBigDecimal("amount").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
                     sqlList.add("update sa_accountbalance set balance='" + rows.get(0).getBigDecimal("amount").add(rowsaccountbalance.get(0).getBigDecimal("balance")) + "',changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='" + sa_accountclassid + "' and siteid='" + siteid + "'");
                 }