Ver código fonte

订单表体存在商品单价或金额或数量小于0,无法提交

hu 2 anos atrás
pai
commit
fba1800cf1

+ 3 - 0
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1226,6 +1226,9 @@ public class Order extends Controller {
         if (dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'").isEmpty()) {
         if (dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'").isEmpty()) {
             return getErrReturnObject().setErrMsg("订单表体不存在商品无法提交").toString();
             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();
+        }
         Rows orderitems = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and qty<=0");
         Rows orderitems = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and qty<=0");
         if (orderitems.isNotEmpty()) {
         if (orderitems.isNotEmpty()) {
             return getErrReturnObject().setErrMsg("订单表体行号为【" + orderitems.get(0).getLong("rowno") + "】的商品数量为0无法提交").toString();
             return getErrReturnObject().setErrMsg("订单表体行号为【" + orderitems.get(0).getLong("rowno") + "】的商品数量为0无法提交").toString();

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

@@ -140,7 +140,9 @@ public class OrderItems extends Controller {
                     sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单商品【" + itemRow.getString("itemname") + "】由单价:" + price1 + "修改为单价:" + price, "订单修改单价").getSQL());
                     sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "订单商品【" + itemRow.getString("itemname") + "】由单价:" + price1 + "修改为单价:" + price, "订单修改单价").getSQL());
                 }
                 }
             }
             }
-
+            if(price.compareTo(BigDecimal.ZERO)<0){
+                return getErrReturnObject().setErrMsg("价格不可小于0").toString();
+            }
             if (isInsert) {
             if (isInsert) {
                 sqlList.add(orderItemsHelper.getInsertSQL(customproperties, sa_orderitemsid, item, itemRow, type, defaultprice, price, itemPrice.getMarketprice()).getSQL());
                 sqlList.add(orderItemsHelper.getInsertSQL(customproperties, sa_orderitemsid, item, itemRow, type, defaultprice, price, itemPrice.getMarketprice()).getSQL());
             } else {
             } else {