|
@@ -117,6 +117,9 @@ public class Order extends Controller {
|
|
|
if (sa_accountclassid <= 0) {
|
|
|
return getErrReturnObject().setErrMsg("未找到扣款账户信息").toString();
|
|
|
}
|
|
|
+
|
|
|
+ orderItemsHelper.isAccountCanUsed(sa_accountclassid);
|
|
|
+
|
|
|
sqlFactory.addParameter("sa_accountclassid", sa_accountclassid);
|
|
|
sqlList.addAll(updateAccountclassinfos(sa_orderid, sa_accountclassid, sys_enterpriseid));
|
|
|
|
|
@@ -184,7 +187,7 @@ public class Order extends Controller {
|
|
|
} else {
|
|
|
sqlFactory.addParameter("billdate", billdate);
|
|
|
}
|
|
|
- if (content.containsKey("sa_accountclassid")&&!content.getString("sa_accountclassid").equals("")) {
|
|
|
+ if (content.containsKey("sa_accountclassid") && !content.getString("sa_accountclassid").equals("")) {
|
|
|
sa_accountclassid = content.getLongValue("sa_accountclassid");
|
|
|
if (sa_accountclassid <= 0) {
|
|
|
return getErrReturnObject().setErrMsg("账户不存在").toString();
|
|
@@ -349,6 +352,7 @@ public class Order extends Controller {
|
|
|
if (sa_accountclassid <= 0) {
|
|
|
return getErrReturnObject().setErrMsg("未找到扣款账户信息").toString();
|
|
|
}
|
|
|
+ orderItemsHelper.isAccountCanUsed(sa_accountclassid);
|
|
|
sqlFactory.addParameter("sa_accountclassid", sa_accountclassid);
|
|
|
|
|
|
|
|
@@ -1407,7 +1411,7 @@ public class Order extends Controller {
|
|
|
//验证结算企业
|
|
|
Long pay_enterpriseid = row.getLong("pay_enterpriseid");
|
|
|
if (pay_enterpriseid <= 0) {
|
|
|
- dbConnect.runSqlQuery("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid WHERE sa_orderid="+sa_orderid);
|
|
|
+ dbConnect.runSqlQuery("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid WHERE sa_orderid=" + sa_orderid);
|
|
|
// return getErrReturnObject().setErrMsg("请选择结算企业").toString();
|
|
|
}
|
|
|
Long sys_enterprise_financeid = row.getLong("sys_enterprise_financeid");
|