订单提交bug修复

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

@@ -180,16 +180,9 @@ public class OrderItems extends Controller {
         }
 
         //查询商品费用方案方法
-        SQLFactory sqlFactory = new SQLFactory(this, "查询商品费用方案方法");
-        sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter("sa_orderid", sa_orderid);
-        Rows rows = dbConnect.runSqlQuery(sqlFactory);
-        for (Row row : rows) {
-            DataFunction df = DataFunction.get(this, row.getString("functionname"));
-            df.addParameter("sa_orderid", sa_orderid);
-            df.action();
-        }
-
+        orderItemsHelper.executeDataFunction(sa_orderid);
+        //是否自动返利结算
+        orderItemsHelper.executeAutoRebate(sa_orderid,sys_enterpriseid);
 
         return getSucReturnObject().toString();
     }
@@ -920,9 +913,9 @@ public class OrderItems extends Controller {
     //查询订单列表(管理端)
     public QuerySQL queryAllListManage(String where) throws YosException {
 
-        QuerySQL t11= SQLFactory.createQuerySQL(this,"sa_dispatch_items",
-                "sa_orderitemsid","siteid");
-        t11.addQueryFields("outwarehouseqty","sum(outwarehouseqty)");
+        QuerySQL t11 = SQLFactory.createQuerySQL(this, "sa_dispatch_items",
+                "sa_orderitemsid", "siteid");
+        t11.addQueryFields("outwarehouseqty", "sum(outwarehouseqty)");
         t11.addGroupBy("sa_orderitemsid,siteid");
 
 
@@ -947,7 +940,7 @@ public class OrderItems extends Controller {
                 "areaname");
         querySQL.addJoinTable(JOINTYPE.left, t11, "t11", "t11.sa_orderitemsid = t1.sa_orderitemsid and t11.siteid = t1.siteid");
         querySQL.addQueryFields("orderremarks", "t5.remarks");
-        querySQL.addQueryFields("outwarehouseqty","ifnull(t11.outwarehouseqty,0)");
+        querySQL.addQueryFields("outwarehouseqty", "ifnull(t11.outwarehouseqty,0)");
         //querySQL.addQueryFields("accountclassinfos", "REPLACE(SUBSTRING(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'), 2, CHAR_LENGTH(JSON_EXTRACT(t5.sa_accountclassinfos, '$[*].accountname'))-2),'\"','')");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.BaseClass;
 import common.Controller;
+import common.DataFunction;
 import common.YosException;
 import common.data.*;
 
@@ -22,12 +23,33 @@ public class OrderItemsHelper extends BaseClass {
         this.content = controller.content;
     }
 
+    //执行是否自动返利结算
+    public void executeAutoRebate(Long sa_orderid, Long sys_enterpriseid) throws YosException {
+        Row enterpriseRow = dbConnect.runSqlQuery(0, "");
 
-    public void checkOffOrderItems(Long sa_orderid,String tablename) throws YosException {
-        Rows iteminfos = dbConnect.runSqlQuery("select t2.itemno from sa_orderitems t1 inner join "+tablename+" t2 on t1.siteid=t2.siteid and t1.itemid=t2.itemid where t1.sa_orderid="
+
+    }
+
+    //查询并执行商品费用方案方法
+    public void executeDataFunction(Long sa_orderid) throws YosException {
+        SQLFactory sqlFactory = new SQLFactory(this, "查询商品费用方案方法");
+        sqlFactory.addParameter("siteid", controller.siteid);
+        sqlFactory.addParameter("sa_orderid", sa_orderid);
+        Rows rows = dbConnect.runSqlQuery(sqlFactory);
+        for (Row row : rows) {
+            DataFunction df = DataFunction.get(controller, row.getString("functionname"));
+            df.addParameter("sa_orderid", sa_orderid);
+            df.action();
+        }
+    }
+
+
+    public void checkOffOrderItems(Long sa_orderid, String tablename) throws YosException {
+        Rows iteminfos = dbConnect.runSqlQuery("select t2.itemid from sa_orderitems t1 inner join " + tablename + " t2 on t1.siteid=t2.siteid and t1.itemid=t2.itemid where t1.sa_orderid="
                 + sa_orderid + " and t1.siteid='" + controller.siteid + "' and t2.isonsale!=1");
         if (iteminfos.isNotEmpty()) {
-            new YosException(false, "检测到品号" + iteminfos.get(0).getString("itemno") + "未上架，请删除后重试");
+            Row itemRow = dbConnect.runSqlQuery(0, "SELECT itemno from plm_item WHERE itemid=" + iteminfos.get(0).getString("itemno"));
+            new YosException(false, "检测到品号" + itemRow.getString("itemno") + "未上架，请删除后重试");
         }
     }