标准订单和促销订单单价禁止小于等于0

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

@@ -1417,15 +1417,18 @@ public class Order extends Controller {
         if (dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'").isEmpty()) {
             return getErrReturnObject().setErrMsg("订单表体不存在商品无法提交").toString();
         }
-        if (dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and  (price<=0 or amount<=0 or qty<=0)").isNotEmpty()) {
-            return getErrReturnObject().setErrMsg("订单表体存在商品单价或金额或数量小于0，无法提交").toString();
+        String type = row.getString("type");
+        if(type.equals("标准订单")||type.equals("促销订单")) {
+            if (dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and  (price<=0 or amount<=0 or qty<=0)").isNotEmpty()) {
+                return getErrReturnObject().setErrMsg("订单表体存在商品单价或金额或数量小于0，无法提交").toString();
+            }
         }
         Rows orderitems = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and qty<=0");
         if (orderitems.isNotEmpty()) {
             return getErrReturnObject().setErrMsg("订单表体行号为【" + orderitems.get(0).getLong("rowno") + "】的商品数量为0无法提交").toString();
         }
         OrderItemsHelper orderItemsHelper = new OrderItemsHelper(this);
-        String type = row.getString("type");
+
         //标准订单：提交时商品必须是上架状态，否则不允许提交
         if (type.equals("标准订单")) {
             orderItemsHelper.checkOffOrderItems(sa_orderid, "plm_item");