定制费用调整

src/custom/restcontroller/webmanage/sale/agents/SQL/商户档案修改.sql

@@ -6,7 +6,6 @@ set changeuserid=$changeuserid$,
     freefreightamount=$freefreightamount$,
     invoicingpoint=$invoicingpoint$,
     saleclassauth=$saleclassauth$,
-    grade = $grade$,
-    isrebate=$isrebate$
+    grade = $grade$
 where siteid = $siteid$
   and sys_enterpriseid = $sys_enterpriseid$

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

@@ -190,7 +190,6 @@ public class agents extends Controller {
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("username", username);
         sqlFactory.addParameter("changeuserid", userid);
-        sqlFactory.addParameter("isrebate", content.getBooleanValue("isrebate") == false ? 0 : 1);
         sqllist.add(sqlFactory.getSQL());
 
 

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

@@ -6,6 +6,7 @@ import beans.datacontrllog.DataContrlLog;
 import beans.itemclass.ItemClass;
 import beans.itemprice.ItemPrice;
 import beans.order.Order;
+import beans.parameter.Parameter;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.BaseClass;
@@ -39,13 +40,10 @@ public class OrderItemsHelper extends BaseClass {
             return;
         }
 
-        Rows enterpriseRows = dbConnect.runSqlQuery("SELECT isrebate from sys_enterprise WHERE sys_enterpriseid=" + sys_enterpriseid);
-        if (enterpriseRows.isEmpty()) {
-            return;
-        }
+
         //是否自动返利结算
-        Boolean isrebate = enterpriseRows.get(0).getBoolean("isrebate");
-        if (!isrebate) {
+        String isrebate = Parameter.get(controller.siteid, "isrebate");
+        if (isrebate.equals("1")) {
             return;
         }
         //查询有效期内，余额大于0 的经销商装修补贴返利