订单行折扣及行价格刷新接口更新

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

@@ -401,9 +401,13 @@ public class OrderItems extends Controller {
         } else {
             return getErrReturnObject().setErrMsg("该订单不存在").toString();
         }
-        itemids.add(0);
-        String sql="select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and itemid in "+itemids.toJSONString();
-        sql = sql.replace("[", "(").replace("]", ")");
+        String sql;
+        if(itemids.size()==0){
+            sql="select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'";
+        }else{
+            sql="select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and itemid in "+itemids.toJSONString();
+            sql = sql.replace("[", "(").replace("]", ")");
+        }
         Rows orderItemsRows = dbConnect.runSqlQuery(sql);
         ArrayList<String> sqlList = new ArrayList<>();
         if (!orderItemsRows.isEmpty()) {
@@ -425,14 +429,19 @@ public class OrderItems extends Controller {
         Rows orderRows = dbConnect.runSqlQuery("select * from sa_order where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
         if (!orderRows.isEmpty()) {
             if (!orderRows.get(0).getString("status").equals("新建")) {
-                return getErrReturnObject().setErrMsg("非新建状态无法进行商品行折扣变更").toString();
+                return getErrReturnObject().setErrMsg("非新建状态无法进行商品行价格刷新").toString();
             }
         } else {
             return getErrReturnObject().setErrMsg("该订单不存在").toString();
         }
-        itemids.add(0);
-        String sql="select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and itemid in "+itemids.toJSONString();
-        sql = sql.replace("[", "(").replace("]", ")");
+        String sql;
+        if(itemids.size()==0){
+             sql="select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'";
+        }else{
+             sql="select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and itemid in "+itemids.toJSONString();
+             sql = sql.replace("[", "(").replace("]", ")");
+        }
+
         Rows orderItemsRows = dbConnect.runSqlQuery(sql);
 
         ArrayList<String> sqlList = new ArrayList<>();