瀏覽代碼

订单明细新增修改小程序端bug修复

hu 4 月之前
父節點
當前提交
acc5c7fa1d
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      src/custom/restcontroller/webmanage/sale/order/OrderItems.java

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

@@ -250,11 +250,6 @@ public class OrderItems extends Controller {
         } else {
         } else {
             dbConnect.runSqlUpdate("UPDATE sa_order set abstract ='' WHERE sa_orderid='" + sa_orderid + "'");
             dbConnect.runSqlUpdate("UPDATE sa_order set abstract ='' WHERE sa_orderid='" + sa_orderid + "'");
         }
         }
-
-        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();
-        }
         if(type.equals("配件订单")){
         if(type.equals("配件订单")){
             dbConnect.runSqlUpdate("UPDATE sa_order o JOIN (SELECT  sa_orderid,GROUP_CONCAT(DISTINCT delivery SEPARATOR '+') AS delivery FROM sa_orderitems where sa_orderid="+sa_orderid+" GROUP BY sa_orderid) od ON o.sa_orderid = od.sa_orderid SET  o.delivery = od.delivery ");
             dbConnect.runSqlUpdate("UPDATE sa_order o JOIN (SELECT  sa_orderid,GROUP_CONCAT(DISTINCT delivery SEPARATOR '+') AS delivery FROM sa_orderitems where sa_orderid="+sa_orderid+" GROUP BY sa_orderid) od ON o.sa_orderid = od.sa_orderid SET  o.delivery = od.delivery ");
         }
         }
@@ -292,6 +287,12 @@ public class OrderItems extends Controller {
             }
             }
         }
         }
         dbConnect.runSqlUpdate(sqlList);
         dbConnect.runSqlUpdate(sqlList);
+
+        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();
         return getSucReturnObject().toString();
     }
     }