扣款账户不对,禁止提交,请更换支付账户后提交

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

@@ -1404,19 +1404,18 @@ public class Order extends Controller {
         if (sa_accountclassid <= 0) {
             return getErrReturnObject().setErrMsg("请选择支付账号").toString();
         }
-
-        if (siteid.equalsIgnoreCase("CCYOSG")) {
+        String type = row.getString("type");
+        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");
-//                JSONArray jsonArray=JSONArray.parseArray(subvalues);
-                if(!subvalues.contains(sa_accountclassid.toString())){
+            Rows accountsTows = querySQL.query();
+            if (accountsTows.isNotEmpty()) {
+                JSONArray subvalues = accountsTows.get(0).getJSONArray("subvalues");
+                if (!subvalues.contains(sa_accountclassid.toString())) {
                     return getErrReturnObject().setErrMsg("扣款账户不对,禁止提交,请更换支付账户后提交").toString();
                 }
             }
@@ -1460,7 +1459,7 @@ public class Order extends Controller {
         if (dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'").isEmpty()) {
             return getErrReturnObject().setErrMsg("订单表体不存在商品无法提交").toString();
         }
-        String type = row.getString("type");
+
         if (type.equals("标准订单") || type.equals("促销订单")) {
             if (dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and  (price<=0 or amount<=0 or qty<=0)").isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("商品单价或金额禁止小于等于0").toString();