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

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

@@ -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");

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

@@ -32,14 +32,24 @@ public class OrderItemsHelper extends BaseClass {
         this.content = controller.content;
     }
 
+    public void isAccountCanUsed(Long sa_accountclassid) throws YosException {
+        if (dbConnect.runSqlQuery("select * from sa_accountclass  WHERE isused=1 and isorder=1 and sa_accountclassid=" + sa_accountclassid).isEmpty()) {
+            throw new YosException(false, "当资金账户未启用或者不支持订货");
+        }
+
+    }
+
     public long getAccountClassId(String type) throws YosException {
 
         Long sa_accountclassid = content.getLong("sa_accountclassid");
 
         //if ((type.equals("标准订单") || type.equals("特殊订单")) && sa_accountclassid > 0) {
-        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("整装工程")) {
+        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("GC工程")) {
             return 69L;
         }
+        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("整装工程")) {
+            return 96L;
+        }
         if (type.equals("促销订单")) {
             Rows accountclassRows = dbConnect.runSqlQuery("select sa_accountclassid from sa_promotion where siteid='" + controller.siteid + "' and sa_promotionid=" + content.getLongValue("sa_promotionid"));
             if (!accountclassRows.isEmpty()) {