专用账户使用逻辑修改

src/custom/restcontroller/webmanage/sale/accountclass/accountclass.java

@@ -161,7 +161,7 @@ public class accountclass extends Controller {
                 where = where + " and t1.isrebate=" + whereObject.getLong("isrebate");
             }
             if (whereObject.containsKey("isnotspecialfund") && !"".equals(whereObject.getString("isnotspecialfund"))) {
-                where = where + " and JSON_TYPE(t1.bindingcategories) != 'NULL' and JSON_LENGTH(t1.bindingcategories) != 0 ";
+                where = where + " and JSON_TYPE(t1.bindingcategories) != 'NULL' and JSON_LENGTH(t1.bindingcategories) != 0 and t1.accountname !='保证金账户' ";
             }
 
         }

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

@@ -162,6 +162,9 @@ public class Order extends Controller {
             } else {
                 sqlFactory.addParameter("billdate", billdate);
             }
+            if(content.containsKey("sa_accountclassid")){
+                sqlFactory.addParameter("sa_accountclassid", content.getLongValue("sa_accountclassid"));
+            }
         } else {
             //订单更新时
             if(content.getLongValue("sa_accountclassid")!=0){