Merge remote-tracking branch 'origin/develop-test' into develop-test

# Conflicts:
#	src/custom/restcontroller/R.java

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

@@ -1443,13 +1443,11 @@ public class Order extends Controller {
         //订单删除原因
         DataExtend.createDeleteReasonSql(this, "sa_order", sa_orderids.toJavaList(Long.class), content.getStringValue("deletereason"));
         //操作记录
-
         for (Object obj : sa_orderids) {
             Long sa_orderid = Long.valueOf(obj.toString());
             sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "删除", "订单删除").getSQL());
         }
         dbConnect.runSqlUpdate(sqlList);
-        //ClearData.clearOrder(this);
         return getSucReturnObject().toString();
     }
 
@@ -1465,9 +1463,7 @@ public class Order extends Controller {
         if (sa_orderids.size() <= 0) {
             return getErrReturnObject().setErrMsg("请选择要执行删除操作的数据。").toString();
         }
-        JSONObject resultObject = new JSONObject();
         JSONArray errArray = new JSONArray();
-        JSONArray sucArray = new JSONArray();
         QuerySQL orderQuery = SQLFactory.createQuerySQL(this, "sa_order", "sa_orderid", "sonum", "status");
         orderQuery.setWhere("sa_orderid", sa_orderids);
         orderQuery.setSiteid(siteid);
@@ -1495,13 +1491,9 @@ public class Order extends Controller {
                 sqlDump.add(SQLFactory.createUpdateSQL(this, "sa_order").setValue("deleted", 1).setUniqueid(sa_orderid).setWhere("status", "新建"));
                 sqlDump.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "删除", "订单删除"));
                 sqlDump.commit(this);
-                sucArray.add(sa_orderid);
                 DataExtend.createDeleteReasonSql(this, "sa_order", sa_orderids.toJavaList(Long.class), content.getStringValue("deletereason"));
             }
         }
-        resultObject.put("err", errArray);
-        resultObject.put("suc", sucArray);
-
         return getSucReturnObject().setData(errArray).toString();
     }
 
@@ -3027,6 +3019,8 @@ public class Order extends Controller {
 //                Rows orderdetailsRows = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
                 if (amount.compareTo(BigDecimal.ZERO) > 0) {
                     if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
+                        Rows orderRows=getOrderRows(this,sa_orderid);
+                        content.put("sa_order_v",orderRows.get(0).getLong("sa_order_v"));
                         String result = check();
                         if (result.contains("成功")) {
                             dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid=" + sa_orderid);