|
@@ -1255,7 +1255,11 @@ public class Order extends Controller {
|
|
|
String typemx = content.getStringValue("typemx");
|
|
|
|
|
|
Rows orderRows = getOrderRows(this, sa_orderid);
|
|
|
- if (!(orderRows.get(0).getString("status").equals("预提交") || orderRows.get(0).getString("status").equals("确认") || orderRows.get(0).getString("status").equals("提交"))) {
|
|
|
+ if (orderRows.isEmpty()) {
|
|
|
+ return getErrReturnObject().setErrMsg("订单数据不存在").toString();
|
|
|
+ }
|
|
|
+ String status = orderRows.get(0).getString("status");
|
|
|
+ if (!(status.equals("预提交") || status.equals("确认") || status.equals("提交"))) {
|
|
|
return getErrReturnObject().setErrMsg("非预提交、提交、确认状态无法修改").toString();
|
|
|
}
|
|
|
|
|
@@ -3476,6 +3480,7 @@ public class Order extends Controller {
|
|
|
sqlList.add("update sa_order set sa_accountclassinfos='" + jsonArray + "' where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
|
|
|
return sqlList;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 判断是否在同一个月
|
|
|
*
|