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

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

@@ -36,8 +36,9 @@ public class OrderItemsHelper extends BaseClass {
 
         Long sa_accountclassid = content.getLong("sa_accountclassid");
 
-        if ((type.equals("标准订单") || type.equals("特殊订单")) && sa_accountclassid > 0) {
-            return sa_accountclassid;
+        //if ((type.equals("标准订单") || type.equals("特殊订单")) && sa_accountclassid > 0) {
+        if ((type.equals("标准订单") || type.equals("特殊订单")) && content.getString("tradefield").equals("整装工程")) {
+            return 69L;
         }
         if (type.equals("促销订单")) {
             Rows accountclassRows = dbConnect.runSqlQuery("select sa_accountclassid from sa_promotion where siteid='" + controller.siteid + "' and sa_promotionid=" + content.getLongValue("sa_promotionid"));