行关闭增加是否关闭的判断及审核不控制账户余额

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -2828,7 +2828,7 @@ public class Order extends Controller {
         ArrayList<Long> sa_cashbillidList = new ArrayList<>();
 
         if (!Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
-            return getErrReturnObject().setErrMsg("账户余额不足").toString();
+            //return getErrReturnObject().setErrMsg("账户余额不足").toString();
         }
 
         if (order_paymentnode.equals("2")) {

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1496,11 +1496,16 @@ public class OrderItems extends Controller {
             sqlList.addAll(updateIcinvbal_sale(rowsdetails,false, true));
         }
         dbConnect.runSqlUpdate(sqlList);
-
-        if(dbConnect.runSqlQuery("select * from sa_orderitems where isclose=0 and undeliqty!=0 and sa_orderid="+sa_orderid).isEmpty()){
-            dbConnect.runSqlUpdate("update sa_order set status='关闭',closeby='"+username+"',closedate=CURRENT_TIME where sa_orderid=" +sa_orderid);
+        if (isclose) {
+            if(dbConnect.runSqlQuery("select * from sa_orderitems where isclose=0 and undeliqty!=0 and sa_orderid="+sa_orderid).isEmpty()){
+                dbConnect.runSqlUpdate("update sa_order set status='关闭',closeby='"+username+"',closedate=CURRENT_TIME where sa_orderid=" +sa_orderid);
+            }
+        }else{
+            dbConnect.runSqlUpdate("update sa_order set status='审核',closeby='',closedate='NUlL' where sa_orderid=" +sa_orderid);
         }
 
+
+
         return getSucReturnObject().toString();
     }