订单提交逻辑调整

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

@@ -1416,18 +1416,23 @@ public class Order extends Controller {
             return getErrReturnObject().setErrMsg("请选择支付账号").toString();
         }
         String type = row.getString("type");
+        String typemx = row.getString("typemx");
         if (siteid.equalsIgnoreCase("CCYOSG") && !type.equals("促销订单")) {
-            String tradefield = row.getString("tradefield");
-            QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_optiontypemx");
-            querySQL.addJoinTable(JOINTYPE.inner, "sys_optiontype", "t2", "t2.optiontypeid=t1.optiontypeid");
-            querySQL.setWhere("t2.typename='domainrelatedaccounts'");
-            querySQL.setWhere("(t1.value='" + tradefield + "' or t1.remarks='" + tradefield + "')");
-            querySQL.setTableAlias("t1");
-            Rows accountsTows = querySQL.query();
-            if (accountsTows.isNotEmpty()) {
-                JSONArray subvalues = accountsTows.get(0).getJSONArray("subvalues");
-                if (!subvalues.contains(sa_accountclassid.toString())) {
-                    return getErrReturnObject().setErrMsg("扣款账户不对,禁止提交,请更换支付账户后提交").toString();
+            if (typemx.equals("工程") || typemx.equals("电商")) {
+
+            } else {
+                String tradefield = row.getString("tradefield");
+                QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_optiontypemx");
+                querySQL.addJoinTable(JOINTYPE.inner, "sys_optiontype", "t2", "t2.optiontypeid=t1.optiontypeid");
+                querySQL.setWhere("t2.typename='domainrelatedaccounts'");
+                querySQL.setWhere("(t1.value='" + tradefield + "' or t1.remarks='" + tradefield + "')");
+                querySQL.setTableAlias("t1");
+                Rows accountsTows = querySQL.query();
+                if (accountsTows.isNotEmpty()) {
+                    JSONArray subvalues = accountsTows.get(0).getJSONArray("subvalues");
+                    if (!subvalues.contains(sa_accountclassid.toString())) {
+                        return getErrReturnObject().setErrMsg("扣款账户不对,禁止提交,请更换支付账户后提交").toString();
+                    }
                 }
             }