eganwu 1 tahun lalu
induk
melakukan
59a1c6a363

+ 0 - 3
src/custom/function/OrderFeeCalculatePlan1.java

@@ -58,7 +58,6 @@ public class OrderFeeCalculatePlan1 extends DataFunction {
         Rows dfRows = dbConnect.runSqlQuery("select sys_datafunctionid from sys_datafunction WHERE classname='OrderFeeCalculatePlan1' and status='启用' ");
         for (Row dfRow : dfRows) {
             String sys_datafunctionid = dfRow.getString("sys_datafunctionid");
-//            System.err.println(sys_datafunctionid);
             Rows itemRows = itemRowsMap.getOrDefault(sys_datafunctionid, new Rows());
             if (itemRows.isEmpty()) {
                 continue;
@@ -169,8 +168,6 @@ public class OrderFeeCalculatePlan1 extends DataFunction {
                 dbConnect.runSqlUpdate(sqlList);
             }
 
-//            System.err.println(sys_datafunctionid);
-            System.err.println(sqlList);
 
         }
 

+ 8 - 8
src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -193,12 +193,6 @@ public class OrderItems extends Controller {
         //更新订单扣款信息
         updateAccountclassinfos(sa_orderid);
 
-
-        if (systemclient.equalsIgnoreCase("wechatsaletool")) {
-            Rows rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,sa_orderitems_v,itemid from sa_orderitems WHERE sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
-            return getSucReturnObject().setData(rows).toString();
-        }
-
         //查询商品费用方案方法
         orderItemsHelper.executeDataFunction(sa_orderid);
         //生成摘要
@@ -211,6 +205,12 @@ public class OrderItems extends Controller {
 
         }
 
+        if (systemclient.equalsIgnoreCase("wechatsaletool")) {
+            rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,sa_orderitems_v,itemid from sa_orderitems WHERE sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
+            return getSucReturnObject().setData(rows).toString();
+        }
+
+
         return getSucReturnObject().toString();
     }
 
@@ -407,9 +407,9 @@ public class OrderItems extends Controller {
         String sql = sqlFactory.getSQL();
         dbConnect.runSqlUpdate(sql);
 
-        DeleteSQL deleteSQL=SQLFactory.createDeleteSQL(this,"sa_order_cost");
+        DeleteSQL deleteSQL = SQLFactory.createDeleteSQL(this, "sa_order_cost");
         deleteSQL.setSiteid(siteid);
-        deleteSQL.setWhere("sa_orderitemsid",sa_orderitemsids.toArray());
+        deleteSQL.setWhere("sa_orderitemsid", sa_orderitemsids.toArray());
         deleteSQL.delete();
         //重新排序
         updateRowNo(sa_orderid);