Przeglądaj źródła

Merge branch 'develop' into develop2

hu 1 rok temu
rodzic
commit
a58c0e129d

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

@@ -1491,7 +1491,7 @@ public class Order extends Controller {
             Rows promotionRows = dbConnect.runSqlQuery("SELECT isauth,orderminamount FROM sa_promotion WHERE  siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'");
             if(promotionRows.isNotEmpty()){
                 if(amount.compareTo(promotionRows.get(0).getBigDecimal("orderminamount"))<0){
-                    return getErrReturnObject().setErrMsg("订单未满足最低起订金额请勿提交!").toString();
+                    return getErrReturnObject().setErrMsg("订单未满足最低起订金额:"+promotionRows.get(0).getBigDecimal("orderminamount")+",请勿提交!").toString();
                 }
             }
             if(!promotionRows.get(0).getBoolean("isauth")){